aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Work on subkeys adapterDominik Schürmann2014-07-084-14/+64
|/ / / / /
* | | | | Bett API stringDominik Schürmann2014-07-041-3/+3
| | | | |
* | | | | Use strings in edit keyDominik Schürmann2014-07-032-4/+14
| | | | |
* | | | | Pull from transifexDominik Schürmann2014-07-033-7/+30
| | | | |
* | | | | Pull from transifexDominik Schürmann2014-07-0325-352/+1289
| | | | |
* | | | | Small strings fixDominik Schürmann2014-07-031-1/+1
| | | | |
* | | | | Remove old edit button, rename activitiesDominik Schürmann2014-07-031-16/+0
| | | | |
* | | | | Cache passphrase for editDominik Schürmann2014-07-032-7/+92
| | | | |
* | | | | edit key: subkey adapterDominik Schürmann2014-07-032-1/+97
| | | | |
* | | | | Work on editDominik Schürmann2014-07-033-12/+3
| | | | |
* | | | | A little bit less purpleDominik Schürmann2014-07-022-7/+4
| | | | |
* | | | | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-025-83/+72
|\ \ \ \ \
| * | | | | edit key: work on savingDominik Schürmann2014-07-021-8/+0
| | | | | |
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-021-1/+1
| |\ \ \ \ \
| * | | | | | Edit key: adding user idsDominik Schürmann2014-07-024-15/+72
| | | | | | |
| * | | | | | edit key: part 3Dominik Schürmann2014-07-011-60/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #695
| * | | | | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-0/+2
| | | | | |
* | | | | | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+1
| |/ / / / |/| | | | | | | | | | | | | | closes #703
* | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3042-90/+216
|\ \ \ \ \
| * | | | | (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-308-10/+345
| |\| | | |
| * | | | | Converted all other buttonsDaniel Albert2014-06-3018-30/+28
| | | | | |
| * | | | | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-2913-24/+90
| | | | | | | | | | | | | | | | | | | | | | | | Added drawables for them
| * | | | | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-5/+3
| | | | | |
| * | | | | Added new button style and converted account_settings and the ↵Daniel Albert2014-06-297-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | select_secret_key_layout to use it
| * | | | | Updated file_dialog to use the new buttonsDaniel Albert2014-06-291-6/+3
| | | | | |
| * | | | | Improved button styleDaniel Albert2014-06-293-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | centered buttons removed commented-out button
| * | | | | Added button_rounded styleDaniel Albert2014-06-282-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | converted decrypt_file_fragment to new style
* | | | | | work on edit keyDominik Schürmann2014-06-303-6/+2
| |/ / / / |/| | | |
* | | | | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-0/+6
| | | | |
* | | | | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-10/+23
| | | | | | | | | | | | | | | | | | | | closes #698
* | | | | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-287-0/+316
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-1/+1
| | | | |
| * | | | More wizardryDominik Schürmann2014-06-272-15/+43
| | | | |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-271-0/+8
| |\ \ \ \
| * | | | | Start work on a first-time wizardDominik Schürmann2014-06-275-0/+218
| | | | | |
| * | | | | new edit key: first version to add user idsDominik Schürmann2014-06-242-0/+70
| | | | | |
* | | | | | Switched to the dark iconsDaniel Albert2014-06-284-0/+0
| | | | | |
* | | | | | Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-275-3/+5
| | | | | |
* | | | | | Swapped out FontawesomeText with normal ImageViewDaniel Albert2014-06-261-10/+6
| |/ / / / |/| | | |
* | | | | Temporary fix for #648Daniel Albert2014-06-251-0/+8
|/ / / /
* | | / Rename registered apps to appsDominik Schürmann2014-06-241-2/+2
| |_|/ |/| |
* | | remove margin in import keys (leftover from nav drawer)Dominik Schürmann2014-06-231-2/+0
| | |
* | | new edit key: diff for existing user idsDominik Schürmann2014-06-222-10/+21
| | |
* | | add buttons in edit keyDominik Schürmann2014-06-221-0/+64
| |/ |/|
* | Revert hint_keybase_searchDominik Schürmann2014-06-221-1/+1
| |
* | Merge pull request #668 from timbray/masterDominik Schürmann2014-06-211-1/+1
|\ \ | | | | | | Moved Keybase stuff into KeybaseLib submodule
| * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-1/+1
| | |