aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | instrument: change handling in PassphraseDialogActivity to work with espressoVincent Breitmoser2015-06-172-78/+38
| | |
| * | instrument: work on instrumentation testsVincent Breitmoser2015-06-175-163/+269
| | |
| * | instrument: add test for symmetric text encrypt/decryptVincent Breitmoser2015-06-171-0/+124
| | |
| * | instrument: add helper for snackbar check (2)Vincent Breitmoser2015-06-171-0/+31
| | |
| * | add extra to disregard first-time dialog to main activityVincent Breitmoser2015-06-171-1/+3
| | |
| * | instrument: add helper method for snackbar checkingVincent Breitmoser2015-06-172-16/+34
| | |
| * | stash away stuffVincent Breitmoser2015-06-175-1/+1307
| | |
| * | update instrumentation test to JUnit4Vincent Breitmoser2015-06-172-3/+10
| | |
| * | travis: disable instrumentation for nowVincent Breitmoser2015-06-171-5/+7
| | |
| * | travis: random testingVincent Breitmoser2015-06-171-2/+2
| | |
| * | add instrumentation testsVincent Breitmoser2015-06-171-1/+8
| | |
| * | try travis with android lang typeVincent Breitmoser2015-06-171-15/+17
| | |
| * | (minor) layout changesVincent Breitmoser2015-06-171-1/+2
| | |
| * | 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
|\ \ | | | | | | Improved smart card error handling
| * | 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
|\ \ \ | | | | | | | | replace messenger hack with eventbus
| * | | 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 ↵Dominik Schürmann2015-06-11131-235/+152
| | | | | | | | | | | | upgraded for this, temporary disabled separate debug builds
* | | 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
| | |\ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | 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
| | |