Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 56 | -272/+202 |
| | |||||
* | specify our usage of java 1.7 in build files | Vincent Breitmoser | 2015-01-25 | 1 | -0/+5 |
| | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 88 | -838/+757 |
| | |||||
* | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 8 | -1/+208 |
| | |||||
* | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 6 | -16/+114 |
| | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 2 | -1/+8 |
| | |||||
* | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 5 | -39/+56 |
| | |||||
* | 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 | 21 | -573/+39 |
| | |||||
* | Fix drawable sizes | Dominik Schürmann | 2015-01-14 | 19 | -0/+0 |
| | |||||
* | Yubikey numkey by default to true | Dominik Schürmann | 2015-01-14 | 2 | -1/+4 |
| | |||||
* | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 13 | -19/+56 |
| | |||||
* | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 3 | -4/+12 |
| | | | | 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 | 37 | -1/+1 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 4 | -5/+30 |
|\ | | | | | | | development | ||||
| * | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 4 | -3/+28 |
| | | |||||
| * | 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 |
| | |||||
* | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 11 | -20/+7 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 17 | -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 | ||||
| * | 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 | 19 | -180/+243 |
| | | |||||
* | | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 2 | -7/+4 |
|/ | |||||
* | 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 |
| | | |||||
* | | Test new icon | Dominik Schürmann | 2015-01-07 | 6 | -0/+0 |
| | | |||||
* | | 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 |
| | | |||||
* | | OpenPGP not PGP | Dominik Schürmann | 2015-01-07 | 2 | -2/+2 |
| | | |||||
* | | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 2 | -31/+26 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 31 | -256/+621 |
|\| | | | | | | | development |