Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add edit action to user id card, left align card actions per material design ↵ | Dominik Schürmann | 2015-12-29 | 8 | -40/+75 |
| | | | | guidelines | ||||
* | Load key data in tabs independently from advanced activity. This decouples ↵ | Dominik Schürmann | 2015-12-29 | 3 | -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 icon | Dominik Schürmann | 2015-12-28 | 3 | -3/+3 |
| | |||||
* | Advanced screen: edited key saved | Dominik Schürmann | 2015-12-28 | 2 | -2/+99 |
| | |||||
* | Pass trough masterKeyId and fingerprint to advanced key edit fragments | Dominik Schürmann | 2015-12-27 | 3 | -23/+29 |
| | |||||
* | Fix merge conflicts | Dominik Schürmann | 2015-12-27 | 1 | -2/+0 |
| | |||||
* | inline-edit: move action mode menu handling int activity | Vincent Breitmoser | 2015-12-27 | 7 | -78/+147 |
| | |||||
* | inline subkey editing, fixed | Vincent Breitmoser | 2015-12-27 | 4 | -10/+22 |
| | |||||
* | inline subkey editing (wip commit) | Vincent Breitmoser | 2015-12-27 | 26 | -60/+409 |
| | |||||
* | extend-uid: use FAB instead of extra list item | Vincent Breitmoser | 2015-12-27 | 5 | -57/+100 |
| | |||||
* | extended: leave ActionMode on page change | Vincent Breitmoser | 2015-12-27 | 1 | -0/+21 |
| | |||||
* | extended-share: move qr code resizing into onLayoutChangeListener ↵ | Vincent Breitmoser | 2015-12-27 | 1 | -8/+39 |
| | | | | (+performance, -recreation crash) | ||||
* | extend-uid: button and list to add user ids | Vincent Breitmoser | 2015-12-27 | 2 | -3/+91 |
| | |||||
* | extend-uid: allow changes to user ids in edit mode | Vincent Breitmoser | 2015-12-27 | 7 | -16/+87 |
| | |||||
* | extend-uid: add option icon for edit action mode | Vincent Breitmoser | 2015-12-27 | 8 | -72/+131 |
| | |||||
* | extended: init tabs with loader info | Vincent Breitmoser | 2015-12-27 | 2 | -11/+14 |
| | |||||
* | Fix some strings thanks to Alain-Olivier | Dominik Schürmann | 2015-12-27 | 1 | -3/+3 |
| | |||||
* | Remove unused layout | Dominik Schürmann | 2015-12-22 | 4 | -246/+0 |
| | |||||
* | Remove unused layout | Dominik Schürmann | 2015-12-22 | 1 | -37/+0 |
| | |||||
* | Use correct logger in LinkedIdsAdapter | Dominik Schürmann | 2015-12-22 | 1 | -1/+1 |
| | |||||
* | Opt out from fullBackupContent for now | Dominik Schürmann | 2015-12-22 | 1 | -0/+1 |
| | |||||
* | Remove spongycastle pkix dependency to stay below Androids dex limit | Dominik Schürmann | 2015-12-22 | 2 | -2/+0 |
| | |||||
* | Update spongycastle to 1.53 | Dominik Schürmann | 2015-12-22 | 5 | -6/+8 |
| | |||||
* | Backup: Move FAQ button to last screen and simplify code | Dominik Schürmann | 2015-12-22 | 4 | -124/+113 |
| | |||||
* | Cleanup in HelpActivity | Dominik Schürmann | 2015-12-22 | 1 | -4/+0 |
| | |||||
* | Update FAQ from website | Dominik Schürmann | 2015-12-22 | 1 | -57/+90 |
| | |||||
* | Improve how_to_import | Dominik Schürmann | 2015-12-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'TedaLIEz-master' | Dominik Schürmann | 2015-12-22 | 6 | -8/+86 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into ↵ | Dominik Schürmann | 2015-12-22 | 6 | -8/+86 |
|/| | | | | | | | TedaLIEz-master | ||||
| * | Issue #1595 | aLIEzTed | 2015-12-22 | 6 | -8/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | link to faq link to app Issue #1595 Issue#1595 Revert commits Sorry for overhead annotation | ||||
* | | Default for theme setting | Dominik Schürmann | 2015-12-22 | 1 | -2/+3 |
| | | |||||
* | | Add hint to encrypt field | Dominik Schürmann | 2015-12-22 | 3 | -5/+2 |
| | | |||||
* | | Follow notification style guidelines, dismiss permission notification on click | Dominik Schürmann | 2015-12-22 | 3 | -64/+9 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-12-21 | 9 | -45/+78 |
|\ \ | |||||
| * \ | Merge pull request #1633 from open-keychain/preference-fix | Dominik Schürmann | 2015-12-20 | 4 | -45/+59 |
| |\ \ | | | | | | | | | Fixed Keyserver and Contact Sync turning itself on | ||||
| | * | | fixed key update preference not turning off | Adithya Abraham Philip | 2015-12-21 | 4 | -45/+59 |
| |/ / | |||||
| * | | set spongycastle submodule to correct commit | Vincent Breitmoser | 2015-12-17 | 1 | -0/+0 |
| | | | |||||
| * | | api: add micalg result extra to detached signature api call | Vincent Breitmoser | 2015-12-17 | 5 | -0/+19 |
| | | | |||||
* | | | Make ContactHelper less static | Dominik Schürmann | 2015-12-21 | 9 | -166/+152 |
|/ / | |||||
* | | linked: correctly show errors in linked id wizard | Vincent Breitmoser | 2015-12-14 | 1 | -7/+1 |
| | | |||||
* | | some work on benchmark operation (affects only debug build) | Vincent Breitmoser | 2015-12-13 | 2 | -1/+85 |
| | | |||||
* | | encryptkeycompletionview: don't use prefix | Vincent Breitmoser | 2015-12-13 | 1 | -16/+4 |
| | | |||||
* | | Nicer RESULT_INSECURE fallback for old API versions | Dominik Schürmann | 2015-12-10 | 1 | -9/+2 |
| | | |||||
* | | Merge pull request #1610 from open-keychain/facebook | Dominik Schürmann | 2015-12-10 | 26 | -374/+554 |
|\ \ | | | | | | | Basic Facebook Support | ||||
| * | | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 26 | -374/+554 |
| | | | |||||
* | | | Merge pull request #1621 from TedaLIEz/master | Dominik Schürmann | 2015-12-10 | 1 | -1/+6 |
|\ \ \ | | |/ | |/| | Issue#1605 solved | ||||
| * | | Issue#1605 solved | TedaLIEz | 2015-12-09 | 1 | -1/+6 |
|/ / | |||||
* | | Merge pull request #1617 from fiaxh/sign_key_id_type | Dominik Schürmann | 2015-12-03 | 2 | -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_ID | fiaxh | 2015-12-03 | 2 | -5/+4 |
|/ | |||||
* | encryptkeycompletionview: don't initialize to null on attach | Vincent Breitmoser | 2015-11-30 | 2 | -12/+3 |
| |