aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-0/+5
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-113-14/+34
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| | * | | | get rid of some inspection warningsVincent Breitmoser2014-07-111-1/+1
| | | | | |
| | * | | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+1
| | | | | |
| | * | | | add come createKey stringsVincent Breitmoser2014-07-111-1/+8
| | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-131-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| | | | |
| * | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-122-0/+6
| |/ / /
| * | | Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| | | |
| * | | Fixed issues discussed in #713Daniel Albert2014-07-121-2/+3
| | | |
| * | | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-0/+6
| | |/ | |/|
| * | cleanupDominik Schürmann2014-07-081-30/+0
| | |
| * | Work on subkeys adapterDominik Schürmann2014-07-084-14/+64
| |/
* | - add multi select for storage api (kitkat)mar-v-in2014-07-314-30/+27
| | | | | | | | | | - UI fixes - refactoring
* | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-203-13/+43
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-0636-483/+1601
|\| | | | | | | | | | | | | | | | | 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-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
* | | Many changes to file ... and still incompletemar-v-in2014-07-0624-237/+261
| | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | Encrypt/Decrypt UI workmar-v-in2014-07-024-79/+110
| | |
* | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0163-115/+578
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 17:50:39 +0000