Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+1 | |
| | | | | due to security reasons | |||||
* | 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 | 1 | -0/+1 | |
|\ | | | | | | | development | |||||
| * | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 | |
| | | ||||||
* | | Fix SearchView | Dominik Schürmann | 2015-01-14 | 4 | -19/+44 | |
|/ | ||||||
* | 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 | 1 | -8/+18 | |
| | ||||||
* | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 9 | -12/+0 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -1/+36 | |
|\ | | | | | | | development | |||||
| * | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+17 | |
| | | ||||||
| * | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -0/+3 | |
| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -1/+16 | |
| | | ||||||
* | | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 27 | -828/+1099 | |
| | | ||||||
* | | Green | Dominik Schürmann | 2015-01-13 | 227 | -45/+164 | |
| | | ||||||
* | | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 10 | -125/+154 | |
|/ | ||||||
* | 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 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 9 | -56/+74 | |
|\ | | | | | | | development | |||||
| * | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 | |
| | | ||||||
| * | add more descriptive string about non-mdc encrypted data | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 | |
| | | ||||||
| * | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -0/+8 | |
| | | ||||||
| * | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 1 | -6/+7 | |
| | | ||||||
| * | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 9 | -49/+51 | |
| | | ||||||
| * | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -1/+3 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 18 | -29/+29 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+2 | |
| | | | ||||||
| * | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 9 | -9/+11 | |
| | | | | | | | | | | | | notation packet | |||||
* | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 7 | -0/+280 | |
| |/ |/| | ||||||
* | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 18 | -28/+29 | |
|/ | ||||||
* | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 2 | -2/+0 | |
| | ||||||
* | Fix spelling of 'K-9 Mail' in FAQ | cketti | 2014-11-26 | 1 | -3/+3 | |
| | ||||||
* | NFC activity design | Dominik Schürmann | 2014-11-21 | 4 | -19/+14 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-11-02 | 23 | -17/+182 | |
| | ||||||
* | Changelog | Dominik Schürmann | 2014-11-02 | 1 | -0/+5 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-30 | 27 | -101/+467 | |
| | ||||||
* | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -0/+6 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 20 | -0/+220 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 56 | -878/+3333 | |
| | ||||||
* | Changelog 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -0/+12 | |
| | ||||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 5 | -299/+85 | |
| | ||||||
* | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 | |
| | | | | Closes #978 | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -4/+4 | |
|\ | | | | | | | development | |||||
| * | Use new safe slinger activity from share tab | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 | |
| | | ||||||
* | | add descriptive text to safeslinger activity | Vincent Breitmoser | 2014-10-26 | 3 | -16/+36 | |
|/ | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 | |
|\ | | | | | | | development | |||||
| * | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 | |
| | | ||||||
* | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 6 | -80/+111 | |
|/ | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -0/+1 | |
|\ | | | | | | | development |