aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Tests: Use ECC where possibleDominik Schürmann2016-01-036-56/+76
* Update dependenciesDominik Schürmann2016-01-032-42/+42
* Add gradle-versions-pluginDominik Schürmann2016-01-031-0/+5
* Update to spongycastle 1.54Dominik Schürmann2016-01-031-0/+0
* Fix code styleDominik Schürmann2016-01-022-6/+8
* Temporary fix for #1636Dominik Schürmann2016-01-012-0/+9
* Merge pull request #1584 from open-keychain/edit-redesignDominik Schürmann2015-12-3150-359/+2096
|\
| * Add change password menu item to view keyDominik Schürmann2015-12-313-11/+100
| * Upload to keyserver after editing identitiesDominik Schürmann2015-12-313-19/+154
| * Improve linked identity handlingDominik Schürmann2015-12-315-72/+117
| * Edit identities designDominik Schürmann2015-12-316-91/+93
| * 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
| * Load key data in tabs independently from advanced activity. This decouples th...Dominik Schürmann2015-12-293-62/+118
| * 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 (+performan...Vincent Breitmoser2015-12-271-8/+39
| * 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
* | keylist: fix highlighter (fixes #1637)Vincent Breitmoser2015-12-291-24/+19
* | keylist: filter results by all user ids for search (fixes #1645)Vincent Breitmoser2015-12-293-24/+28
|/
* 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 TedaL...Dominik Schürmann2015-12-226-8/+86
|/|
| * Issue #1595aLIEzTed2015-12-226-8/+86
* | 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 key update preference not turning offAdithya Abraham Philip2015-12-214-45/+59
| |/ /