aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add activity to edit user ids onlyDominik Schürmann2015-12-308-43/+571
|
* Add edit action to user id card, left align card actions per material design ↵Dominik Schürmann2015-12-298-40/+75
| | | | guidelines
* Load key data in tabs independently from advanced activity. This decouples ↵Dominik Schürmann2015-12-293-62/+118
| | | | the fragments from the activity and allows to init the tabs before loading key data in the advanced activity. Fixes switching to the first tab when key has been edited.
* use correct white add iconDominik Schürmann2015-12-283-3/+3
|
* Advanced screen: edited key savedDominik Schürmann2015-12-282-2/+99
|
* Pass trough masterKeyId and fingerprint to advanced key edit fragmentsDominik Schürmann2015-12-273-23/+29
|
* Fix merge conflictsDominik Schürmann2015-12-271-2/+0
|
* inline-edit: move action mode menu handling int activityVincent Breitmoser2015-12-277-78/+147
|
* inline subkey editing, fixedVincent Breitmoser2015-12-274-10/+22
|
* inline subkey editing (wip commit)Vincent Breitmoser2015-12-2726-60/+409
|
* extend-uid: use FAB instead of extra list itemVincent Breitmoser2015-12-275-57/+100
|
* extended: leave ActionMode on page changeVincent Breitmoser2015-12-271-0/+21
|
* extended-share: move qr code resizing into onLayoutChangeListener ↵Vincent Breitmoser2015-12-271-8/+39
| | | | (+performance, -recreation crash)
* extend-uid: button and list to add user idsVincent Breitmoser2015-12-272-3/+91
|
* extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-277-16/+87
|
* extend-uid: add option icon for edit action modeVincent Breitmoser2015-12-278-72/+131
|
* extended: init tabs with loader infoVincent Breitmoser2015-12-272-11/+14
|
* 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
|
* Use correct logger in LinkedIdsAdapterDominik Schürmann2015-12-221-1/+1
|
* Opt out from fullBackupContent for nowDominik Schürmann2015-12-221-0/+1
|
* Remove spongycastle pkix dependency to stay below Androids dex limitDominik Schürmann2015-12-222-2/+0
|
* Update spongycastle to 1.53Dominik Schürmann2015-12-225-6/+8
|
* Backup: Move FAQ button to last screen and simplify codeDominik Schürmann2015-12-224-124/+113
|
* Cleanup in HelpActivityDominik Schürmann2015-12-221-4/+0
|
* Update FAQ from websiteDominik Schürmann2015-12-221-57/+90
|
* Improve how_to_importDominik Schürmann2015-12-221-1/+1
|
* Merge branch 'TedaLIEz-master'Dominik Schürmann2015-12-226-8/+86
|\
| * Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into ↵Dominik Schürmann2015-12-226-8/+86
|/| | | | | | | TedaLIEz-master
| * Issue #1595aLIEzTed2015-12-226-8/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | link to faq link to app Issue #1595 Issue#1595 Revert commits Sorry for overhead annotation
* | Default for theme settingDominik Schürmann2015-12-221-2/+3
| |
* | Add hint to encrypt fieldDominik Schürmann2015-12-223-5/+2
| |
* | Follow notification style guidelines, dismiss permission notification on clickDominik Schürmann2015-12-223-64/+9
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-12-219-45/+78
|\ \
| * \ Merge pull request #1633 from open-keychain/preference-fixDominik Schürmann2015-12-204-45/+59
| |\ \ | | | | | | | | Fixed Keyserver and Contact Sync turning itself on
| | * | fixed key update preference not turning offAdithya Abraham Philip2015-12-214-45/+59
| |/ /
| * | set spongycastle submodule to correct commitVincent Breitmoser2015-12-171-0/+0
| | |
| * | api: add micalg result extra to detached signature api callVincent Breitmoser2015-12-175-0/+19
| | |
* | | Make ContactHelper less staticDominik Schürmann2015-12-219-166/+152
|/ /
* | linked: correctly show errors in linked id wizardVincent Breitmoser2015-12-141-7/+1
| |
* | some work on benchmark operation (affects only debug build)Vincent Breitmoser2015-12-132-1/+85
| |
* | encryptkeycompletionview: don't use prefixVincent Breitmoser2015-12-131-16/+4
| |
* | Nicer RESULT_INSECURE fallback for old API versionsDominik Schürmann2015-12-101-9/+2
| |
* | Merge pull request #1610 from open-keychain/facebookDominik Schürmann2015-12-1026-374/+554
|\ \ | | | | | | Basic Facebook Support
| * | added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-0626-374/+554
| | |
* | | Merge pull request #1621 from TedaLIEz/masterDominik Schürmann2015-12-101-1/+6
|\ \ \ | | |/ | |/| Issue#1605 solved
| * | Issue#1605 solvedTedaLIEz2015-12-091-1/+6
|/ /
* | Merge pull request #1617 from fiaxh/sign_key_id_typeDominik Schürmann2015-12-032-5/+4
|\| | | | | Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_ID
| * Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_IDfiaxh2015-12-032-5/+4
|/