Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked: deprecate unused method, for now | Vincent Breitmoser | 2015-09-10 | 1 | -1/+2 |
| | |||||
* | linked: move github client id and secret into build vars | Vincent Breitmoser | 2015-09-10 | 2 | -8/+9 |
| | |||||
* | enable incremental and jumboMode for dexing, speeds up process considerably | Vincent Breitmoser | 2015-09-10 | 1 | -0/+2 |
| | |||||
* | linked: localization for github creation | Vincent Breitmoser | 2015-09-10 | 3 | -39/+47 |
| | |||||
* | linked: don't need javascript, so we don't enable it | Vincent Breitmoser | 2015-09-10 | 1 | -1/+0 |
| | |||||
* | linked: fix screwups from last commit, sigh | Vincent Breitmoser | 2015-09-10 | 1 | -9/+17 |
| | |||||
* | linked: work on github lid creation error handling | Vincent Breitmoser | 2015-09-10 | 1 | -38/+125 |
| | |||||
* | linked: fix auth token revocation (maybe?) | Vincent Breitmoser | 2015-09-08 | 1 | -1/+5 |
| | |||||
* | linked: add "retry" | Vincent Breitmoser | 2015-09-08 | 8 | -5/+31 |
| | |||||
* | linked: move between fixed states | Vincent Breitmoser | 2015-09-08 | 1 | -10/+56 |
| | |||||
* | statusindicator: method to set states by name | Vincent Breitmoser | 2015-09-08 | 1 | -0/+9 |
| | |||||
* | linked: fix button margins in select dialog | Vincent Breitmoser | 2015-09-08 | 1 | -3/+6 |
| | |||||
* | linked: move client id and secret into static vars (build vars later) | Vincent Breitmoser | 2015-09-08 | 1 | -3/+7 |
| | |||||
* | fix unit test for linked ids | Vincent Breitmoser | 2015-09-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 22 | -54/+52 |
|\ | |||||
| * | Merge pull request #1522 from 0-kaladin/mipmap | Dominik Schürmann | 2015-09-05 | 5 | -0/+0 |
| |\ | | | | | | | Fixes #1520 | ||||
| | * | Fixes #1520 | Kaladin Light | 2015-09-05 | 5 | -0/+0 |
| | | | | | | | | | | | | Move debug launcher icons to mipmap | ||||
| * | | Use new HashSet<>(Arrays.asList()) instead of static | Dominik Schürmann | 2015-09-04 | 1 | -38/+36 |
| | | | |||||
| * | | Merge pull request #1518 from 0-kaladin/master | Dominik Schürmann | 2015-09-03 | 16 | -16/+16 |
| |\| | | | | | | | Fixes open-keychain/open-keychain#1515 | ||||
| | * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 16 | -16/+16 |
| |/ | | | | | | | Move launcher icons to mipmap | ||||
* | | linked: clear cookies and don't save form data in oauth webview | Vincent Breitmoser | 2015-09-06 | 1 | -1/+5 |
| | | |||||
* | | linked: fix "navigate up" in LinkedIdWizard (imperfect) | Vincent Breitmoser | 2015-09-06 | 4 | -4/+41 |
| | | |||||
* | | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 12 | -552/+110 |
| | | |||||
* | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 7 | -126/+197 |
|/ | |||||
* | linked: fix back button in github dialog | Vincent Breitmoser | 2015-09-01 | 2 | -1/+26 |
| | |||||
* | linked: order selection dialog alphabetically | Vincent Breitmoser | 2015-09-01 | 1 | -25/+20 |
| | |||||
* | statusindicator: don't redisplay child with animation if already shown | Vincent Breitmoser | 2015-09-01 | 1 | -0/+6 |
| | |||||
* | linked: smooth over progress with tactical pauses | Vincent Breitmoser | 2015-09-01 | 1 | -19/+23 |
| | |||||
* | linked: redesign github resource creation, implement ouath flow | Vincent Breitmoser | 2015-09-01 | 3 | -42/+105 |
| | |||||
* | fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) | Vincent Breitmoser | 2015-09-01 | 1 | -1/+3 |
| | |||||
* | linked: use link icon from octo set? not sure yet.. | Vincent Breitmoser | 2015-09-01 | 8 | -2/+5 |
| | |||||
* | linked: update icon design of github l-id creation | Vincent Breitmoser | 2015-09-01 | 14 | -9/+31 |
| | |||||
* | linked: work on github design | Vincent Breitmoser | 2015-09-01 | 3 | -57/+102 |
| | |||||
* | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 8 | -12/+501 |
| | |||||
* | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 2 | -0/+55 |
| | |||||
* | linked: Github -> GitHub (fixes #1513) | Vincent Breitmoser | 2015-08-31 | 1 | -9/+9 |
| | |||||
* | linked: fix small typo | Vincent Breitmoser | 2015-08-31 | 1 | -1/+1 |
| | |||||
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 3 | -5/+9 |
| | |||||
* | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 3 | -6/+10 |
| | | | | enabled | ||||
* | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 3 | -6/+11 |
| | |||||
* | move stray test file to correct position | Vincent Breitmoser | 2015-08-29 | 1 | -3/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 5 | -74/+163 |
|\ | |||||
| * | Improve decrypt strings | Dominik Schürmann | 2015-08-28 | 1 | -2/+2 |
| | | |||||
| * | Support OpenPGP API v9 | Dominik Schürmann | 2015-08-28 | 1 | -10/+6 |
| | | |||||
| * | Merge branch 'mgeier63-master' | Dominik Schürmann | 2015-08-28 | 4 | -63/+156 |
| |\ | |||||
| | * | Cleanup OpenPgpService2 code, update openpgp-api lib | Dominik Schürmann | 2015-08-28 | 2 | -51/+3 |
| | | | |||||
| | * | Revert "service side support for ↵ | Dominik Schürmann | 2015-08-28 | 1 | -3/+208 |
| | | | | | | | | | | | | | | | | | | https://github.com/open-keychain/openpgp-api/pull/3" This reverts commit 298e42d3aa5a4d78778df08aab3634a7c771d361. | ||||
| | * | Merge branch 'master' of https://github.com/mgeier63/open-keychain into ↵ | Dominik Schürmann | 2015-08-28 | 4 | -271/+207 |
| |/| | | | | | | | | | | mgeier63-master | ||||
| | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 1 | -208/+3 |
| | | | |||||
| | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 3 | -63/+204 |
| | | |