Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | instrument: change handling in PassphraseDialogActivity to work with espresso | Vincent Breitmoser | 2015-06-17 | 2 | -78/+38 | |
| | | | ||||||
| * | | instrument: work on instrumentation tests | Vincent Breitmoser | 2015-06-17 | 5 | -163/+269 | |
| | | | ||||||
| * | | instrument: add test for symmetric text encrypt/decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+124 | |
| | | | ||||||
| * | | instrument: add helper for snackbar check (2) | Vincent Breitmoser | 2015-06-17 | 1 | -0/+31 | |
| | | | ||||||
| * | | add extra to disregard first-time dialog to main activity | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 | |
| | | | ||||||
| * | | instrument: add helper method for snackbar checking | Vincent Breitmoser | 2015-06-17 | 2 | -16/+34 | |
| | | | ||||||
| * | | stash away stuff | Vincent Breitmoser | 2015-06-17 | 5 | -1/+1307 | |
| | | | ||||||
| * | | update instrumentation test to JUnit4 | Vincent Breitmoser | 2015-06-17 | 2 | -3/+10 | |
| | | | ||||||
| * | | travis: disable instrumentation for now | Vincent Breitmoser | 2015-06-17 | 1 | -5/+7 | |
| | | | ||||||
| * | | travis: random testing | Vincent Breitmoser | 2015-06-17 | 1 | -2/+2 | |
| | | | ||||||
| * | | add instrumentation tests | Vincent Breitmoser | 2015-06-17 | 1 | -1/+8 | |
| | | | ||||||
| * | | try travis with android lang type | Vincent Breitmoser | 2015-06-17 | 1 | -15/+17 | |
| | | | ||||||
| * | | (minor) layout changes | Vincent Breitmoser | 2015-06-17 | 1 | -1/+2 | |
| | | | ||||||
| * | | fix instrumentation test(s) | Vincent Breitmoser | 2015-06-17 | 2 | -14/+21 | |
| | | | ||||||
| * | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 2 | -0/+65 | |
|/ / | ||||||
* | | Cleanup in build.gradle | Dominik Schürmann | 2015-06-16 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 3 | -23/+169 | |
|\ \ | | | | | | | Improved smart card error handling | |||||
| * | | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 2 | -50/+51 | |
| | | | ||||||
| * | | Improved smart card error handling | Joey Castillo | 2015-06-10 | 3 | -23/+168 | |
| | | | ||||||
* | | | Merge pull request #1331 from open-keychain/v/eventbus | Vincent | 2015-06-12 | 34 | -804/+578 | |
|\ \ \ | | | | | | | | | replace messenger hack with eventbus | |||||
| * | | | some bugfixes for new CryptoOperationFragment | Vincent Breitmoser | 2015-06-11 | 3 | -70/+1 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 145 | -247/+255 | |
| |\ \ \ | ||||||
* | | | | | Use svg for build status | Dominik Schürmann | 2015-06-11 | 1 | -1/+1 | |
| |/ / / |/| | | | ||||||
| | | * | fix status icon alignment | Vincent Breitmoser | 2015-06-14 | 1 | -0/+2 | |
| | | | | ||||||
| | | * | travis: disable instrumentation for now | Vincent Breitmoser | 2015-06-14 | 1 | -5/+7 | |
| | | | | ||||||
| | | * | travis: random testing | Vincent Breitmoser | 2015-06-13 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | add instrumentation tests | Vincent Breitmoser | 2015-06-13 | 1 | -1/+8 | |
| | | | | ||||||
| | | * | try travis with android lang type | Vincent Breitmoser | 2015-06-13 | 1 | -15/+17 | |
| | | | | ||||||
| | | * | (minor) layout changes | Vincent Breitmoser | 2015-06-13 | 2 | -3/+2 | |
| | | | | ||||||
| | | * | fix instrumentation test(s) | Vincent Breitmoser | 2015-06-13 | 2 | -14/+21 | |
| | | | | ||||||
| | | * | 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 | 145 | -247/+255 | |
| | | |\ | |_|_|/ |/| | | | ||||||
* | | | | 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 ↵ | Dominik Schürmann | 2015-06-11 | 131 | -235/+152 | |
| | | | | | | | | | | | | upgraded for this, temporary disabled separate debug builds | |||||
* | | | 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 | 23 | -259/+274 | |
| | |\ | | |/ | |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | |||||
| * | | 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 | |
| |\ \ | |/ / |/| | | ||||||
* | | | 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 | |
| | | |