Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fix ambiguous column name in advanced key info | Vincent Breitmoser | 2015-01-14 | 1 | -1/+1 | |
| | | ||||||
* | | Fix SearchView | Dominik Schürmann | 2015-01-14 | 1 | -20/+4 | |
| | | ||||||
* | | Fix Toolbars in decrypt activities | Dominik Schürmann | 2015-01-14 | 2 | -6/+12 | |
| | | ||||||
* | | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 2 | -8/+7 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 4 | -23/+22 | |
|\ \ | | | | | | | | | | development | |||||
| * | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 4 | -23/+22 | |
| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | |||||
* | | | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 22 | -48/+50 | |
| | | | ||||||
* | | | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 16 | -50/+91 | |
| | | | ||||||
* | | | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 7 | -53/+83 | |
|/ / | ||||||
* | | 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 | |
| | | | ||||||
* | | | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 1 | -25/+25 | |
| | | | ||||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 3 | -8/+11 | |
|\| | | | | | | | | | | | development | |||||
| * | | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -4/+6 | |
| | | | ||||||
| * | | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 1 | -1/+2 | |
| | | | ||||||
| * | | fix small merge conflict oversight | Vincent Breitmoser | 2014-12-30 | 1 | -3/+0 | |
| | | | ||||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -32/+85 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+3 | |
| | | | | ||||||
* | | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 2 | -22/+627 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-29 | 2 | -4/+12 | |
|\| | | | | | | | | | | | development | |||||
| * | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 2 | -4/+12 | |
| | | | | | | | | | | | | capabilities | |||||
* | | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -32/+85 | |
|/ / | ||||||
* / | Fix crash on first time wizard | Dominik Schürmann | 2014-12-28 | 1 | -2/+2 | |
|/ | ||||||
* | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 | |
| | | | | Closes #981 | |||||
* | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 | |
| | ||||||
* | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 | |
| | ||||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 6 | -22/+17 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 | |
|\ | | | | | | | development | |||||
| * | disable cancel button instead of hiding it on cancel prevention | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 | |
| | | ||||||
* | | Fix notify after certify | Dominik Schürmann | 2014-10-26 | 2 | -26/+20 | |
|/ | ||||||
* | Use new safe slinger activity from share tab | Dominik Schürmann | 2014-10-26 | 1 | -76/+26 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -8/+11 | |
|\ | | | | | | | development | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -10/+10 | |
| |\ | | | | | | | | | | development | |||||
| * | | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -8/+11 | |
| | | | ||||||
* | | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 4 | -253/+214 | |
| |/ |/| | ||||||
* | | Keyboard tests | Dominik Schürmann | 2014-10-26 | 1 | -10/+10 | |
|/ | ||||||
* | Fail on unknown key ids on API, Key item design consistency for API | Dominik Schürmann | 2014-10-26 | 2 | -3/+4 | |
| | ||||||
* | Fix layout of select key adapter | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 | |
| | ||||||
* | Remove empty layout | Dominik Schürmann | 2014-10-25 | 1 | -24/+0 | |
| | ||||||
* | Remove PassphraseDialogFragment | Dominik Schürmann | 2014-10-25 | 2 | -435/+2 | |
| | ||||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 3 | -461/+1 | |
| | ||||||
* | Use passphrase dialog activity instead of passphrase dialog | Dominik Schürmann | 2014-10-25 | 3 | -36/+67 | |
| | ||||||
* | Remove old exception handling code from loaders | Dominik Schürmann | 2014-10-25 | 1 | -35/+3 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -1/+10 | |
|\ | | | | | | | development | |||||
| * | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -1/+10 | |
| | | ||||||
* | | Fix color in import list | Dominik Schürmann | 2014-10-25 | 1 | -6/+8 | |
|/ | ||||||
* | Remove tabs from import keys activity | Dominik Schürmann | 2014-10-25 | 3 | -320/+62 | |
| | ||||||
* | Fix result passing | Dominik Schürmann | 2014-10-25 | 2 | -2/+1 | |
| | ||||||
* | Safeslinger fixesÄ | Dominik Schürmann | 2014-10-25 | 1 | -4/+6 | |
| | ||||||
* | Fix safe slinger button | Dominik Schürmann | 2014-10-25 | 1 | -1/+1 | |
| |