aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-0632-1441/+1934
|\
| * Use strings in edit keyDominik Schürmann2014-07-031-3/+4
| * Remove old edit button, rename activitiesDominik Schürmann2014-07-036-801/+780
| * cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
| * fix no passphrase checkDominik Schürmann2014-07-031-1/+3
| * Cache passphrase for editDominik Schürmann2014-07-031-2/+2
| * Cache passphrase for editDominik Schürmann2014-07-033-30/+60
| * parcel newPassphraseDominik Schürmann2014-07-031-0/+4
| * cleanupDominik Schürmann2014-07-032-0/+5
| * edit key: subkey adapterDominik Schürmann2014-07-032-1/+361
| * Work on editDominik Schürmann2014-07-035-48/+66
| * smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
| * Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
| * merge KeychainIntentServiceDominik Schürmann2014-07-027-104/+339
| |\
| | * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0211-378/+269
| | |\
| | * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-027-103/+338
| | |\ \
| | | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-022-4/+113
| | | * | use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
| | | * | fix subkey additionVincent Breitmoser2014-07-022-37/+62
| | | * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-295-60/+116
| * | | | fix nullpointer, cleanupDominik Schürmann2014-07-023-10/+9
| * | | | remove init methods from adapterDominik Schürmann2014-07-024-88/+53
| | |_|/ | |/| |
| * | | edit key: work on savingDominik Schürmann2014-07-023-23/+24
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-022-1/+6
| |\| |
| | * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| | * | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
| * | | Edit key: adding user idsDominik Schürmann2014-07-0210-221/+258
| * | | edit key: part 3Dominik Schürmann2014-07-014-327/+180
| |/ /
* | | Many changes to file ... and still incompletemar-v-in2014-07-0610-108/+635
* | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
* | | Encrypt/Decrypt UI workmar-v-in2014-07-028-73/+106
* | | Add temporary file storage as discussed in #665mar-v-in2014-07-014-0/+192
* | | Missing import after mergemar-v-in2014-07-011-0/+1
* | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0144-504/+1494
|\| |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-68/+52
| |\ \
| | * | Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| | * | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| | * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3021-299/+1109
| | |\|
| | * | Converted all other buttonsDaniel Albert2014-06-305-30/+20
| | * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-294-13/+12
| | * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
| | * | Added new button style and converted account_settings and the select_secret_k...Daniel Albert2014-06-292-9/+6
| | * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-292-7/+6
| | * | Added button_rounded styleDaniel Albert2014-06-281-3/+3
| * | | work on edit keyDominik Schürmann2014-06-304-34/+82
| | |/ | |/|
| * | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-284-83/+119
| * | fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-283-3/+20
| * | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-288-144/+117
| * | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-2811-71/+855
| |\ \ | | |/ | |/|
| | * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-283-4/+145
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:44:26 +0000