aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused deps, fix travisDominik Schürmann2015-06-112-7/+3
* Add missing WorkaroundBuildConfigDominik Schürmann2015-06-111-0/+14
* Fix debug/release build separationDominik Schürmann2015-06-1116-46/+33
* Use new officially supported way for local unit tests, many dependencies upgr...Dominik Schürmann2015-06-11131-235/+152
* Temporary fix for testDebugDominik Schürmann2015-06-102-5/+23
* Use authority res stringsDominik Schürmann2015-06-101-5/+2
* Allow debug build besides release buildDominik Schürmann2015-06-1013-15/+41
* Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
* Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
* Merge pull request #1333 from VPhantom/patch-1Dominik Schürmann2015-06-081-1/+4
|\
| * Explicit mention of dependency on 3rd party toolStéphane Lavergne2015-06-081-1/+4
|/
* select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
* Merge pull request #1327 from adithyaphilip/fix-nullDominik Schürmann2015-06-081-3/+3
|\
| * prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
|/
* Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-037-32/+207
|\
| * keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-034-10/+22
| * implement sticky preferencesVincent Breitmoser2015-05-317-32/+195
* | Partially revert "switch to native DialogFragment, fix some nullpointers", bu...Vincent Breitmoser2015-06-032-3/+6
* | hide invoke nfc button in android < 5Vincent Breitmoser2015-06-031-6/+11
* | Fix comments in serviceDominik Schürmann2015-06-011-8/+8
* | Merge pull request #1320 from adithyaphilip/merge-services-newDominik Schürmann2015-06-0131-1333/+1153
|\ \
| * | corrected indentationAdithya Abraham Philip2015-06-011-271/+278
| * | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0128-198/+196
| * | merged servicesAdithya Abraham Philip2015-06-0125-581/+396
|/ /
* | Better use HEAD instead of master to link to filesDominik Schürmann2015-06-012-3/+3
* | Merge pull request #1317 from adithyaphilip/masterDominik Schürmann2015-06-013-12/+13
|\ \
| * | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-313-12/+13
| |/
* | Fix links to branchDominik Schürmann2015-06-012-2/+2
* | switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-312-22/+26
* | fix small non-deterministic failure case in unit testVincent Breitmoser2015-05-311-1/+1
* | revert some accidentally committed cruftVincent Breitmoser2015-05-311-8/+0
* | handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-312-0/+34
|/
* Merge pull request #1318 from adithyaphilip/remove-nanVincent2015-05-302-3/+8
|\
| * prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-312-3/+8
|/
* only promote subkeys which are actually presentVincent Breitmoser2015-05-301-8/+5
* some decrypt/verify bug fixesVincent Breitmoser2015-05-303-5/+12
* adapt unit tests to PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-78/+101
* rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-3010-342/+323
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-303-1/+9
* delete correct cache entries (important for yubikey pins!)Vincent Breitmoser2015-05-301-2/+2
* show status indicators in EncryptFragmentVincent Breitmoser2015-05-304-17/+129
* rewrite data flow in EncryptFileFragment preserve state correctlyVincent Breitmoser2015-05-304-66/+91
* externalize caching functionality from CertifyKeyFragmentVincent Breitmoser2015-05-302-20/+75
* make KeyItem serializble, for state in TokenTextCompleteViewVincent Breitmoser2015-05-302-2/+5
* preserve state in DecryptFilesActivity/-FragmentVincent Breitmoser2015-05-292-37/+26
* preserve state in CertifyKeyFragmentVincent Breitmoser2015-05-292-30/+73
* fix RequiredInputParcel handling in CertifyOperationVincent Breitmoser2015-05-291-6/+25
* branch infoDominik Schürmann2015-05-291-2/+6
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-292-7/+19
|\
| * Version 3.2.3Dominik Schürmann2015-05-291-2/+2