aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
* Fix merge conflictsDominik Schürmann2015-12-271-2/+0
* inline-edit: move action mode menu handling int activityVincent Breitmoser2015-12-274-16/+12
* inline subkey editing, fixedVincent Breitmoser2015-12-271-1/+1
* inline subkey editing (wip commit)Vincent Breitmoser2015-12-2722-46/+115
* extend-uid: use FAB instead of extra list itemVincent Breitmoser2015-12-273-55/+80
* extend-uid: button and list to add user idsVincent Breitmoser2015-12-271-1/+42
* extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-271-0/+2
* extend-uid: add option icon for edit action modeVincent Breitmoser2015-12-274-13/+39
* Fix some strings thanks to Alain-OlivierDominik Schürmann2015-12-271-3/+3
* Remove unused layoutDominik Schürmann2015-12-224-246/+0
* Remove unused layoutDominik Schürmann2015-12-221-37/+0
* Backup: Move FAQ button to last screen and simplify codeDominik Schürmann2015-12-223-116/+111
* Update FAQ from websiteDominik Schürmann2015-12-221-57/+90
* Improve how_to_importDominik Schürmann2015-12-221-1/+1
* Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaL...Dominik Schürmann2015-12-224-1/+54
|\
| * Issue #1595aLIEzTed2015-12-224-1/+54
* | Default for theme settingDominik Schürmann2015-12-221-2/+3
* | Add hint to encrypt fieldDominik Schürmann2015-12-222-1/+2
* | added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-063-7/+10
|/
* Pull from transifexDominik Schürmann2015-11-2423-0/+92
* 3.7 changelogDominik Schürmann2015-11-231-0/+4
* Pull from transifexDominik Schürmann2015-11-2348-421/+3509
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-238-33/+33
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-232-86/+1
* Add first time wizard for sync settingsDominik Schürmann2015-11-232-1/+86
* Show notification when READ_CONTACTS permission is denied in sync service, hi...Dominik Schürmann2015-11-236-0/+2
* Request contact permission in settings for contact linkingDominik Schürmann2015-11-231-4/+4
* Handle denied storage permission, use ContentResolver.SCHEME_FILE constantDominik Schürmann2015-11-191-0/+1
* Merge pull request #1543 from rohands/issue_mouseover_hintsVincent2015-11-163-1/+12
|\
| * Class names and string names are updatedrohands2015-09-223-9/+11
| * Updatedrohands2015-09-202-1/+6
| * Mousehintsrohands2015-09-201-0/+4
* | Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-1550-153/+348
|\ \
| * | decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-151-1/+0
| * | decrypt: skip unavailable and unsuitable keysVincent Breitmoser2015-11-131-0/+2
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-082-0/+16
| |\ \
| | * | bench: add simple s2k benchmark (iterations for 100ms)Vincent Breitmoser2015-11-041-2/+4
| | * | bench: run ops multiple times and for an average timeVincent Breitmoser2015-11-041-0/+2
| | * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-0410-4/+20
| | |\ \
| | * | | bench: simple working benchmarkVincent Breitmoser2015-11-041-0/+5
| | * | | bench: add benchmark operation for testingVincent Breitmoser2015-11-042-0/+7
| * | | | Cleanup settings activityDominik Schürmann2015-11-081-10/+0
| | |/ / | |/| |
| * | | Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-028-0/+9
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-022-2/+30
| |\| |
| | * | keylist: add "search for query" button to empty viewVincent Breitmoser2015-11-022-2/+30
| * | | Fix API 23 regression for activities without layout, see http://stackoverflow...Dominik Schürmann2015-11-022-4/+11
| |/ /
| * | use Proxy.NO_PROXY instead of null value for no proxyVincent Breitmoser2015-10-291-1/+1
| * | uploadop: clean up, add loggingVincent Breitmoser2015-10-292-8/+15
| * | Target SDK 23 and related fixesDominik Schürmann2015-10-261-0/+3
| * | Update android-patternview, materialtabstrip, floatingactionbuttonDominik Schürmann2015-10-261-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:45:28 +0000