aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | fix instrumentation test(s)Vincent Breitmoser2015-06-172-14/+21
| * | | | | | | | | | | | | | | add ToolableViewAnimatorVincent Breitmoser2015-06-172-0/+65
| * | | | | | | | | | | | | | | Cleanup in build.gradleDominik Schürmann2015-06-161-1/+1
| * | | | | | | | | | | | | | | Merge pull request #1338 from josecastillo/developmentVincent2015-06-123-23/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-112-50/+51
| | * | | | | | | | | | | | | | | Improved smart card error handlingJoey Castillo2015-06-103-23/+168
| * | | | | | | | | | | | | | | | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-11139-24/+6044
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | fix status icon alignmentVincent Breitmoser2015-06-141-0/+2
* | | | | | | | | | | | | | | | | | (minor) layout changesVincent Breitmoser2015-06-132-3/+2
* | | | | | | | | | | | | | | | | | fix instrumentation test(s)Vincent Breitmoser2015-06-132-14/+21
* | | | | | | | | | | | | | | | | | add ToolableViewAnimatorVincent Breitmoser2015-06-114-9/+78
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-11139-24/+6056
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix coverallsDominik Schürmann2015-06-111-0/+5
| * | | | | | | | | | | | | | | | | Try coveralls supportDominik Schürmann2015-06-111-0/+1
| * | | | | | | | | | | | | | | | | Jacoco support for local unit testsDominik Schürmann2015-06-111-1/+32
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove unused deps, fix travisDominik Schürmann2015-06-111-5/+2
| * | | | | | | | | | | | | | | | 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-11126-4/+5948
| * | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | multi-decrypt: switch to cardviewVincent Breitmoser2015-06-101-9/+15
* | | | | | | | | | | | | | | | | fix progress for decryptVincent Breitmoser2015-06-103-14/+37
* | | | | | | | | | | | | | | | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1022-254/+269
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1020-245/+237
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-103-5/+32
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | * | | | | | | | | | | | | | | Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | * | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
* | | | | | | | | | | | | | | | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-072-139/+73
* | | | | | | | | | | | | | | | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-0721-557/+500
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0622-667/+518
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0638-1377/+1390
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-033-53/+86
* | | | | | | | | | | | | | | | | multi-decrypt: working context menuVincent Breitmoser2015-06-034-5/+93