aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* certs: display cert type in cert viewVincent Breitmoser2014-04-061-0/+5
|
* certs: display uid status in uid listVincent Breitmoser2014-04-061-1/+1
|
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-05158-1170/+4029
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java 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/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
| * Change headers in encrypt activity to be more descriptiveDominik Schürmann2014-04-041-2/+2
| |
| * db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-041-11/+0
| |
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0428-17/+236
| |\
| | * Update from transifexDominik Schürmann2014-04-0325-1/+221
| | |
| | * ChangelogDominik Schürmann2014-04-031-1/+1
| | |
| | * Key lookup for APIDominik Schürmann2014-04-031-1/+1
| | |
| | * Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-032-15/+14
| | |
| * | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-1/+2
| |/
| * Rename "armour" to "armor"Thialfihar2014-04-022-4/+4
| |
| * Started changelog for 2.5Dominik Schürmann2014-04-021-0/+8
| |
| * Update from transifexDominik Schürmann2014-04-0232-270/+217
| |
| * confirm that empty IDs are really wantedAshley Hughes2014-04-021-0/+1
| |
| * Menu cleanupDominik Schürmann2014-04-013-24/+42
| |
| * test: add junit+robolectric to buildfiles and stub test fileVincent Breitmoser2014-04-011-1/+1
| |
| * languageDominik Schürmann2014-04-011-2/+2
| |
| * More layout fixesDominik Schürmann2014-04-011-56/+62
| |
| * More layout fixesDominik Schürmann2014-04-012-97/+108
| |
| * Language clarificationsDominik Schürmann2014-04-013-9/+11
| |
| * Fix layoutsDominik Schürmann2014-04-0110-97/+99
| |
| * Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-011-0/+1
| |\
| | * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-0/+1
| | |
| * | Small layout fix (more to come)Dominik Schürmann2014-04-011-1/+1
| | |
| * | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-015-319/+37
| | |
| * | Layouts for new encrypt designDominik Schürmann2014-03-316-12/+263
| |/
| * Include signature result in fragmentsDominik Schürmann2014-03-303-45/+38
| |
| * Decrypt mostly works againDominik Schürmann2014-03-302-131/+12
| |
| * More experimental work on decrypt fragmentsDominik Schürmann2014-03-304-141/+208
| |
| * Experiments with fragments in decrypt activityDominik Schürmann2014-03-304-96/+182
| |
| * Remove cancel from app menuDominik Schürmann2014-03-301-4/+0
| |
| * Revert "Remove cancel from app menu"Dominik Schürmann2014-03-301-0/+4
| | | | | | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4.
| * Remove cancel from app menuDominik Schürmann2014-03-301-4/+0
| |
| * use save icon, not tickAshley Hughes2014-03-291-1/+1
| |
| * merge masterAshley Hughes2014-03-29177-1401/+4848
| |\
| | * Sync changelog and about with transifexDominik Schürmann2014-03-2638-19/+545
| | |
| | * Changelog for 2.4Dominik Schürmann2014-03-261-0/+5
| | |
| | * Changelog for 2.4Dominik Schürmann2014-03-263-109/+21
| | |
| | * Update from transifexDominik Schürmann2014-03-2631-23/+422
| | |
| | * Show divider only when usedDominik Schürmann2014-03-261-2/+2
| | |
| | * Text for creation of new api accountsDominik Schürmann2014-03-262-0/+9
| | |
| | * Rename layouts for remote activityDominik Schürmann2014-03-264-0/+0
| | |
| | * Accounts activity prettifiedDominik Schürmann2014-03-261-8/+28
| | |
| | * Accounts list prettifiedDominik Schürmann2014-03-266-6/+15
| | |
| | * fix capability icons and remove red text for revoked keysuberspot2014-03-261-15/+18
| | |
| | * Forgot resourceDominik Schürmann2014-03-261-0/+14
| | |
| | * Merge pull request #482 from uberspot/masterDominik Schürmann2014-03-261-15/+22
| | |\ | | | | | | | | Fix style for expired/revoked keys
| | | * put expiry on a separate lineuberspot2014-03-261-15/+22
| | | |
| | * | Part 2 of basic user interface for api accountsDominik Schürmann2014-03-262-54/+23
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:19:16 +0000