| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -1/+48 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml | |||||
| | * \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 1 | -0/+5 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml | |||||
| | * \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 9 | -123/+185 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | * \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 2 | -8/+17 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | * \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 4 | -32/+393 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | * \ \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 2 | -37/+261 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -6/+48 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | |||||
| | * | | | | | | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 1 | -0/+76 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Make keybase an experimental feature | Dominik Schürmann | 2015-08-28 | 1 | -0/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | some cleanup in FileHelper, and allow input of filename during export | Vincent Breitmoser | 2015-08-27 | 2 | -82/+117 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Experimental features settings reworked | Dominik Schürmann | 2015-08-27 | 1 | -6/+15 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Experimental feature setting | Dominik Schürmann | 2015-08-27 | 1 | -1/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-08-24 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | trigger indexing of file after operation (#1498) | Vincent Breitmoser | 2015-08-22 | 1 | -1/+6 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Move proxy pref values out of strings | Dominik Schürmann | 2015-08-24 | 1 | -7/+10 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | introduced constants for keyserver sync, fixed sync issue | Adithya Abraham Philip | 2015-08-20 | 2 | -3/+8 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | reworked keyserversyncadapterservice flow | Adithya Abraham Philip | 2015-08-20 | 1 | -12/+24 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Lock orientation for yubikey operations | Dominik Schürmann | 2015-08-12 | 1 | -0/+85 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | updated OrbotHelper with silent start | Adithya Abraham Philip | 2015-08-06 | 3 | -79/+293 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix preference version handling | Thialfihar | 2015-07-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move preference upgrade of theme to version 4 of the preferences. The upgrade is meant FROM that version to the next. | |||||
| * | | | | | | | | | Use a constant for the default value of the theme | Thialfihar | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rename updatePreferences() to upgradePreferences() | Thialfihar | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is really an upgrade of the preference store and not an update of values, it also is consistent with SQLiteOpenHelper.onUpgrade(). | |||||
| * | | | | | | | | | Refactor theme preference values into constants | Thialfihar | 2015-07-21 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also explicitly set a theme via preference updating to the default. | |||||
| * | | | | | | | | | Add theme setting | Thialfihar | 2015-07-21 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares that different themes can be added. Currently light and dark will just use the default OK theme. | |||||
| * | | | | | | | | | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | change wording of export dialog, remove "export secret" checkbox | Vincent Breitmoser | 2015-07-08 | 1 | -16/+22 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 1 | -0/+30 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed OrbotRequiredDialogActivity not finishing, orbot install dialog style | Adithya Abraham Philip | 2015-07-03 | 1 | -8/+44 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | reformatted code | Adithya Abraham Philip | 2015-07-03 | 2 | -3/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 3 | -37/+36 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed middleButton parameter being ignored | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | renamed to clarify necessity for two install dialog fragments | Adithya Abraham Philip | 2015-07-03 | 1 | -3/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 2 | -26/+15 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 5 | -60/+31 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added proxy to all import operations using KeychainService | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+48 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | orbot dialog fragments added | Adithya Abraham Philip | 2015-07-03 | 4 | -217/+142 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | removed NetCipher submodule, copied classes | Adithya Abraham Philip | 2015-07-03 | 2 | -0/+358 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed Proxy generation, proxy working for for cloud import | Adithya Abraham Philip | 2015-07-03 | 2 | -16/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed certificate pinning | Adithya Abraham Philip | 2015-07-03 | 1 | -10/+36 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed prefs | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added proxy support, silent right now | Adithya Abraham Philip | 2015-07-03 | 3 | -1/+127 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added ProxyPrefs | Adithya Abraham Philip | 2015-07-03 | 1 | -3/+38 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added NetCipher as submodule | Adithya Abraham Philip | 2015-07-03 | 2 | -429/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added proxy type | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+26 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added class sources | Adithya Abraham Philip | 2015-07-03 | 2 | -1/+9 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added license | Adithya Abraham Philip | 2015-07-03 | 2 | -3/+66 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | added proxy/tor preferences | Adithya Abraham Philip | 2015-07-03 | 3 | -0/+405 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-02 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |