Commit Graph
100 Commits
Author SHA1 Message Date
Dominik Schürmann ff42dfc9db Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED instead of EXPIRY where possible 2015-03-04 15:02:51 +01:00
Dominik Schürmann b10fe01b82 Fix status bar orange 2015-03-04 11:46:31 +01:00
Dominik Schürmann 9b565f1875 More simplification of delete strings 2015-03-04 11:44:37 +01:00
Dominik Schürmann 8e12e93bc0 Merge pull request #1097 from ishan1604/orange-toolbar
Orange toolbar for certify and fingerprint activity added
2015-03-04 11:40:37 +01:00
Dominik Schürmann 71db34ed75 Simplify certify strings 2015-03-04 11:40:12 +01:00
Dominik Schürmann aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +01:00
Dominik Schürmann 9d23b19458 Merge branch 'vectorijk-development' into development 2015-03-03 23:55:19 +01:00
Dominik Schürmann 1cc860d23f Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development 2015-03-03 23:46:20 +01:00
Dominik Schürmann c00a1f1ec3 Show name only in passphrase dialog 2015-03-03 23:43:25 +01:00
Dominik Schürmann b6e30e0bb2 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-03 22:44:37 +01:00
Dominik Schürmann 7b0e067f63 Fix expiry dialog, reorder layouts 2015-03-03 22:44:32 +01:00
Dominik Schürmann 188559bbcd Prettify passphrase dialog, it no longer resizes on unlocking the key 2015-03-03 22:27:14 +01:00
Dominik Schürmann 568854f6dd Merge pull request #1089 from ishan1604/submodulesfix
Submodulesfix
2015-03-03 21:54:58 +01:00
Dominik Schürmann 5a4fc0a071 Fix toolbar margins on Android lower 5 2015-03-03 20:15:09 +01:00
Dominik Schürmann be06c4cd58 Use spinner DatePicker, not full calendar, also on Android 5 2015-03-03 19:04:40 +01:00
Dominik Schürmann 5da57f0582 Update patternview lib, remove workaround 2015-03-03 15:56:03 +01:00
Dominik Schürmann 2ea0f609f2 Remove old min sdk check 2015-03-03 13:16:56 +01:00
Dominik Schürmann 199ff610e0 Merge pull request #1082 from ishan1604/bug-1081
Fixes Issue #1081
2015-03-03 11:21:28 +01:00
Dominik Schürmann 1a12eb1a7a Cleanup settings.gradle 2015-03-03 00:27:33 +01:00
Dominik Schürmann d3f54d3ace Revert "rescale qr code bitmap in background"
size of view may not be available in background thread.

