aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-282-141/+109
|\
| * Confirm designDominik Schürmann2015-09-241-131/+83
| * Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ...Dominik Schürmann2015-09-201-10/+26
* | enc-backup: didn't like the check mark icon after allVincent Breitmoser2015-09-251-2/+0
* | enc-backup: use black check icon for button, and some cleanupVincent Breitmoser2015-09-251-1/+1
* | enc-backup: use only one fragment after allVincent Breitmoser2015-09-252-126/+217
* | enc-backup: handle bad code more nicelyVincent Breitmoser2015-09-251-2/+1
* | enc-backup: ask for backup code againVincent Breitmoser2015-09-253-16/+213
* | encrypted export WIPVincent Breitmoser2015-09-193-0/+70
|/
* Use material overflow icon in decrypt listDominik Schürmann2015-09-171-3/+4
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-161-1/+3
* multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-162-10/+12
* multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-162-62/+66
* multidecrypt: prepare viewholder for file listVincent Breitmoser2015-09-161-51/+58
* linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-102-290/+0
* linked: localization for github creationVincent Breitmoser2015-09-101-6/+6
* linked: add "retry"Vincent Breitmoser2015-09-081-2/+13
* linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-065-8/+8
|\
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-035-8/+8
* | linked: basic shared element transitionVincent Breitmoser2015-09-064-272/+3
* | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-023-13/+22
|/
* linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
* linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
* linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-011-31/+31
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-011-1/+1
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-011-7/+27
* linked: work on github designVincent Breitmoser2015-09-011-45/+46
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-012-2/+173
* add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+30
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-311-1/+3
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2916-8/+1779
|\
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-117-111/+205
| |\
| * | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
| * | small ui nicetiesVincent Breitmoser2015-04-271-1/+1
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-2/+14
| * | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-269-19/+220
| |\ \ \
| * | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-253-10/+5
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-4/+10
| * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| * | | | revamp decrypt uiVincent Breitmoser2015-04-242-74/+19
| * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-4/+7
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2412-99/+406
| |\ \ \ \
| * | | | | minor ui and wording changesVincent Breitmoser2015-04-091-4/+16
| * | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| * | | | | even more linked id ui workVincent Breitmoser2015-03-292-6/+8
| * | | | | more (subtle) ui workVincent Breitmoser2015-03-261-22/+19
| * | | | | some linked id ui fine tuningVincent Breitmoser2015-03-269-125/+70