Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 3 | -2/+10 | |
| | | | ||||||
* | | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 7 | -41/+58 | |
| | | | ||||||
* | | | forgot another test case in prev. commit | Vincent Breitmoser | 2015-01-19 | 1 | -1/+2 | |
| | | | ||||||
* | | | fix unit test for new key flag behavior | Vincent Breitmoser | 2015-01-19 | 1 | -2/+2 | |
| | | | ||||||
* | | | only respect most recent signature for key flags | Vincent Breitmoser | 2015-01-19 | 2 | -12/+42 | |
| | | | ||||||
* | | | always show revoked user ids last! | Vincent Breitmoser | 2015-01-19 | 1 | -4/+4 | |
| | | | ||||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-19 | 2 | -1/+9 | |
|\ \ \ | | |/ | |/| | | | | development | |||||
| * | | No setContentView in onCreate for KeyListActivity | Vincent | 2015-01-16 | 1 | -2/+0 | |
| | | | ||||||
| * | | show notification if KeyListActivity is spawned with an EXTRA_RESULT | Vincent Breitmoser | 2015-01-16 | 2 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | |||||
* | | | Disable sharing chooser blacklisting for lollipop | Dominik Schürmann | 2015-01-19 | 3 | -3/+6 | |
|/ / | ||||||
* | | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 22 | -573/+43 | |
| | | ||||||
* | | Fix drawable sizes | Dominik Schürmann | 2015-01-14 | 20 | -3/+3 | |
| | | ||||||
* | | Yubikey numkey by default to true | Dominik Schürmann | 2015-01-14 | 2 | -1/+4 | |
| | | ||||||
* | | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 14 | -20/+58 | |
| | | ||||||
* | | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 5 | -6/+17 | |
| | | | | | | | | due to security reasons | |||||
* | | Increase minSdk to 15, according to stats | Dominik Schürmann | 2015-01-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | development | |||||
| * | | fix ambiguous column name in advanced key info | Vincent Breitmoser | 2015-01-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Reorganize folders of graphics sources | Dominik Schürmann | 2015-01-14 | 209 | -78/+596 | |
|/ / | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 8 | -20/+169 | |
|\ \ | | | | | | | | | | development | |||||
| * | | involve user attributes in unit tests for merge and canonicalize! | Vincent Breitmoser | 2015-01-14 | 3 | -15/+73 | |
| | | | ||||||
| * | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 4 | -3/+28 | |
| | | | ||||||
| * | | add basic tests for addition of user attributes | Vincent Breitmoser | 2015-01-14 | 1 | -0/+66 | |
| | | | ||||||
| * | | fix log entry for addition of user attributes | Vincent Breitmoser | 2015-01-14 | 1 | -3/+3 | |
| | | | ||||||
* | | | Fix SearchView | Dominik Schürmann | 2015-01-14 | 5 | -39/+48 | |
|/ / | ||||||
* | | Better way to have dark toolbar and light theme | Dominik Schürmann | 2015-01-14 | 2 | -33/+3 | |
| | | ||||||
* | | Fix Toolbars in decrypt activities | Dominik Schürmann | 2015-01-14 | 3 | -14/+30 | |
| | | ||||||
* | | svg backup icon | Dominik Schürmann | 2015-01-14 | 1 | -0/+213 | |
| | | ||||||
* | | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 15 | -295/+16 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 18 | -102/+698 | |
|\ \ | | | | | | | | | | development | |||||
| * | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 8 | -16/+202 | |
| | | | ||||||
| * | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 9 | -88/+120 | |
| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | |||||
| * | | update spongycastle with more public methods for WrappedUserAttribute | Vincent Breitmoser | 2015-01-13 | 1 | -0/+0 | |
| | | | ||||||
| * | | hack to make WrappedUserAttribute serializable | Vincent Breitmoser | 2015-01-13 | 1 | -0/+90 | |
| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java | |||||
| * | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 4 | -3/+60 | |
| | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | add support for user attributes in merge() routine | Vincent Breitmoser | 2015-01-13 | 1 | -2/+28 | |
| | | | ||||||
| * | | remove LinkedIdentity (committed earlier by accident) | Vincent Breitmoser | 2015-01-13 | 1 | -160/+0 | |
| | | | ||||||
| * | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 5 | -1/+366 | |
| | | | ||||||
* | | | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 26 | -62/+85 | |
| | | | ||||||
* | | | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 43 | -878/+1190 | |
| | | | ||||||
* | | | Green | Dominik Schürmann | 2015-01-13 | 227 | -45/+164 | |
| | | | ||||||
* | | | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 20 | -180/+247 | |
| | | | ||||||
* | | | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 3 | -7/+4 | |
|/ / | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-12 | 1 | -7/+28 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | Merge pull request #1023 from adithyaphilip/development | Dominik Schürmann | 2015-01-12 | 1 | -7/+28 | |
| |\ \ | | |/ | |/| | Issue #954 - fixed crash when file scheme is passed, broadened deletion scope | |||||
| | * | fixed crash when file scheme is passed, broadened deletion scope | Abraham Philip | 2015-01-09 | 1 | -7/+28 | |
| | | | ||||||
* | | | Update safeslinger lib | Dominik Schürmann | 2015-01-12 | 1 | -0/+0 | |
|/ / | ||||||
* | | Test new icon | Dominik Schürmann | 2015-01-07 | 10 | -3603/+3868 | |
| | | ||||||
* | | OpenPGP instead of PGP | Dominik Schürmann | 2015-01-07 | 1 | -5/+5 | |
| | | ||||||
* | | PIn not pin passphrase | Dominik Schürmann | 2015-01-07 | 1 | -1/+1 | |
| | |