aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵Dominik Schürmann2015-05-041-0/+1
|\ | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-302-2/+0
| | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2624-226/+237
| |\ | | | | | | | | | into development
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-243-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
* | | | 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
|\ \ \ | | | | | | | | Switch to MaterialDrawer library
| * | | 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 ↵Dominik Schürmann2015-04-224-16/+57
|\ \ | | | | | | | | | development
| * | Fixed Snackbar behind layoutManoj Khanna2015-04-223-16/+16
| | | | | | | | | | | | Surrounded string with quotes
| * | 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
|\ | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact
| * 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 ↵Vincent Breitmoser2015-03-303-63/+60
|\ \ | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
| * | 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
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
* | 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
|\|
| * -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-271-0/+1
| | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
* | 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
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * 3.2beta3Dominik Schürmann2015-03-231-1/+1
| |
| * translation fixesDominik Schürmann2015-03-238-113/+93
| |
| * Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 05:56:25 +0000