Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | fix unit tests | Vincent Breitmoser | 2015-06-10 | 1 | -5/+5 | |
| * | | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 20 | -245/+237 | |
| * | | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 3 | -5/+32 | |
| |\ \ \ | ||||||
| * | | | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 23 | -682/+523 | |
* | | | | | Use svg for build status | Dominik Schürmann | 2015-06-11 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | Fix coveralls | Dominik Schürmann | 2015-06-11 | 1 | -0/+5 | |
* | | | | Try coveralls support | Dominik Schürmann | 2015-06-11 | 3 | -1/+4 | |
* | | | | Jacoco support for local unit tests | Dominik Schürmann | 2015-06-11 | 2 | -3/+38 | |
| |_|/ |/| | | ||||||
* | | | Remove unused deps, fix travis | Dominik Schürmann | 2015-06-11 | 2 | -7/+3 | |
* | | | Add missing WorkaroundBuildConfig | Dominik Schürmann | 2015-06-11 | 1 | -0/+14 | |
* | | | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 16 | -46/+33 | |
* | | | Use new officially supported way for local unit tests, many dependencies upgr... | Dominik Schürmann | 2015-06-11 | 131 | -235/+152 | |
* | | | Temporary fix for testDebug | Dominik Schürmann | 2015-06-10 | 2 | -5/+23 | |
* | | | Use authority res strings | Dominik Schürmann | 2015-06-10 | 1 | -5/+2 | |
* | | | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 13 | -15/+41 | |
| |/ |/| | ||||||
* | | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 | |
* | | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 | |
* | | Merge pull request #1333 from VPhantom/patch-1 | Dominik Schürmann | 2015-06-08 | 1 | -1/+4 | |
|\ \ | ||||||
| * | | Explicit mention of dependency on 3rd party tool | Stéphane Lavergne | 2015-06-08 | 1 | -1/+4 | |
|/ / | ||||||
* | | select correct item in drawer on backstack change in main activity | Vincent Breitmoser | 2015-06-08 | 1 | -1/+25 | |
* | | Merge pull request #1327 from adithyaphilip/fix-null | Dominik Schürmann | 2015-06-08 | 1 | -3/+3 | |
|\ \ | |/ |/| | ||||||
| * | prevent null fragments on activity death | Adithya Abraham Philip | 2015-06-03 | 1 | -3/+3 | |
|/ | ||||||
* | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 7 | -32/+207 | |
|\ | ||||||
| * | keep prefernces individual per dialog (affects only compression) | Vincent Breitmoser | 2015-06-03 | 4 | -10/+22 | |
| * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 7 | -32/+195 | |
* | | Partially revert "switch to native DialogFragment, fix some nullpointers", bu... | Vincent Breitmoser | 2015-06-03 | 2 | -3/+6 | |
* | | hide invoke nfc button in android < 5 | Vincent Breitmoser | 2015-06-03 | 1 | -6/+11 | |
* | | Fix comments in service | Dominik Schürmann | 2015-06-01 | 1 | -8/+8 | |
* | | Merge pull request #1320 from adithyaphilip/merge-services-new | Dominik Schürmann | 2015-06-01 | 31 | -1333/+1153 | |
|\ \ | ||||||
| * | | corrected indentation | Adithya Abraham Philip | 2015-06-01 | 1 | -271/+278 | |
| * | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 28 | -198/+196 | |
| * | | merged services | Adithya Abraham Philip | 2015-06-01 | 25 | -581/+396 | |
|/ / | ||||||
* | | Better use HEAD instead of master to link to files | Dominik Schürmann | 2015-06-01 | 2 | -3/+3 | |
* | | Merge pull request #1317 from adithyaphilip/master | Dominik Schürmann | 2015-06-01 | 3 | -12/+13 | |
|\ \ | ||||||
| * | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 3 | -12/+13 | |
| |/ | ||||||
* | | Fix links to branch | Dominik Schürmann | 2015-06-01 | 2 | -2/+2 | |
* | | switch to native DialogFragment, fix some nullpointers | Vincent Breitmoser | 2015-05-31 | 2 | -22/+26 | |
* | | fix small non-deterministic failure case in unit test | Vincent Breitmoser | 2015-05-31 | 1 | -1/+1 | |
* | | revert some accidentally committed cruft | Vincent Breitmoser | 2015-05-31 | 1 | -8/+0 | |
* | | handle empty passphrases in PassphraseDialogActivity | Vincent Breitmoser | 2015-05-31 | 2 | -0/+34 | |
|/ | ||||||
* | Merge pull request #1318 from adithyaphilip/remove-nan | Vincent | 2015-05-30 | 2 | -3/+8 | |
|\ | ||||||
| * | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 2 | -3/+8 | |
|/ | ||||||
* | only promote subkeys which are actually present | Vincent Breitmoser | 2015-05-30 | 1 | -8/+5 | |
* | some decrypt/verify bug fixes | Vincent Breitmoser | 2015-05-30 | 3 | -5/+12 | |
* | adapt unit tests to PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -78/+101 | |
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 10 | -342/+323 | |
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 3 | -1/+9 | |
* | delete correct cache entries (important for yubikey pins!) | Vincent Breitmoser | 2015-05-30 | 1 | -2/+2 | |
* | show status indicators in EncryptFragment | Vincent Breitmoser | 2015-05-30 | 4 | -17/+129 | |
* | rewrite data flow in EncryptFileFragment preserve state correctly | Vincent Breitmoser | 2015-05-30 | 4 | -66/+91 |