This reverts commit 7e4c39c79d.
2015-03-03 00:26:36 +01:00
Dominik Schürmann 363d41ed1d Cleanup of contact sync, debugging 2015-03-03 00:26:15 +01:00
Dominik Schürmann ea24b5169e Reorder build.gradle 2015-03-02 18:50:38 +01:00
Dominik Schürmann 05ef61afd5 Update API lib 2015-03-02 18:21:10 +01:00
Dominik Schürmann 7127c2205e README: mac os x workaround 2015-03-02 17:54:59 +01:00
Dominik Schürmann dae0873f5e Search string simplified 2015-03-02 17:39:30 +01:00
Dominik Schürmann 3c7c278ef3 Use gradle witness 2015-03-02 17:23:06 +01:00
Dominik Schürmann 058f792566 Update readme for build system 2015-03-02 16:34:56 +01:00
Dominik Schürmann 9514719719 Re-add black color 2015-03-02 16:29:40 +01:00
Dominik Schürmann 84e5ac4b03 Remove supertoast dependency 2015-03-02 16:25:12 +01:00
Dominik Schürmann c1130c5b3e Removed unused submodules 2015-03-02 16:24:26 +01:00
Dominik Schürmann 505140ef2a Use SDK and build tools versions from root project 2015-03-02 16:21:51 +01:00
Dominik Schürmann d5cc359a5d Revert "Gradle hack to always use same build tools in subprojects"
This reverts commit fab60f2ddb.
2015-03-02 15:49:29 +01:00
Dominik Schürmann fab60f2ddb Gradle hack to always use same build tools in subprojects 2015-03-02 15:46:41 +01:00
Dominik Schürmann 69865a6d57 Use index constants in ContactHelper 2015-03-02 15:44:34 +01:00
Dominik Schürmann c8f5dc5cf3 Strings: File size 2015-02-28 00:56:04 +01:00
Dominik Schürmann cec7cb3620 Fix strings based on transifex reports 2015-02-28 00:51:58 +01:00
Dominik Schürmann fd55cdb08e Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
2015-02-28 00:39:18 +01:00
Dominik Schürmann 453b67f7a8 Update from transifex 2015-02-28 00:38:53 +01:00
Dominik Schürmann 0669193e75 Simplify MainActivity 2015-02-28 00:22:31 +01:00
Dominik Schürmann 1c91be84af Upload new keys to keyserver by default 2015-02-28 00:11:34 +01:00
Dominik Schürmann 0b49becaa8 padding fixes for key list 2015-02-28 00:04:15 +01:00
Dominik Schürmann dc38031b4e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:57:00 +01:00
Dominik Schürmann 582caaba97 Reorder advanced key view 2015-02-27 23:56:53 +01:00
Dominik Schürmann f2a9a41840 Enable multi line snackbar option 2015-02-27 23:47:15 +01:00
Dominik Schürmann 200d4a6bb6 Remove swipte to refresh src, fix padding in key list 2015-02-27 23:39:36 +01:00
Dominik Schürmann b1c8fa3471 Fix keyboard overlay bug on top of edittexts 2015-02-27 23:24:04 +01:00
Dominik Schürmann 5b1d834f91 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 22:47:43 +01:00
Dominik Schürmann fd2f858b12 Fix status images in user id adapter 2015-02-27 22:47:39 +01:00
Dominik Schürmann fe31883f66 Keybase header text 2015-02-27 22:40:52 +01:00
Dominik Schürmann 54e04f496e Better qr code resizing 2015-02-27 22:26:11 +01:00
Dominik Schürmann ea4ca9e686 Prettify qr code cleanup 2015-02-27 01:47:06 +01:00
Dominik Schürmann 11c3436454 Prettify qr code in advanced key view 2015-02-27 01:44:40 +01:00
Dominik Schürmann 4ccd9f9bb1 Uncluttering advanced key view 2015-02-27 01:38:57 +01:00
Dominik Schürmann b90335f901 Simplify delete key dialog 2015-02-27 01:30:32 +01:00
Dominik Schürmann 8230fb1179 Remove unused BadImportKeyDialogFragment 2015-02-27 01:26:26 +01:00
Dominik Schürmann 6bd4e1e5b3 Fix margins of dialog views 2015-02-27 01:26:04 +01:00
Dominik Schürmann 6dce7c88d8 Merge keybase-proof branch 2015-02-27 01:18:18 +01:00
Dominik Schürmann 1210a80a96 Remove old Holo design resources 2015-02-26 17:37:28 +01:00
Dominik Schürmann 93109985e7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 17:32:28 +01:00
Dominik Schürmann 4c4782bd5e Hopefully fixes drop down icon for spinners on Android lower 5 2015-02-26 17:32:08 +01:00
Dominik Schürmann 72acaaa41f Fingerprint verification, design fixes for qr code card 2015-02-26 02:06:57 +01:00
Dominik Schürmann a38f84a401 Dont show verification icons in my key view, hide edit button for non-secret keys 2015-02-25 21:53:46 +01:00
Dominik Schürmann b521162ef0 Invoke NFC button 2015-02-25 20:50:34 +01:00
Dominik Schürmann 0931c7742b Other icon for key exchange 2015-02-25 20:20:39 +01:00
Dominik Schürmann 57fa702cbf Design fixes for header, QR Code shared element transitions 2015-02-25 19:38:13 +01:00
Dominik Schürmann 27263edda5 CardView and more header design 2015-02-25 18:37:31 +01:00
Dominik Schürmann 4ea59f79cc Use material icon for safeslinger 2015-02-25 15:18:00 +01:00
Dominik Schürmann 8ddca4f8fe Fix menu 2015-02-25 13:49:54 +01:00
Dominik Schürmann fa92ceeae3 Toolbar: qr code in header, cleanup of fragment 2015-02-25 13:49:21 +01:00
Dominik Schürmann 430ba2f777 Bigger status icon in key view 2015-02-25 11:29:46 +01:00
Dominik Schürmann 56d38dd68b First work on new key view toolbar 2015-02-25 02:35:09 +01:00
Dominik Schürmann 2b609b8144 Fix QR Code, design experiments for key view 2015-02-24 13:43:24 +01:00
Dominik Schürmann 17a6003edd Remove tabs in view key 2015-02-24 11:25:19 +01:00
Dominik Schürmann 52bcfd71ad New advanced key view 2015-02-23 23:03:45 +01:00
Dominik Schürmann 29628e54ec Refactor AppsListFragment 2015-02-23 21:55:44 +01:00
Dominik Schürmann 2064d81aef Refactor AppsListFragment 2015-02-23 21:52:04 +01:00
Dominik Schürmann dd3af50956 Uncluttering App Settings: Move advanced info in dialog 2015-02-23 10:36:39 +01:00
Dominik Schürmann 4c7622e257 Remove unused FixedDrawerLayout 2015-02-23 00:30:02 +01:00
Dominik Schürmann 7bddd5be1d Remove old pattern lib, add new pattern lib 2015-02-23 00:28:26 +01:00
Dominik Schürmann 6b57afc350 Removed submodule android-lockpattern 2015-02-23 00:17:27 +01:00
Dominik Schürmann 4e8c4af262 Update tab lib and fix colors of tabs 2015-02-23 00:11:06 +01:00
Dominik Schürmann d984f50cb7 Disable default yubikey PIN by default 2015-02-22 23:55:23 +01:00
Dominik Schürmann e20c6add43 Fix multi select and more colors 2015-02-22 23:52:29 +01:00
Dominik Schürmann f852cb7449 Pull from transifex 2015-02-22 21:41:29 +01:00
Dominik Schürmann df7009669b Pull from transifex 2015-02-22 21:39:34 +01:00
Dominik Schürmann 21e7102e3a Fix back button in encrypt activities 2015-02-22 21:39:20 +01:00
Dominik Schürmann 0cdd68e763 Color for holo 2015-02-22 21:30:27 +01:00
Dominik Schürmann e583edf020 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-22 21:30:02 +01:00
Dominik Schürmann e46fa777ab Use right colors in snackbars and logs 2015-02-22 21:28:57 +01:00
Dominik Schürmann 04740121a5 Go to keyserver settings directly 2015-02-22 21:22:25 +01:00
Dominik Schürmann d0be3bd7ea Once again: Colors and header image 2015-02-22 21:16:40 +01:00
Dominik Schürmann 7e0e16b014 Merge pull request #1047 from steelman/dev-strings
Some Polish translated strings and some tiny cleanups
2015-02-22 10:15:28 +01:00
Dominik Schürmann 6008b65bbd show app name instead of keys in main list 2015-02-21 21:04:26 +01:00
Dominik Schürmann 32acd94698 Floating action button icons and methods for key list 2015-02-21 20:46:37 +01:00
Dominik Schürmann 5b75985f95 Status bar height fix 2015-02-21 20:01:19 +01:00
Dominik Schürmann c6c8a09883 Screenshots 2015-02-20 11:13:40 +01:00
Dominik Schürmann 5b017dbf7a Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-20 11:04:18 +01:00
Dominik Schürmann 9d7e05c06e Screenshot for GSoC 2015-02-20 11:04:07 +01:00
Dominik Schürmann a468c667bb Improve nav drawer drawable 2015-02-03 19:47:50 +01:00
Dominik Schürmann e2cb1a90cd Improve nav drawer drawable 2015-02-03 19:26:40 +01:00