aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-0670-1927/+3537
|\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * Bett API stringDominik Schürmann2014-07-041-3/+3
| |
| * Use strings in edit keyDominik Schürmann2014-07-033-7/+18
| |
| * 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-038-819/+782
| |
| * 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-035-37/+152
| |
| * parcel newPassphraseDominik Schürmann2014-07-031-0/+4
| |
| * cleanupDominik Schürmann2014-07-032-0/+5
| |
| * edit key: subkey adapterDominik Schürmann2014-07-034-2/+458
| |
| * Work on editDominik Schürmann2014-07-038-60/+69
| |
| * smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
| |
| * Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
| |
| * A little bit less purpleDominik Schürmann2014-07-022-7/+4
| |
| * merge KeychainIntentServiceDominik Schürmann2014-07-029-105/+343
| |\
| | * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0216-461/+341
| | |\
| | * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-029-104/+342
| | |\ \
| | | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-023-4/+115
| | | | | | | | | | | | | | | | | | | | Closes #695
| | | * | 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-297-61/+118
| | | | |
| * | | | 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-024-31/+24
| | | |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-023-2/+7
| |\| |
| | * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| | | |
| | * | don't use zero plural string for englishVincent Breitmoser2014-07-022-2/+6
| | | | | | | | | | | | | | | | closes #703
| * | | Edit key: adding user idsDominik Schürmann2014-07-0214-236/+330
| | | |
| * | | edit key: part 3Dominik Schürmann2014-07-015-387/+180
| |/ /
* | | Many changes to file ... and still incompletemar-v-in2014-07-0635-345/+897
| | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| | |
* | | Encrypt/Decrypt UI workmar-v-in2014-07-0212-152/+216
| | |
* | | Add temporary file storage as discussed in #665mar-v-in2014-07-015-0/+201
| | | | | | | | | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
* | | Missing import after mergemar-v-in2014-07-011-0/+1
| | |
* | | Merge branch 'master' into improve-file-moremar-v-in2014-07-01112-620/+2177
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * | remove leftover of AndroidBootstrapDominik Schürmann2014-06-301-0/+0
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3057-158/+268
| |\ \
| | * | Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| | | |
| | * | (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| | | |
| | * | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| | | |
| | * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3030-309/+1460
| | |\|
| | * | Converted all other buttonsDaniel Albert2014-06-3023-60/+48
| | | |
| | * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-2917-37/+102
| | | | | | | | | | | | | | | | Added drawables for them
| | * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-292-9/+6
| | | |
| | * | Added new button style and converted account_settings and the ↵Daniel Albert2014-06-299-19/+51
| | | | | | | | | | | | | | | | select_secret_key_layout to use it
| | * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-293-13/+9
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 21:29:18 +0000