Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpol | Dominik Schürmann | 2016-01-13 | 2 | -61/+28 |
|\ | | | | | Use Nordpol for BaseNfcActivity | ||||
| * | Use new version of Nordpol from jcenter | Petter Arvidsson | 2016-01-12 | 1 | -1/+1 |
| | | | | | | | | | | - Use version 0.1.13 that is now available on jcenter - Add a "gradle witness" for this version | ||||
| * | Use Nordpol for BaseNfcActivity | Petter Arvidsson | 2016-01-12 | 2 | -61/+28 |
| | | | | | | | | | | | | | | | | - Replace handling of intents with Nordpol tag dispatcher - Update CreateKeyActivity to pass it's intent to the tag dispatcher when invoked by the system (onCreate) - Add Fidesmo marmeladburk repository - Add dependency on nordpol-android and nordpol-core | ||||
* | | Pull from transifex | Dominik Schürmann | 2016-01-13 | 34 | -44/+318 |
| | | |||||
* | | fix symmetric decryption with backup code (fixes #1677) | Vincent Breitmoser | 2016-01-13 | 1 | -5/+6 |
|/ | |||||
* | fix symmetric decryption (fixes #1672) | Vincent Breitmoser | 2016-01-12 | 1 | -2/+2 |
| | |||||
* | Add facebook key import to changelog | Dominik Schürmann | 2016-01-12 | 1 | -0/+1 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2016-01-11 | 25 | -0/+300 |
| | |||||
* | Fix singleTop definitions | Dominik Schürmann | 2016-01-11 | 2 | -25/+9 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-01-11 | 1 | -2/+15 |
|\ | |||||
| * | Merge pull request #1666 from open-keychain/file-import-fix | Dominik Schürmann | 2016-01-11 | 1 | -2/+15 |
| |\ | | | | | | | Fixed File Import issue due to onResumeFragments | ||||
| | * | fixed file import issue due to onResumeFragments | Adithya Abraham Philip | 2016-01-09 | 1 | -2/+15 |
| | | | |||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-01-11 | 4 | -5/+13 |
|\| | | |||||
| * | | passphrasecache: update defaults, add "forever" setting | Vincent Breitmoser | 2016-01-11 | 4 | -5/+13 |
| | | | |||||
* | | | Changelog 3.8 | Dominik Schürmann | 2016-01-11 | 1 | -0/+12 |
|/ / | |||||
* | | keycreate: animate layout when revert button is pushed | Vincent Breitmoser | 2016-01-11 | 1 | -1/+2 |
| | | |||||
* | | keycreate: add button to revert to default key configuration | Vincent Breitmoser | 2016-01-11 | 2 | -42/+116 |
| | | |||||
* | | advstart: simplify layout, and give the icon some space | Vincent Breitmoser | 2016-01-11 | 1 | -11/+10 |
| | | |||||
* | | Pull from transifex | Dominik Schürmann | 2016-01-11 | 69 | -714/+2063 |
| | | |||||
* | | Move edit key configuration to menu | Dominik Schürmann | 2016-01-11 | 4 | -70/+53 |
| | | |||||
* | | Error out when editing a stripped key | Dominik Schürmann | 2016-01-11 | 1 | -1/+6 |
| | | |||||
* | | Advanced screen, warning fragment | Dominik Schürmann | 2016-01-11 | 10 | -17/+108 |
| | | |||||
* | | Use tor icon for settings screen | Dominik Schürmann | 2016-01-11 | 6 | -1/+1 |
| | | |||||
* | | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 55 | -715/+741 |
|/ | | | | what tokens are supported | ||||
* | inline-ttl: remove "default" setting | Vincent Breitmoser | 2016-01-06 | 6 | -126/+7 |
| | |||||
* | add method to skip caching | Vincent Breitmoser | 2016-01-06 | 5 | -93/+70 |
| | |||||
* | inline-ttl: some layout fine tuning | Vincent Breitmoser | 2016-01-06 | 2 | -1/+3 |
| | |||||
* | some code cleanup in Preferences | Vincent Breitmoser | 2016-01-06 | 1 | -10/+16 |
| | |||||
* | inline-ttl: support "screen off" in preference | Vincent Breitmoser | 2016-01-06 | 4 | -14/+17 |
| | |||||
* | passcache: add support for clear on screen lock (ttl == 0) | Vincent Breitmoser | 2016-01-06 | 1 | -36/+70 |
| | |||||
* | inline-ttl: use ttl preference in ttl spinner | Vincent Breitmoser | 2016-01-06 | 3 | -32/+25 |
| | |||||
* | inline-ttl: save changes in ttl settings | Vincent Breitmoser | 2016-01-06 | 2 | -25/+60 |
| | |||||
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 14 | -73/+541 |
| | |||||
* | passdialog: seconds field and some minor layout issues | Vincent Breitmoser | 2016-01-06 | 3 | -3/+4 |
| | |||||
* | passphraseactivity: add inline spinner to password dialog | Vincent Breitmoser | 2016-01-06 | 6 | -29/+130 |
| | |||||
* | passdialog: switch to ViewAnimator | Vincent Breitmoser | 2016-01-05 | 2 | -16/+14 |
| | |||||
* | (fix accidental use of api level 23 method) | Vincent Breitmoser | 2016-01-05 | 1 | -5/+10 |
| | |||||
* | minor fixes to ViewKeyActivity | Vincent Breitmoser | 2016-01-05 | 6 | -58/+41 |
| | |||||
* | Filinked_empty string | Dominik Schürmann | 2016-01-04 | 1 | -1/+1 |
| | |||||
* | Check for ACTION_OPEN_DOCUMENT before starting activity | Dominik Schürmann | 2016-01-04 | 1 | -10/+28 |
| | |||||
* | Fallback for ACTION_OPEN_DOCUMENT, hopefully fixes #1625 | Dominik Schürmann | 2016-01-04 | 1 | -3/+12 |
| | |||||
* | Fix #1649 | Dominik Schürmann | 2016-01-04 | 1 | -4/+7 |
| | |||||
* | Fix code style | Dominik Schürmann | 2016-01-02 | 2 | -6/+8 |
| | |||||
* | Temporary fix for #1636 | Dominik Schürmann | 2016-01-01 | 2 | -0/+9 |
| | |||||
* | Merge pull request #1584 from open-keychain/edit-redesign | Dominik Schürmann | 2015-12-31 | 50 | -359/+2096 |
|\ | | | | | Inline Identity Edit | ||||
| * | Add change password menu item to view key | Dominik Schürmann | 2015-12-31 | 3 | -11/+100 |
| | | |||||
| * | Upload to keyserver after editing identities | Dominik Schürmann | 2015-12-31 | 3 | -19/+154 |
| | | |||||
| * | Improve linked identity handling | Dominik Schürmann | 2015-12-31 | 5 | -72/+117 |
| | | |||||
| * | Edit identities design | Dominik Schürmann | 2015-12-31 | 6 | -91/+93 |
| | | |||||
| * | Add activity to edit user ids only | Dominik Schürmann | 2015-12-30 | 8 | -43/+571 |
| | |