Diffusion GnuPG Password Manager 0d77d6e1280e

Merge branch 'release/0.8.2'
0d77d6e1280e
Actions

Description

Merge branch 'release/0.8.2'

Details

Provenance

Anne Jan Brouwer <brouwer@annejan.com>	Authored on May 27 2015, 2:53 AM
Anne Jan Brouwer <annejan@noprotocol.com>	Committed on May 27 2015, 2:53 AM

Parents

rGPGPASS4841cd5d596e: Merge branch 'feature/first-start-wizard' into develop
rGPGPASSee8ccb24a14b: Added Travis and the pass subtitle.

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

4841cd5d596e Merge branch 'feature/first-start-wizard' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
9a30773cbf7b removed todo
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
3eeebacb94ea randomfixes
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
38a0d31cfa45 more wizardly things
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
d2f692f28440 keygen look and feel, general error routing
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
2143d6f7c371 removed qDebug that broke userlist
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
271b3da56d76 Added waiting animation widget from https://github.
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
825c9eb7b546 working keygen
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8c605f96e2cf gen-key code
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8d81543d1c84 interface integrity and documentation
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
b568de36a8e2 keygen start, dialog ideas
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
54862e16e1ef plumbing and some text
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
6e3ca9b3eba7 clean wizard interface
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
e97e43cca80f logo credits added
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
82334099c290 trying osx build automation
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
6394d46d47ee cleanup
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
da360436ff93 update pass environment
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
62599f0a2e88 added todo's
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
f154f32f0c1e clean quit on canceling out of wizard
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8251873693a0 start of streamlined wizard
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
ad44f5a9e802 cleanup, rework and clean wizard dialog added
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
b89f4c4ab146 Merge branch 'master' into feature/first-start-wizard
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
862c5b286410 Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
f61582d8092a updated translartions, these will need a lot of love before the 1.0
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
9f1acde01101 Revert "profiles groundwork"
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
ca47394ea972 Revert "Basic profile framework"
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
eeff9789f213 Revert "Profile config layout"
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
aea53f1cc096 Revert "Profile UI mostly done"
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
f121c47a6990 Revert "setting PASSWORD_STORE_DIR and trying to update the treeview"
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
a5e5fbd236a0 Revert "update paths"
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
a69ac71f00be added appdmg config file for shiny .dmg file
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
f5ffe44c9023 Merge branch 'develop' of github.com:IJHack/qtpass into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
177dd2a0539b merged
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
33f565f6ec4d Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
e5f042c8cdf9 Merge branch 'develop' of github.com:IJHack/qtpass into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
9e7933ad7724 hooked qmake into the xcode build
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
84a06576cd2d added xcode mess of files
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
54cf24da42fc GCC warning added
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
de551db132ed Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
e61ae88fee90 minor merge
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8d4c7263fcd7 update paths
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
4188319250e0 Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
1beb061015c1 Merge branch 'rdoeffinger-c++11' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
f6698c6df8ba Merge branch 'c++11' of https://github.com/rdoeffinger/qtpass into rdoeffinger…
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
d4cf59b98fc7 Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8e9c68e50963 setting PASSWORD_STORE_DIR and trying to update the treeview
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
9c922fc1c142 Profile UI mostly done
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
fc0cbdf53b63 Merge branch 'develop' of github.com:IJHack/qtpass into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
e24a230a42d9 linux release
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
3325003bf4c9 Profile config layout
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits

Changes (49)

Path

Size

artwork/

localization/

localization_de_DE.qm

localization_de_DE.ts

localization_es_ES.qm

localization_es_ES.ts

localization_gl_ES.qm

localization_gl_ES.ts

localization_hu_HU.qm

localization_hu_HU.ts

localization_nl_NL.qm

localization_nl_NL.ts

localization_pl_PL.ts

localization_ru_RU.qm

localization_ru_RU.ts

localization_sv_SE.qm

localization_sv_SE.ts

main.cpp

mainwindow.cpp

mainwindow.h

progressindicator.cpp

contents.xcworkspacedata

contents.xcworkspacedata

rGPGPASS0d77d6e1280e

View Options

.gitignore

View Options

.travis.yml

View Options

Info.plist

View Options

README.md

View Options

appdmg.json

View Options

artwork/icon.icns

View Options

artwork/icon@2x.png

View Options

changelog

View Options

dialog.cpp

View Options

dialog.h

View Options

keygendialog.cpp

View Options

keygendialog.h

View Options

keygendialog.ui

View Options

localization/localization_de_DE.qm

View Options

localization/localization_de_DE.ts

View Options

localization/localization_es_ES.qm

View Options

localization/localization_es_ES.ts

View Options

localization/localization_gl_ES.qm

View Options

localization/localization_gl_ES.ts

View Options

localization/localization_hu_HU.qm

View Options

localization/localization_hu_HU.ts

View Options

localization/localization_nl_NL.qm

View Options

localization/localization_nl_NL.ts

View Options

localization/localization_pl_PL.ts

View Options

localization/localization_ru_RU.qm

View Options

localization/localization_ru_RU.ts

View Options

localization/localization_sv_SE.qm

View Options

localization/localization_sv_SE.ts

View Options

main.cpp

View Options

mainwindow.cpp

View Options

mainwindow.h

View Options

progressindicator.cpp

View Options

progressindicator.h

View Options

qtpass.pro

View Options

qtpass.xcodeproj/project.pbxproj

View Options

qtpass.xcodeproj/project.xcworkspace/contents.xcworkspacedata

View Options

qtpass.xcodeproj/project.xcworkspace/xcshareddata/qtpass.xccheckout

View Options

qtpass.xcodeproj/qt_makeqmake.mak

View Options

qtpass.xcodeproj/qt_preprocess.mak

View Options

qtpass.xcworkspace/contents.xcworkspacedata

View Options

qtpass.xcworkspace/xcshareddata/QtPass.xccheckout

View Options

release-linux

View Options

util.cpp

View Options

Merge branch 'release/0.8.2'0d77d6e1280eActions

Description

Details

Event Timeline

Merged Changes

Changes (49)

rGPGPASS0d77d6e1280e

.gitignore

.travis.yml

Info.plist

README.md

appdmg.json

artwork/icon.icns

artwork/icon@2x.png

changelog

dialog.cpp

dialog.h

keygendialog.cpp

keygendialog.h

keygendialog.ui

localization/localization_de_DE.qm

localization/localization_de_DE.ts

localization/localization_es_ES.qm

localization/localization_es_ES.ts

localization/localization_gl_ES.qm

localization/localization_gl_ES.ts

localization/localization_hu_HU.qm

localization/localization_hu_HU.ts

localization/localization_nl_NL.qm

localization/localization_nl_NL.ts

localization/localization_pl_PL.ts

localization/localization_ru_RU.qm

localization/localization_ru_RU.ts

localization/localization_sv_SE.qm

localization/localization_sv_SE.ts

main.cpp

mainwindow.cpp

mainwindow.h

progressindicator.cpp

progressindicator.h

qtpass.pro

qtpass.xcodeproj/project.pbxproj

qtpass.xcodeproj/project.xcworkspace/contents.xcworkspacedata

qtpass.xcodeproj/project.xcworkspace/xcshareddata/qtpass.xccheckout

qtpass.xcodeproj/qt_makeqmake.mak

qtpass.xcodeproj/qt_preprocess.mak

qtpass.xcworkspace/contents.xcworkspacedata

qtpass.xcworkspace/xcshareddata/QtPass.xccheckout

release-linux

util.cpp

util.h

Merge branch 'release/0.8.2'
0d77d6e1280e
Actions