Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-11 | 4 | -9/+78 |
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 139 | -24/+6056 |
|\ | |||||
| * | Fix coveralls | Dominik Schürmann | 2015-06-11 | 1 | -0/+5 |
| * | Try coveralls support | Dominik Schürmann | 2015-06-11 | 1 | -0/+1 |
| * | Jacoco support for local unit tests | Dominik Schürmann | 2015-06-11 | 1 | -1/+32 |
| * | Remove unused deps, fix travis | Dominik Schürmann | 2015-06-11 | 1 | -5/+2 |
| * | 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 | 126 | -4/+5948 |
| * | 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 |
* | | multi-decrypt: switch to cardview | Vincent Breitmoser | 2015-06-10 | 1 | -9/+15 |
* | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 3 | -14/+37 |
* | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 22 | -254/+269 |
|\ \ | |||||
| * | | 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 |
| |\| | |||||
| | * | 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 |
| | * | 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 |
| | * | prevent null fragments on activity death | Adithya Abraham Philip | 2015-06-03 | 1 | -3/+3 |
* | | | multi-decrypt: fix progress with new CryptoFragment interfaces | Vincent Breitmoser | 2015-06-07 | 2 | -139/+73 |
* | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 21 | -557/+500 |
|\| | | |||||
| * | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 22 | -667/+518 |
| |/ | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 38 | -1377/+1390 |
|\| | |||||
| * | 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 |
| * | | 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 |
| * | | 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 |
| | |/ | |||||
* | | | multi-decrypt: implement save operation (missing actual copy) | Vincent Breitmoser | 2015-06-03 | 3 | -53/+86 |
* | | | multi-decrypt: working context menu | Vincent Breitmoser | 2015-06-03 | 4 | -5/+93 |
* | | | get back to a working state | Vincent Breitmoser | 2015-06-03 | 1 | -3/+5 |
* | | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 5 | -69/+392 |
* | | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in p... | Vincent Breitmoser | 2015-06-02 | 5 | -243/+445 |
* | | | multi-decrypt: first steps, split up DecryptFilesFragment | Vincent Breitmoser | 2015-06-01 | 5 | -247/+549 |
* | | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 8 | -319/+145 |
|/ / | |||||
* | | switch to native DialogFragment, fix some nullpointers | Vincent Breitmoser | 2015-05-31 | 2 | -22/+26 |
* | | 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 |
|/ | |||||
* | 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 |