aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-06335-14127/+0
* Pull from transifexDominik Schürmann2014-04-0638-106/+124
* certs: remove unused menu itemVincent Breitmoser2014-04-061-4/+0
* certs: display green dot for certified keys in KeyListFragmentVincent Breitmoser2014-04-061-0/+8
* certs: forgot to add ids fileVincent Breitmoser2014-04-061-0/+6
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-0610-55/+27
|\
| * Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-051-19/+12
| * Rework menu itemsDominik Schürmann2014-04-058-10/+14
| * Fix nfc, make edit activity like a modal dialog, move all menu actions into v...Dominik Schürmann2014-04-052-26/+1
* | certs: ditch expiry, re-add data blob, improve ViewCertActivityVincent Breitmoser2014-04-061-8/+29
* | certs: fix ViewCertActivityVincent Breitmoser2014-04-061-8/+5
* | certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-062-4/+8
* | certs: ditch selection spinner from certs viewVincent Breitmoser2014-04-061-12/+1
* | 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
|\|
| * 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
| * 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