aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Error out when editing a stripped keyDominik Schürmann2016-01-111-1/+6
* | Add transifex advanced resourceDominik Schürmann2016-01-111-0/+5
* | Advanced screen, warning fragmentDominik Schürmann2016-01-1172-17/+121
* | Use tor icon for settings screenDominik Schürmann2016-01-1168-1/+14
* | Use more generic 'Security Token' where possible, add sutitle to create key w...Dominik Schürmann2016-01-1057-727/+753
|/
* Merge pull request #1597 from open-keychain/inline-ttlDominik Schürmann2016-01-0622-257/+756
|\
| * inline-ttl: remove "default" settingVincent Breitmoser2016-01-066-126/+7
| * add method to skip cachingVincent Breitmoser2016-01-065-93/+70
| * inline-ttl: some layout fine tuningVincent Breitmoser2016-01-062-1/+3
| * some code cleanup in PreferencesVincent Breitmoser2016-01-061-10/+16
| * inline-ttl: support "screen off" in preferenceVincent Breitmoser2016-01-064-14/+17
| * passcache: add support for clear on screen lock (ttl == 0)Vincent Breitmoser2016-01-061-36/+70
| * inline-ttl: use ttl preference in ttl spinnerVincent Breitmoser2016-01-063-32/+25
| * inline-ttl: save changes in ttl settingsVincent Breitmoser2016-01-062-25/+60
| * inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-0614-73/+541
| * passdialog: seconds field and some minor layout issuesVincent Breitmoser2016-01-063-3/+4
| * passphraseactivity: add inline spinner to password dialogVincent Breitmoser2016-01-066-29/+130
| * passdialog: switch to ViewAnimatorVincent Breitmoser2016-01-052-16/+14
|/
* (fix accidental use of api level 23 method)Vincent Breitmoser2016-01-051-5/+10
* minor fixes to ViewKeyActivityVincent Breitmoser2016-01-056-58/+41
* Filinked_empty stringDominik Schürmann2016-01-041-1/+1
* Check for ACTION_OPEN_DOCUMENT before starting activityDominik Schürmann2016-01-041-10/+28
* Fallback for ACTION_OPEN_DOCUMENT, hopefully fixes #1625Dominik Schürmann2016-01-041-3/+12
* Fix #1649Dominik Schürmann2016-01-041-4/+7
* Merge pull request #1652 from open-keychain/travis-memoryDominik Schürmann2016-01-049-104/+140
|\
| * Run travis on non-container for https://github.com/travis-ci/travis-ci/issues...Dominik Schürmann2016-01-041-2/+10
| * Log test resultsDominik Schürmann2016-01-041-0/+7
| * Travis: update build-toolsDominik Schürmann2016-01-031-4/+0
| * 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