moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-21 05:11:45 -05:00
Code Issues Releases Wiki Activity
4,273 Commits 12 Branches 24 Tags
Commit Graph

48 Commits

Author SHA1 Message Date
Vincent Breitmoser
20a6c5ce8a Version 3.2.1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVTz9/AAoJEHGMBwEAASKCRxoH/0IqEXg79Hu2Q+XHzfxNl01W
 ork+6qHRG6AaKaYv5xEgj2CFwG/HSpVGbTR+3ahn28d9UMgh05vSRR2Jh2qkSMCb
 owEVMlHopQkWKqLEsXcbkdMQxDqdVTUeLJcldxR2+B7CM1orZr6VLSU6rDVvHLq1
 kPBAsk74cNg8svjfRFC4GdveWGNOnhUY267kVi7TFOhOIhX2ujbfY1ovJK7Zt5Ft
 qCg2/TY2tWDZUkJ3RIhwrBVUo6lvMNZ5r0cjkualBOe3qNZqejXt6IwEjZZR9vLA
 YkICjSF6DaLpTR97WucMKN2zqe4Gv4jWhYP4q+2OqrbJSUwbqxAsTahlyQXxht4=
 =YRwH
 -----END PGP SIGNATURE-----

Merge tag 'v3.2.1' into linked-identities

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-11 17:28:34 +02:00
Dominik Schürmann
dbff510783 Add screenshots 2015-05-06 14:22:53 +02:00
Dominik Schürmann
c0c35d383e Update function graphic 2015-05-06 14:03:52 +02:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Vincent Breitmoser
b4aec3114d Merge branch 'development' into linked-identities 
Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-04-24 14:18:01 +02:00
Dominik Schürmann
baac30508d Graphic stuff 2015-04-17 17:30:03 +02:00
Vincent Breitmoser
dc8b04a793 more linked id ui fine tuning 2015-03-26 16:30:49 +01:00
Vincent Breitmoser
aa6d0dd867 some linked id ui fine tuning 2015-03-26 13:53:43 +01:00
Vincent Breitmoser
04c7639a5a split up wait/action yubikey fragments 2015-03-21 22:18:58 +01:00
Vincent Breitmoser
538be96e61 work on certification ui 2015-03-15 22:10:05 +01:00
Dominik Schürmann
bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik Schürmann
67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Dominik Schürmann
72c18734ad Redesign of encrypt activites finished 2015-03-09 16:03:58 +01:00
Dominik Schürmann
c50dceab32 Improve icons 2015-03-09 13:27:24 +01:00
Dominik Schürmann
d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann
18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Dominik Schürmann
7c8f338297 Use material save icon 2015-03-04 20:57:11 +01:00
Dominik Schürmann
484a9371b7 Remove help button for now 2015-03-04 20:40:55 +01:00
Dominik Schürmann
2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann
de31fcc45f Partially fix file names 2015-03-04 19:04:15 +01:00
jiangkai
57dca38374 if needed change name options.templ.json 2015-03-03 12:30:56 -08:00
jiangkai
ce37b7255d get more material icon script 2015-03-03 10:09:04 -08: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
4ea59f79cc Use material icon for safeslinger 2015-02-25 15:18:00 +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
e20c6add43 Fix multi select and more colors 2015-02-22 23:52:29 +01:00
Dominik Schürmann
d0be3bd7ea Once again: Colors and header image 2015-02-22 21:16:40 +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
c6c8a09883 Screenshots 2015-02-20 11:13:40 +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
Dominik Schürmann
e29ea517da Fix first time wizard design 2015-02-03 19:13:02 +01:00
Dominik Schürmann
d6d679997b Move encrypt decrypt operations in own starter activity 2015-02-03 18:39:07 +01:00
Dominik Schürmann
e2a8819385 Floating Action Button added in app settings 2015-02-03 14:28:54 +01:00
Dominik Schürmann
3c2f9ce0da Header exported 2015-01-30 10:10:04 +01:00
Dominik Schürmann
e0369a2f14 Header image tryout 2015-01-29 17:02:01 +01:00
Dominik Schürmann
43930ed8f2 Move key list logic into fragment, UI fixes for nav drawer 2015-01-29 10:10:07 +01:00
Dominik Schürmann
81d4d31fd7 Cloud search icon 2015-01-28 18:11:08 +01:00
Dominik Schürmann
e049895b9f Material Design Drawer 2015-01-26 15:24:42 +01:00
Dominik Schürmann
e4e2d647c8 Material Design: Full screen dialogs 2015-01-26 00:50:35 +01:00
Dominik Schürmann
0c74cc7c3d Fix drawable sizes 2015-01-14 20:25:28 +01:00
Dominik Schürmann
1516ebf26a Toolbar for settings 2015-01-14 20:18:03 +01:00
Dominik Schürmann
f397d4f995 Reorganize folders of graphics sources 2015-01-14 14:52:23 +01:00