aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #1666 from open-keychain/file-import-fixDominik Schürmann2016-01-111-2/+15
| |\ | | | | | | Fixed File Import issue due to onResumeFragments
| | * fixed file import issue due to onResumeFragmentsAdithya Abraham Philip2016-01-091-2/+15
| | |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-114-5/+13
|\| |
| * | passphrasecache: update defaults, add "forever" settingVincent Breitmoser2016-01-114-5/+13
| | |
* | | Changelog 3.8Dominik Schürmann2016-01-111-0/+12
|/ /
* | update build instructions in readmeVincent Breitmoser2016-01-111-4/+4
| |
* | keycreate: animate layout when revert button is pushedVincent Breitmoser2016-01-111-1/+2
| |
* | keycreate: add button to revert to default key configurationVincent Breitmoser2016-01-112-42/+116
| |
* | advstart: simplify layout, and give the icon some spaceVincent Breitmoser2016-01-111-11/+10
| |
* | Remove old screenshots, move api demo screenshotsDominik Schürmann2016-01-118-0/+0
| |
* | Pull from transifexDominik Schürmann2016-01-1169-714/+2063
| |
* | Move edit key configuration to menuDominik Schürmann2016-01-114-70/+53
| |
* | 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 ↵Dominik Schürmann2016-01-1057-727/+753
|/ | | | what tokens are supported
* Merge pull request #1597 from open-keychain/inline-ttlDominik Schürmann2016-01-0622-257/+756
|\ | | | | Select time to remember password in dialog
| * 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
|\ | | | | Fix travis
| * Run travis on non-container for ↵Dominik Schürmann2016-01-041-2/+10
| | | | | | | | https://github.com/travis-ci/travis-ci/issues/3695, including workaround for https://github.com/travis-ci/travis-ci/issues/5227
| * 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
|\ | | | | Inline Identity Edit
| * 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
| |