aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Version 3.2Dominik Schürmann2015-05-0623-23/+23
* Pull from transifexDominik Schürmann2015-05-0610-141/+163
* Renaming for consisitencyDominik Schürmann2015-05-061-5/+5
* Move error overlay into generalized DecryptFragment, better error handling in...Dominik Schürmann2015-05-061-76/+126
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-051-0/+1
|\
| * Fix Bluetooth share without breaking othersWilliam Faulk2015-05-041-0/+1
* | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
|/
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-041-3/+3
* Merge branch 'development' of https://github.com/Hiperzone/open-keychain into...Dominik Schürmann2015-05-041-0/+1
|\
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-302-2/+0
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2624-226/+237
| |\
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-243-0/+3
| |\ \
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-0/+3
* | | | Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
* | | | Fix key creation string and displayDominik Schürmann2015-04-301-2/+3
* | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-302-0/+39
* | | | 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
| |_|/ |/| |
* | | UI fixes for Android < 5Dominik Schürmann2015-04-262-11/+13
* | | Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
* | | 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
* | 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
|\|
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-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
|\|