Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-06-30 | 1 | -3/+4 | |
| |\ \ | ||||||
| | * | | small layout fix in EncryptTextFragment | Vincent Breitmoser | 2015-06-30 | 1 | -3/+4 | |
| | | | | ||||||
| * | | | Better settings workarounds | Dominik Schürmann | 2015-06-30 | 1 | -2/+3 | |
| |/ / | ||||||
| * | | earlier error on empty clipboard | Vincent Breitmoser | 2015-06-30 | 1 | -0/+1 | |
| | | | ||||||
| * | | Update from transifex | Dominik Schürmann | 2015-06-30 | 99 | -1517/+4347 | |
| | | | ||||||
| * | | Update changelog for 3.3 | Dominik Schürmann | 2015-06-30 | 1 | -0/+7 | |
| | | | ||||||
| * | | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 5 | -4/+81 | |
| |/ | ||||||
| * | cleanup share fragment, fix sharing of fingerprint | Vincent Breitmoser | 2015-06-29 | 1 | -1/+1 | |
| | | ||||||
| * | Remove html element in help_about | Dominik Schürmann | 2015-06-29 | 1 | -1/+1 | |
| | | ||||||
| * | Fix strings for transifex | Dominik Schürmann | 2015-06-29 | 1 | -2/+2 | |
| | | ||||||
* | | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+9 | |
|/ | ||||||
* | Language: Remember instead of caching | Dominik Schürmann | 2015-06-26 | 1 | -8/+8 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 7 | -3/+28 | |
|\ | ||||||
| * | use KeyAdapter for AllowedKeysListFragment | Vincent Breitmoser | 2015-06-26 | 1 | -0/+22 | |
| | | ||||||
| * | Notification: follow design guidelines, fix #1313 | Dominik Schürmann | 2015-06-24 | 1 | -3/+6 | |
| | | ||||||
| * | New notify icon | Dominik Schürmann | 2015-06-24 | 10 | -0/+0 | |
| | | ||||||
| * | New all-white status bar icon to fix issue #1356 | moparisthebest | 2015-06-22 | 5 | -0/+0 | |
| | | ||||||
* | | fix original file deletion (and instrumentation) | Vincent Breitmoser | 2015-06-23 | 1 | -1/+1 | |
| | | ||||||
* | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 14 | -18/+22 | |
| | | ||||||
* | | implement saving of files | Vincent Breitmoser | 2015-06-23 | 1 | -0/+2 | |
| | | ||||||
* | | instrument: adapt to new decrypt file dialog, and some minor fixes | Vincent Breitmoser | 2015-06-23 | 1 | -1/+1 | |
| | | ||||||
* | | move select file logic into EncryptDecryptOverviewFragment | Vincent Breitmoser | 2015-06-22 | 2 | -26/+11 | |
| | | ||||||
* | | don't expose dataset for FileAdapter in encrypt view, small improvements to ↵ | Vincent Breitmoser | 2015-06-22 | 18 | -18/+19 | |
| | | | | | | | | error handling | |||||
* | | order menu items for encrypt operations | Vincent Breitmoser | 2015-06-22 | 3 | -6/+18 | |
| | | ||||||
* | | multi-decrypt: use indeterminate progress only | Vincent Breitmoser | 2015-06-22 | 2 | -50/+46 | |
| | | ||||||
* | | add failure state to DecryptListFragment | Vincent Breitmoser | 2015-06-22 | 1 | -1/+49 | |
| | | ||||||
* | | instrument: update symmetric tests | Vincent Breitmoser | 2015-06-20 | 1 | -1/+0 | |
| | | ||||||
* | | fix overflow icon | Vincent Breitmoser | 2015-06-20 | 4 | -1/+1 | |
| | | ||||||
* | | drop clipboard backwards compatibility for api level < 11 | Vincent Breitmoser | 2015-06-20 | 10 | -10/+12 | |
| | | ||||||
* | | allow encrypting to clipboard in EncryptFileFragment | Vincent Breitmoser | 2015-06-20 | 1 | -0/+5 | |
| | | ||||||
* | | more work on decrypt fragment ux | Vincent Breitmoser | 2015-06-20 | 1 | -0/+4 | |
| | | ||||||
* | | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 1 | -4/+6 | |
| | | ||||||
* | | handle empty filename in decrypt list | Vincent Breitmoser | 2015-06-19 | 1 | -0/+1 | |
| | | ||||||
* | | handle EXTRA_TEXT in decrypt activity | Vincent Breitmoser | 2015-06-19 | 1 | -2/+3 | |
| | | ||||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -0/+1 | |
|\| | ||||||
| * | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -0/+1 | |
| | | ||||||
* | | handle multiple input URIs and Intent.SEND_MULTIPLE | Vincent Breitmoser | 2015-06-18 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+1 | |
|\| | ||||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 5 | -58/+43 | |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| * | nicer preview of decrypt_text_fragment layout | Vincent Breitmoser | 2015-06-17 | 1 | -0/+3 | |
| | | ||||||
| * | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 2 | -57/+19 | |
| | | ||||||
| * | improve preview of ViewKeyActivity layout | Vincent Breitmoser | 2015-06-17 | 1 | -1/+10 | |
| | | ||||||
| * | (minor) layout changes | Vincent Breitmoser | 2015-06-17 | 1 | -1/+2 | |
| | | ||||||
| * | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 1 | -0/+4 | |
| | | ||||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 1 | -0/+11 | |
| |\ | | | | | | | Improved smart card error handling | |||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -8/+11 | |
| | | | ||||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 1 | -0/+8 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 2 | -2/+2 | |
| |\| | ||||||
* | | | fix status icon alignment | Vincent Breitmoser | 2015-06-14 | 1 | -0/+2 | |
| | | |