aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-05486-950/+370
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
| |
| * Use material save iconDominik Schürmann2015-03-0410-1/+1
| |
| * Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-046-0/+22
| |\ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-022-2/+3
| | |\ | | | | | | | | | | | | into development
| | * | added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| | | |
| | * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2857-452/+1294
| | |\ \ | | | | | | | | | | | | | | | into development
| | * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2811-159/+229
| | |\ \ \ | | | | | | | | | | | | | | | | | | into development
| | * \ \ \ merged dialogAdithya Abraham Philip2015-02-26614-1759/+5032
| | |\ \ \ \
| | * | | | | initial Log Display functionAdithya Abraham Philip2015-02-266-0/+15
| | | | | | |
| * | | | | | Remove help button for nowDominik Schürmann2015-03-046-15/+3
| | | | | | |
| * | | | | | More icon naming fixes and designDominik Schürmann2015-03-0421-40/+53
| | | | | | |
| * | | | | | Partially fix file namesDominik Schürmann2015-03-04158-13/+13
| | | | | | |
| * | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-0453-764/+74
| | | | | | |
| * | | | | | Update lib listDominik Schürmann2015-03-041-7/+9
| | | | | | |
| * | | | | | Crop image view to centerDominik Schürmann2015-03-041-4/+4
| | | | | | |
| * | | | | | Full height contact pic in key viewDominik Schürmann2015-03-041-1/+7
| | | | | | |
| * | | | | | Fix status bar orangeDominik Schürmann2015-03-041-1/+1
| | | | | | |
| * | | | | | More simplification of delete stringsDominik Schürmann2015-03-041-1/+1
| | | | | | |
| * | | | | | Merge pull request #1097 from ishan1604/orange-toolbarDominik Schürmann2015-03-043-2/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Orange toolbar for certify and fingerprint activity added
| | * | | | | | Orange Toolbar Added Fixes #1088Ishan Khanna2015-03-043-2/+33
| | | | | | | |
| * | | | | | | Simplify certify stringsDominik Schürmann2015-03-041-11/+2
| | | | | | | |
| * | | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-041-4/+4
| | | | | | | |
| * | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵Dominik Schürmann2015-03-03244-40/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development
| | * | | | | | | delete holo iconsjiangkai2015-03-0395-0/+0
| | | | | | | | |
| | * | | | | | | change icon name in layout filesjiangkai2015-03-0324-40/+40
| | | | | | | | |
| | * | | | | | | download new material design iconsjiangkai2015-03-03125-0/+0
| | | | | | | | |
| * | | | | | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-032-19/+46
| | | | | | | | |
| * | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-9/+18
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix toolbar margins on Android lower 5Dominik Schürmann2015-03-039-9/+8
| | | | | | | |
| * | | | | | | Use spinner DatePicker, not full calendar, also on Android 5Dominik Schürmann2015-03-032-37/+59
| |/ / / / / /
* | | | | | | do a TON of UI workVincent Breitmoser2015-03-055-0/+216
| | | | | | |
* | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-042-1/+30
| | | | | | |
* | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-1/+7
| | | | | | |
* | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-024-9/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-022-2/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | development
| | * | | | | Search string simplifiedDominik Schürmann2015-03-021-2/+1
| | | | | | |
| | * | | | | Re-add black colorDominik Schürmann2015-03-021-0/+2
| | | |_|_|/ | | |/| | |
| * / | | | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-022-7/+19
| |/ / / /
* | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
| | | | |
* | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02696-3375/+8010
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | | | Strings: File sizeDominik Schürmann2015-02-281-2/+2
| | | | |
| * | | | Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
| | | | |
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-281-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| | * | | | control flow for moving the fab up with snackbarVincent Breitmoser2015-02-281-2/+4
| | | | | |
| * | | | | Update from transifexDominik Schürmann2015-02-2833-236/+1010
| |/ / / /
| * | | | Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| | | | |
| * | | | padding fixes for key listDominik Schürmann2015-02-281-2/+1
| | | | |
| * | | | Reorder advanced key viewDominik Schürmann2015-02-272-52/+0
| | | | |
| * | | | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-271-41/+27
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 04:19:03 +0000