Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Properly hide fab in ViewKeyActivity, fixes #1580 | Dominik Schürmann | 2015-11-02 | 1 | -5/+28 |
| | |||||
* | Add travis components for SDK 23 | Dominik Schürmann | 2015-11-02 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-02 | 5 | -55/+168 |
|\ | |||||
| * | Merge pull request #1578 from open-keychain/keyserver-sync-fix | Dominik Schürmann | 2015-11-02 | 2 | -39/+87 |
| |\ | | | | | | | Reworked KeyserverSyncAdapterService | ||||
| | * | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT | Adithya Abraham Philip | 2015-10-31 | 2 | -39/+87 |
| | | | |||||
| * | | keylist: add "search for query" button to empty view | Vincent Breitmoser | 2015-11-02 | 3 | -16/+81 |
| |/ | |||||
* | | Add runtime permission check for QR Code activity | Dominik Schürmann | 2015-11-02 | 1 | -14/+78 |
| | | |||||
* | | Fix API 23 regression for activities without layout, see ↵ | Dominik Schürmann | 2015-11-02 | 3 | -10/+17 |
|/ | | | | http://stackoverflow.com/q/32169303 | ||||
* | comment git dependency again | Dominik Schürmann | 2015-10-29 | 1 | -1/+1 |
| | |||||
* | update material drawer library | Dominik Schürmann | 2015-10-29 | 2 | -44/+46 |
| | |||||
* | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 4 | -20/+36 |
| | | | | (also, use unbounded blocking queue to fix update of more than 10 keys) | ||||
* | import: reduce number of threads a little, and code cleanup | Vincent Breitmoser | 2015-10-29 | 1 | -39/+37 |
| | |||||
* | make use of proxies a Keyserver property | Vincent Breitmoser | 2015-10-29 | 7 | -49/+55 |
| | |||||
* | editkey: always return EditKeyResult | Vincent Breitmoser | 2015-10-29 | 3 | -14/+16 |
| | |||||
* | use Proxy.NO_PROXY instead of null value for no proxy | Vincent Breitmoser | 2015-10-29 | 7 | -22/+27 |
| | |||||
* | encrypttext: fix mimetype check logic (#1574) | Vincent Breitmoser | 2015-10-29 | 1 | -1/+2 |
| | |||||
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 13 | -74/+135 |
| | |||||
* | prevent crashes in EncryptKeyCompletionView (2) | Vincent Breitmoser | 2015-10-26 | 1 | -10/+19 |
| | |||||
* | Target SDK 23 and related fixes | Dominik Schürmann | 2015-10-26 | 6 | -28/+31 |
| | |||||
* | Update stickylistheaders, html-textview | Dominik Schürmann | 2015-10-26 | 1 | -7/+4 |
| | |||||
* | Update tokenautocomplete | Dominik Schürmann | 2015-10-26 | 2 | -21/+20 |
| | |||||
* | Update android-patternview, materialtabstrip, floatingactionbutton | Dominik Schürmann | 2015-10-26 | 2 | -8/+8 |
| | |||||
* | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 5 | -26/+108 |
| | |||||
* | Version 3.6.1 | Dominik Schürmann | 2015-10-26 | 1 | -2/+2 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2015-10-26 | 33 | -127/+248 |
| | |||||
* | import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadException | Vincent Breitmoser | 2015-10-26 | 2 | -49/+44 |
| | |||||
* | decrypt: restart operation if interrupted by fragment recreation | Vincent Breitmoser | 2015-10-26 | 1 | -15/+12 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-26 | 2 | -18/+12 |
|\ | |||||
| * | Commit Github tokens | Dominik Schürmann | 2015-10-26 | 1 | -15/+6 |
| | | |||||
* | | fix FileHelper class for pre-lollipop devices | Vincent Breitmoser | 2015-10-26 | 2 | -43/+86 |
|/ | |||||
* | https everywhere | Dominik Schürmann | 2015-10-25 | 3 | -5/+5 |
| | |||||
* | linked: fix crash on <= lollipop | Vincent Breitmoser | 2015-10-25 | 1 | -3/+6 |
| | |||||
* | inputdataoperation: guess filetype from filename for generic application/ ↵ | Vincent Breitmoser | 2015-10-23 | 3 | -3/+19 |
| | | | | mime types | ||||
* | import: use filesize from content provider on input uri | Vincent Breitmoser | 2015-10-23 | 1 | -3/+3 |
| | |||||
* | decryptlist: use generic file icon for application/octet-stream | Vincent Breitmoser | 2015-10-23 | 1 | -0/+4 |
| | |||||
* | More space for backup code | Dominik Schürmann | 2015-10-22 | 1 | -11/+10 |
| | |||||
* | Sync changelog with transifex | Dominik Schürmann | 2015-10-22 | 19 | -0/+228 |
| | |||||
* | Version 3.6, Changelog 3.6 | Dominik Schürmann | 2015-10-22 | 2 | -2/+14 |
| | |||||
* | fix argument order screwup in FileHelper | Vincent Breitmoser | 2015-10-22 | 3 | -3/+3 |
| | |||||
* | Remove unnecessary line in keybase fragment | Dominik Schürmann | 2015-10-21 | 1 | -5/+0 |
| | |||||
* | Fix keybase verification | Dominik Schürmann | 2015-10-21 | 4 | -30/+17 |
| | |||||
* | Update from transifex | Dominik Schürmann | 2015-10-21 | 26 | -1544/+1310 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-10-21 | 11 | -13/+85 |
|\ | |||||
| * | decrypt: special case single encrypted text -> directly display text, if not ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -0/+23 |
| | | | | | | | | too large | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-21 | 2 | -6/+19 |
| |\ | |||||
| * | | encrypttext: localization, and truncate overlong input | Vincent Breitmoser | 2015-10-21 | 2 | -3/+9 |
| | | | |||||
| * | | encrypttext: handle input via Intent.EXTRA_STREAM in addition to ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -6/+34 |
| | | | | | | | | | | | | Intent.EXTRA_TEXT | ||||
| * | | displaytextactivity: truncate displayed text if too long | Vincent Breitmoser | 2015-10-21 | 3 | -0/+13 |
| | | | |||||
| * | | fix crash due to malformed log entry | Vincent Breitmoser | 2015-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | linked: fix colors for dark theme | Vincent Breitmoser | 2015-10-21 | 5 | -5/+5 |
| | | |