Diffusion GnuPG Password Manager 2f171280973e

manually merged changes from 1.0 release and beyond
2f171280973e
Actions

Description

manually merged changes from 1.0 release and beyond

Details

Provenance

Anne Jan Brouwer <brouwer@annejan.com>	Authored on Aug 6 2015, 2:57 PM
Anne Jan Brouwer <annejan@noprotocol.com>	Committed on Aug 6 2015, 2:57 PM

Parents

rGPGPASS0ab7e9838bf5: only one autopull for now
rGPGPASS88761025464e: L

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

0ab7e9838bf5 only one autopull for now
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
20936dafee64 missing git recursive delete
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8b9874cec3a0 autoPush and a minor useGit fix
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
cc11c6c97f13 translation updates, plumbing for autoPush / autoPull
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
957bdffd0c7a removed inconsistency
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
8b82e3c084b5 Fixes: https://github.com/IJHack/qtpass/issues/86
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
d56f9a5c3eae Issue #86 - Clear the password display after some time
Author
Karl Grzeszczak <brouwer@annejan.com>
Browse Repository
No Audits
ff1802293227 Update gitignore for *.o files from building on ubuntu
Author
Karl Grzeszczak <brouwer@annejan.com>
Browse Repository
No Audits
86715701aaab Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
65bba35e54cb Merge branch 'develop' of github.com:IJHack/qtpass into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
23ef2587eaff minor fix to de_DE and zh_CN translation
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
dc4a64148c05 just the visual objets for auto push/pull
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
a8fa73072b62 Merge branch 'develop'
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
b8d0e8645043 added commit for removal in "native" mode
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
416d44d099a4 bold
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
a9a1b04cf95c trying out some colour changes
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
58a5bbd98ecb Dark-red with white it is: fixes https://github.com/IJHack/qtpass/issues/82
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
6aed63afdebf missing translations and tiny fixes
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
a2da37bfd0f1 Merge pull request #80 from karlgrz/develop-update-faq
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
e6b1cad53182 Update FAQ for Yubikey NEO helper in .bashrc for Ubuntu
Author
Karl Grzeszczak <brouwer@annejan.com>
Browse Repository
No Audits
4fd43b2ed895 git init now also for non-pass people
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
7f2d7b28931e Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
35f81634f73d Merge pull request #78 from dennisdegreef/initializeGit
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
a4fa3ccfc8fb Merge branch 'dennisdegreef-initializeGit' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
d6dbe86bd93f Call 'pass git init' on creation of password-store when useGit
Author
Dennis de Greef <brouwer@annejan.com>
Browse Repository
No Audits
36f306f02469 Merge branch 'develop'
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
151c5e5d9450 Adding qm file for hungarian
Author
realitygaps <brouwer@annejan.com>
Browse Repository
No Audits
206b59bd203b Merge pull request #76 from damnlie/update-hungarian
Author
realitygaps <brouwer@annejan.com>
Browse Repository
No Audits
aaceaf50bd12 version 1.0
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
1c74fa867c9d Updating hungarian localisation
Author
MelindaK <brouwer@annejan.com>
Browse Repository
No Audits
f13f8a216957 Merge branch 'develop'
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
ca139ec5a79b added German translation by Fnoerd and Einstein
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
3e4b4dc412b6 Adding to resources
Author
realitygaps <brouwer@annejan.com>
Browse Repository
No Audits
188ca57b911d recompiled localizations
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
da29a910557e Translations by YY
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
28da7ed0a501 Adding the actual translation files
Author
realitygaps <brouwer@annejan.com>
Browse Repository
No Audits
5cbebf0226a1 Adding hebrew and chinese translation files
Author
realitygaps <brouwer@annejan.com>
Browse Repository
No Audits
125a193e3593 Compiled german, updated FAQ
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
894d642ccace Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
c813003ae760 Merge pull request #74 from Friedy/master
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
7e1a7daadad5 Update localization_de_DE.ts
Author
Friedy <brouwer@annejan.com>
Browse Repository
No Audits
03ef4ec8fb29 Update localization_de_DE.ts
Author
Friedy <brouwer@annejan.com>
Browse Repository
No Audits

Changes (27)

Path

Size

localization/

localization_de_DE.qm

	localization_de_DE.ts
	localization_nl_NL.ts

localization_es_ES.ts

localization_gl_ES.ts

localization_he_IL.qm

	localization_he_IL.ts
	localization_pl_PL.ts

localization_hu_HU.ts

localization_nl_NL.qm

localization_nl_NL.ts

localization_pl_PL.ts

localization_ru_RU.ts

localization_sv_SE.ts

localization_zh_CN.qm

	localization_zh_CN.ts
	localization_sv_SE.ts

rGPGPASS2f171280973e

View Options

.gitignore

View Options

FAQ.md

View Options

dialog.cpp

View Options

dialog.h

View Options

dialog.ui

View Options

localization/localization_de_DE.qm

View Options

localization/localization_de_DE.ts

View Options

localization/localization_es_ES.ts

View Options

localization/localization_gl_ES.ts

View Options

localization/localization_he_IL.qm

View Options

localization/localization_he_IL.ts

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.ts

View Options

localization/localization_sv_SE.ts

View Options

localization/localization_zh_CN.qm

View Options

localization/localization_zh_CN.ts

View Options

main.cpp

View Options

mainwindow.cpp

View Options

mainwindow.h

View Options

mainwindow.ui

View Options

qtpass.iss

View Options

qtpass.pro

View Options

resources.qrc

View Options

manually merged changes from 1.0 release and beyond2f171280973eActions

Description

Details

Event Timeline

Merged Changes

Changes (27)

rGPGPASS2f171280973e

.gitignore

FAQ.md

dialog.cpp

dialog.h

dialog.ui

localization/localization_de_DE.qm

localization/localization_de_DE.ts

localization/localization_es_ES.ts

localization/localization_gl_ES.ts

localization/localization_he_IL.qm

localization/localization_he_IL.ts

localization/localization_hu_HU.ts

localization/localization_nl_NL.qm

localization/localization_nl_NL.ts

localization/localization_pl_PL.ts

localization/localization_ru_RU.ts

localization/localization_sv_SE.ts

localization/localization_zh_CN.qm

localization/localization_zh_CN.ts

main.cpp

mainwindow.cpp

mainwindow.h

mainwindow.ui

qtpass.iss

qtpass.pro

resources.qrc

usersdialog.cpp

manually merged changes from 1.0 release and beyond
2f171280973e
Actions