aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | 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
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-06-243-10/+83
|\|
| * 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
| |
* | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-225-38/+73
|\| | | | | | | improve-file-more
| * 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
| | |
| * | Start new designed activityDominik Schürmann2014-06-213-0/+73
| |/
| * Use actionbar button for log activityDominik Schürmann2014-06-201-30/+0
| |
| * Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-8/+0
| |
* | Improve file more, Part 1mar-v-in2014-06-221-0/+1
|/ | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-19/+0
|
* Reference ic_launcher instead of iconDominik Schürmann2014-06-184-4/+4
|
* decrease size of search icons in importDominik Schürmann2014-06-182-2/+2
|
* Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵Dominik Schürmann2014-06-1815-2/+2
| | | | naming conventions
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-3/+4
|\
| * canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-3/+4
| |
* | consistent button design in import activityDominik Schürmann2014-06-182-18/+0
|/
* Merge branch 'new-edit'Vincent Breitmoser2014-06-181-1/+19
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml
| * new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-171-0/+19
| |
* | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-1/+2
| |
* | consolidate: almost sane loggingVincent Breitmoser2014-06-181-3/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 15:47:02 +0000