Commit Graph
207 Commits
Author SHA1 Message Date
Vincent Breitmoser 4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Dominik Schürmann 39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-31 20:54:30 +02:00
Dominik Schürmann 6d1369be56 Pull from transifex 2014-05-31 20:49:56 +02:00
Tim Bray dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07:00
Vincent Breitmoser 952bb99a24 Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-05-21 23:06:51 +02:00
Dominik Schürmann 8a2ffd8f90 Layout fixes for key import 2014-05-19 00:10:34 +02:00
Dominik Schürmann fd12f89ccb Clarify help start 2014-05-14 18:01:40 +02:00
Vincent Breitmoser 2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
	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/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
2014-05-14 16:02:28 +02:00
Dominik Schürmann be46eabdb5 Add pgpauth app to help, update html-textview 2014-05-13 18:52:48 +02:00
Dominik Schürmann 2aa3eb2bb5 Add Tim Bray to about 2014-05-09 11:38:40 +02:00
Dominik Schürmann 37ad355d20 Translations from transifex 2014-05-08 19:39:44 +02:00
Dominik Schürmann badfa9f7bc Changelog 2.7 2014-05-08 19:32:07 +02:00
Dominik Schürmann af4f32e2d7 Translations from transifex 2014-05-08 18:44:54 +02:00
Dominik Schürmann 33cad382f9 Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
Vincent Breitmoser 185c4eed43 use LoaderFragment in ViewKey tabs
Closes #616
2014-05-08 13:58:52 +02:00
Vincent Breitmoser 596478a212 extract generic LoaderFragment superclass from KeyList 2014-05-08 13:43:59 +02:00
Dominik Schürmann 5c747a747f Update from transifex 2014-05-08 11:30:16 +02:00
Dominik Schürmann b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann e14ce09186 Better handling of actionbars back 2014-05-07 14:33:20 +02:00
Dominik Schürmann f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann 7c2dc276c1 Alignment in certify activity 2014-05-07 13:48:19 +02:00
Dominik Schürmann 10db9dd09a Change drawer nav icon back to gray 2014-05-07 11:15:40 +02:00
Dominik Schürmann 61fc8d0eee Translations from transifex 2014-05-07 11:01:33 +02:00
Dominik Schürmann fb0f3c4778 Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
Dominik Schürmann 2481b6e660 Pull translations from transifex 2014-05-07 09:31:01 +02:00
Dominik Schürmann 0155335a59 Clarify language 2014-05-07 09:29:02 +02:00
Dominik Schürmann b405c1d664 Pull translations from transifex 2014-05-07 09:13:32 +02:00
Dominik Schürmann a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00
Dominik Schürmann dc382a2ddd Clarify language 2014-05-07 09:05:28 +02:00
Vincent Breitmoser 174858e9cf ui: apply theme to tab buttons 2014-05-07 03:55:06 +02:00
Vincent Breitmoser 12f1162a1e ui: use SlidingTabLayout in help activity 2014-05-07 03:48:03 +02:00
Vincent Breitmoser 40793935ac ui: primary certification icon was a pixel or two off 2014-05-07 03:19:09 +02:00
Vincent Breitmoser 65274f6c16 ui: purplize searchtext in keylist 2014-05-07 03:07:24 +02:00
Vincent Breitmoser 873b1be75d display AppMsg warning when no encryption subkey is available 2014-05-07 02:27:51 +02:00
Vincent Breitmoser 0bb11be749 ui: slight edit icon cosmetics in keylist 2014-05-07 02:15:09 +02:00
Vincent Breitmoser 6aafb31412 ui: move revocation/expiry notes above tab slider 2014-05-07 02:14:47 +02:00
Vincent Breitmoser 6a9cb69a1f ui: purpelize fastscroll thumb 2014-05-07 01:13:08 +02:00
Dominik Schürmann e97cdbd9ad Clarify language 2014-05-06 23:16:08 +02:00
Dominik Schürmann 8eb74d171b Some small style fixes 2014-05-06 23:11:10 +02:00
Dominik Schürmann 1c2919f07f edit button with image 2014-05-06 22:52:50 +02:00
Dominik Schürmann 274326f780 Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
Vincent Breitmoser 797aeaf6e8 ui: apply purple theme (twi is best color) 2014-05-06 19:18:32 +02:00
Vincent Breitmoser e0985878d7 ui: use textview buttons in decrypt verify dialogue 2014-05-06 19:18:32 +02:00
Vincent Breitmoser 0d05ff98cb ui: use textviews instead of bootstrap buttons in SignEncrypt 2014-05-06 19:18:32 +02:00
Vincent Breitmoser d52d455317 ui: make primary star icon slightly larger 2014-05-06 19:18:31 +02:00
Vincent Breitmoser 8564c4aca1 ui: use primary icon color for certification status 2014-05-06 00:39:09 +02:00
Vincent Breitmoser d31ae89824 ui: show revocation and expiry status on info tab 2014-05-06 00:04:37 +02:00
Vincent Breitmoser 162cb1cb7b ui: subkey view redesign 2014-05-05 22:06:09 +02:00
Vincent Breitmoser 0fe0823372 ui: remove primary subkey info 2014-05-05 22:04:57 +02:00