Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Readd create key menu items | Dominik Schürmann | 2014-03-13 | 1 | -4/+22 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | ||||
| * | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 2 | -2/+2 |
| |\ | | | | | | | Lint error fix after testing | ||||
| | * | Lint changes after testing | Bhargav Golla | 2014-03-10 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 4 | -48/+9 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml | ||||
| * | | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 4 | -58/+0 |
| | | | |||||
| * | | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 2 | -0/+27 |
| | | | |||||
* | | | Add export... button and functionality in multi-select | uberspot | 2014-03-11 | 2 | -0/+8 |
| |/ |/| | |||||
* | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 2 | -2/+2 |
| | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee. | ||||
* | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 2 | -2/+2 |
|\ \ | | | | | | | Lint changes #223 | ||||
| * | | Lint changes | Bhargav Golla | 2014-03-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore | ||||
* | | | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 1 | -2/+2 |
|/ / | |||||
* | | Multiselect: Create 'select all' in public and secret keylist | uberspot | 2014-03-06 | 2 | -0/+8 |
| | | |||||
* | | add lock icon for 'Encrypt to..' multiselect option | uberspot | 2014-03-06 | 1 | -0/+1 |
| | | |||||
* | | Implement search for KeyListPublicFragment | Miroojin Bakshi | 2014-03-06 | 1 | -1/+6 |
|/ | |||||
* | Certify not sign a key, added as button, does not belong to menu | Dominik Schürmann | 2014-02-04 | 1 | -4/+0 |
| | |||||
* | Resolve crashes on Android 2.3 due to ActionBarCompat conversion | Dominik Schürmann | 2014-02-02 | 7 | -58/+63 |
| | |||||
* | New Gradle project structure | Dominik Schürmann | 2014-01-27 | 7 | -0/+165 |