aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
* small ui nicetiesVincent Breitmoser2015-04-272-6/+6
* display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-3/+15
* add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
* small changes for performanceVincent Breitmoser2015-04-271-3/+4
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
|\
| * Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2625-43/+273
|\|
| * Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2614-4/+149
| * Switch to new support lib version 22.1Dominik Schürmann2015-04-252-2/+2
| * Update in-app contributor listDominik Schürmann2015-04-251-3/+22
| * Update lib section in aboutDominik Schürmann2015-04-251-2/+2
| * Remove old navigation drawer dependencyDominik Schürmann2015-04-252-9/+1
| * Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-252-0/+28
| |\
| | * Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-241-2/+4
| | * Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-242-0/+26
| * | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| * | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-224-16/+57
| |\
| | * Fixed Snackbar behind layoutManoj Khanna2015-04-223-16/+16
| | * keyserver verification on additionAdithya Abraham Philip2015-04-222-0/+41
| * | Update changelogDominik Schürmann2015-04-221-6/+8
| |/
| * support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-201-0/+3
* | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-254-16/+12
* | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-253-4/+14
* | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
* | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
* | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-242-4/+8
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24135-1276/+2044
|\|
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-5/+5
| * Pull from transifexDominik Schürmann2015-04-14110-1110/+1555
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-0/+1
| |\
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-0/+1
| * | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| * | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| * | Simplify passphrase dialog designDominik Schürmann2015-03-312-2/+1
| * | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-303-63/+60
| |\ \
| | * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-303-63/+59
| * | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+0
| |/ /
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-303-13/+23
| |\|
| * | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-0/+1
| |\ \
| * | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-293-2/+1
| * | | Refactoring of EncryptTextActivityDominik Schürmann2015-03-271-4/+3
| * | | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-263-10/+8
| * | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-24191-7866/+9358
| |\ \ \
| * | | | further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+1
| * | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-0/+1
| * | | | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-1/+2