Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 1 | -41/+41 |
| | |||||
* | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 1 | -136/+142 |
| | |||||
* | Uncluttering App Settings: Move advanced info in dialog | Dominik Schürmann | 2015-02-23 | 1 | -18/+30 |
| | |||||
* | More toolbar fixes | Dominik Schürmann | 2015-02-03 | 1 | -0/+1 |
| | |||||
* | Toolbar fixes, Toolbar under status bar on Lollipop | Dominik Schürmann | 2015-02-03 | 1 | -7/+19 |
| | |||||
* | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -31/+68 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-02 | 3 | -6/+6 |
|\ | | | | | | | development | ||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 3 | -6/+6 |
| | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | UI experiments for app settings | Dominik Schürmann | 2015-02-02 | 1 | -11/+20 |
|/ | |||||
* | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 4 | -12/+12 |
| | |||||
* | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 2 | -3/+321 |
| | |||||
* | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 1 | -1/+0 |
| | |||||
* | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 3 | -57/+0 |
| | |||||
* | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 1 | -8/+16 |
| | |||||
* | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 2 | -26/+18 |
| | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 3 | -197/+203 |
| | |||||
* | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 4 | -14/+35 |
| | |||||
* | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 1 | -2/+5 |
| | |||||
* | Fix crash with NotFoundException | Dominik Schürmann | 2014-10-26 | 1 | -3/+8 |
| | |||||
* | Fixes and icons for apps list, also add Password Store | Dominik Schürmann | 2014-10-25 | 1 | -12/+25 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 3 | -7/+6 |
| | |||||
* | Better handling if no api key is selected | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| | |||||
* | Better handling if no api key is selected | Dominik Schürmann | 2014-10-09 | 1 | -5/+4 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 2 | -2/+3 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 2 | -3/+2 |
| | |||||
* | Dont show keyboard by default in key creation to allow the user to get an ↵ | Dominik Schürmann | 2014-09-27 | 1 | -5/+6 |
| | | | | overview what to type, use spannable where possible | ||||
* | Fixes for new app list | Dominik Schürmann | 2014-09-24 | 2 | -43/+86 |
| | |||||
* | propose apps in apps list | Dominik Schürmann | 2014-09-24 | 1 | -26/+141 |
| | |||||
* | Fix logging in NFcActivity | Dominik Schürmann | 2014-09-24 | 1 | -1/+12 |
| | |||||
* | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 1 | -2/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 2 | -5/+2 |
| | | | | created ui.util for everything related to formatting | ||||
* | PassphraseDialogActivity usage in Remote API | Dominik Schürmann | 2014-09-17 | 1 | -22/+0 |
| | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 3 | -11/+15 |
| | |||||
* | Use spannable directly instead of html conversion in SubkeysAdapter | Dominik Schürmann | 2014-09-13 | 1 | -2/+0 |
| | |||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 3 | -10/+5 |
| | |||||
* | Remove SelectSecretKey, not used anymore | Dominik Schürmann | 2014-09-07 | 1 | -1/+0 |
| | |||||
* | Save account on back press and with notify | Dominik Schürmann | 2014-09-07 | 3 | -7/+25 |
| | |||||
* | Drawer nav method cleanup | Dominik Schürmann | 2014-09-06 | 1 | -1/+1 |
| | |||||
* | Fix possible nullpointer in AppsListFragment | Dominik Schürmann | 2014-09-02 | 1 | -2/+1 |
| | |||||
* | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 2 | -31/+20 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 3 | -32/+59 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | Fix result handling in account settings | Dominik Schürmann | 2014-08-21 | 1 | -13/+10 |
| | | |||||
| * | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -0/+12 |
| | | |||||
| * | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 1 | -19/+37 |
| | | | | | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | ||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 2 | -23/+59 |
|\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | ||||
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 2 | -23/+59 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -6/+7 |
|\| | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -2/+0 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java |