aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* linked: fix screwups from last commit, sighVincent Breitmoser2015-09-101-9/+17
* linked: work on github lid creation error handlingVincent Breitmoser2015-09-101-38/+125
* linked: fix auth token revocation (maybe?)Vincent Breitmoser2015-09-081-1/+5
* linked: add "retry"Vincent Breitmoser2015-09-087-5/+30
* linked: move between fixed statesVincent Breitmoser2015-09-081-10/+56
* statusindicator: method to set states by nameVincent Breitmoser2015-09-081-0/+9
* linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
* linked: move client id and secret into static vars (build vars later)Vincent Breitmoser2015-09-081-3/+7
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-0617-54/+52
|\
| * Use new HashSet<>(Arrays.asList()) instead of staticDominik Schürmann2015-09-041-38/+36
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-0316-16/+16
* | linked: clear cookies and don't save form data in oauth webviewVincent Breitmoser2015-09-061-1/+5
* | linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-064-4/+41
* | linked: basic shared element transitionVincent Breitmoser2015-09-0612-552/+110
* | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-027-126/+197
|/
* linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
* linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
* statusindicator: don't redisplay child with animation if already shownVincent Breitmoser2015-09-011-0/+6
* linked: smooth over progress with tactical pausesVincent Breitmoser2015-09-011-19/+23
* linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-013-42/+105
* fix missing date in CryptoInputParcel in some cases (could be a bigger problem!)Vincent Breitmoser2015-09-011-1/+3
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-016-1/+1
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-0111-7/+27
* linked: work on github designVincent Breitmoser2015-09-013-57/+102
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-018-12/+501
* add simple StatusIndicator widgetVincent Breitmoser2015-09-012-0/+55
* linked: Github -> GitHub (fixes #1513)Vincent Breitmoser2015-08-311-9/+9
* linked: fix small typoVincent Breitmoser2015-08-311-1/+1
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-313-5/+9
* Show linked identity menu item and linked identities only when feature is ena...Dominik Schürmann2015-08-293-6/+10
* Reword experimental settingsDominik Schürmann2015-08-293-6/+11
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-294-74/+163
|\
| * Improve decrypt stringsDominik Schürmann2015-08-281-2/+2
| * Support OpenPGP API v9Dominik Schürmann2015-08-281-10/+6
| * Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-281-51/+3
| * Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeie...Dominik Schürmann2015-08-283-63/+204
| |\
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-273-63/+204
* | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-29105-89/+6129
|\ \ \ | |/ / |/| |
| * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-42/+54
| * | fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| * | linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
| * | allow linked token without one colonVincent Breitmoser2015-05-121-3/+2
| * | rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
| * | Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1181-712/+1142
| |\ \
| * | | linked-ids: small compatibility changesVincent Breitmoser2015-05-113-2/+4
| * | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-098-27/+53
| * | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
| * | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0912-43/+43
| * | | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0922-324/+295
| * | | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 07:42:44 +0000