aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/menu
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into certsVincent Breitmoser2014-03-152-5/+23
|\ | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| * Readd create key menu itemsDominik Schürmann2014-03-131-4/+22
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-131-1/+1
| |\ | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-122-2/+2
| | |\ | | | | | | | | Lint error fix after testing
| | | * Lint changes after testingBhargav Golla2014-03-102-2/+2
| | | |
* | | | Merge branch 'master' into certsVincent Breitmoser2014-03-122-4/+18
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-124-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
| * | | Add export... button and functionality in multi-selectuberspot2014-03-112-0/+8
| | |/ | |/|
| * | Revert "Lint changes"Dominik Schürmann2014-03-102-2/+2
| | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
| * | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-102-2/+2
| |\ \ | | | | | | | | Lint changes #223
| | * | Lint changesBhargav Golla2014-03-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
| * | | Fix for #347Nikhil Peter Raj2014-03-081-2/+2
| |/ /
| * | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-062-0/+8
| | |
| * | add lock icon for 'Encrypt to..' multiselect optionuberspot2014-03-061-0/+1
| | |
| * | Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-061-1/+6
| | |
* | | add menu to viewcertactivityVincent Breitmoser2014-03-121-0/+13
| |/ |/|
* | ditch old key list activitiesVincent Breitmoser2014-03-084-58/+0
| |
* | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-062-0/+27
|/
* Certify not sign a key, added as button, does not belong to menuDominik Schürmann2014-02-041-4/+0
|
* Resolve crashes on Android 2.3 due to ActionBarCompat conversionDominik Schürmann2014-02-027-58/+63
|
* New Gradle project structureDominik Schürmann2014-01-277-0/+165
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 18:54:54 +0000