aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| |\
| | * 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
| |/
| * Accounts API, user interfaceDominik Schürmann2014-03-262-0/+36
| * Merge pull request #479 from AlexanderS/subkey-expiryDominik Schürmann2014-03-261-1/+9
| |\
| | * Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-1/+9
| * | Merge pull request #474 from honnel/empty-list-flashDominik Schürmann2014-03-251-2/+3
| |\ \
| | * | No "empty-list" layout flashing up on start of OpenKeychainDaniel Hammann2014-03-231-2/+3
| * | | Merge pull request #475 from thi/masterDominik Schürmann2014-03-2519-0/+114
| |\ \ \
| | * | | Add recent contributors to creditsThialfihar2014-03-2419-0/+114
| | | |/ | | |/|
| * | | More experimental work on api accountsDominik Schürmann2014-03-254-5/+23
| * | | Merge pull request #477 from thi/adjust-getting-started-textDominik Schürmann2014-03-2517-17/+17
| |\ \ \
| | * | | Change the getting started textThialfihar2014-03-2417-17/+17
| | |/ /
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-2520-78/+22
| |\| |
| | * | Remove icon set creditsThialfihar2014-03-2319-38/+0
| | * | Adjust encrypt layout, align signature with buttonThialfihar2014-03-231-2/+3