aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-112-50/+51
| * | | | | | | | | | | | | | | | Improved smart card error handlingJoey Castillo2015-06-103-23/+168
* | | | | | | | | | | | | | | | | Merge pull request #1331 from open-keychain/v/eventbusVincent2015-06-1234-804/+578
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-11145-247/+255
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | Use svg for build statusDominik Schürmann2015-06-111-1/+1
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | fix status icon alignmentVincent Breitmoser2015-06-141-0/+2
| | | * | | | | | | | | | | | | | | travis: disable instrumentation for nowVincent Breitmoser2015-06-141-5/+7
| | | * | | | | | | | | | | | | | | travis: random testingVincent Breitmoser2015-06-131-2/+2
| | | * | | | | | | | | | | | | | | add instrumentation testsVincent Breitmoser2015-06-131-1/+8
| | | * | | | | | | | | | | | | | | try travis with android lang typeVincent Breitmoser2015-06-131-15/+17
| | | * | | | | | | | | | | | | | | (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-11145-247/+255
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Fix coverallsDominik Schürmann2015-06-111-0/+5
* | | | | | | | | | | | | | | | | | Try coveralls supportDominik Schürmann2015-06-113-1/+4
* | | | | | | | | | | | | | | | | | Jacoco support for local unit testsDominik Schürmann2015-06-112-3/+38
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | 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-1023-259/+274
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix unit testsVincent Breitmoser2015-06-101-5/+5
| * | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-072-139/+73
| | * | | | | | | | | | | | | | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-0722-572/+505
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0623-682/+523
|/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0640-1380/+1393
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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