cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
040cf42cb07c0bc58aceb048804c6d9359754499
open-keychain/OpenKeychain/src/main/res
History
Dominik Schürmann 040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
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
2015-03-24 13:19:43 +01:00
..
anim
show refresh key progress inline
2015-02-27 22:46:48 +01:00
drawable
Remove old Holo design resources
2015-02-26 17:37:28 +01:00
drawable-hdpi
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
drawable-mdpi
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
drawable-xhdpi
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
drawable-xxhdpi
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
drawable-xxxhdpi
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
layout
finish ui flow for yubikey import
2015-03-22 06:36:27 +01:00
layout-land
Better qr code resizing
2015-02-27 22:26:11 +01:00
menu
introduced multi-threading
2015-03-23 15:34:22 +05:30
raw
Fix language problems reported by yahoe.001 on transifex
2015-03-23 22:18:29 +01:00
raw-bg
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-cs
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-de
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-es
translation fixes
2015-03-23 22:38:20 +01:00
raw-et
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-eu
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-fi
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-fr
translation fixes
2015-03-23 22:38:20 +01:00
raw-is
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-it
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-ja
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-nl
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-pl
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-pt
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-ro
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-ru
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-sl
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-sr
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-sv
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-tr
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-uk
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-zh
Pull from transifex
2015-03-23 15:54:48 +01:00
raw-zh-rTW
Pull from transifex
2015-03-23 15:54:48 +01:00
values
Merge branch 'development' into v/crypto-input-parcel
2015-03-24 13:19:43 +01:00
values-bg
Pull from transifex
2015-03-10 16:19:46 +01:00
values-cs
Pull from transifex
2015-03-23 15:54:48 +01:00
values-de
Pull from transifex
2015-03-23 15:54:48 +01:00
values-es
Pull from transifex
2015-03-23 15:54:48 +01:00
values-et
Pull from transifex
2015-03-23 15:54:48 +01:00
values-eu
Pull from transifex
2015-03-23 15:54:48 +01:00
values-fi
Pull from transifex
2015-03-23 15:54:48 +01:00
values-fr
translation fixes
2015-03-23 22:38:20 +01:00
values-is
Pull from transifex
2015-03-10 16:19:46 +01:00
values-it
Pull from transifex
2015-03-23 15:54:48 +01:00
values-ja
Pull from transifex
2015-03-23 15:54:48 +01:00
values-nl
Pull from transifex
2015-03-23 15:54:48 +01:00
values-pl
Pull from transifex
2015-03-23 15:54:48 +01:00
values-pt
Pull from transifex
2015-03-10 16:19:46 +01:00
values-ro
Pull from transifex
2015-03-10 16:19:46 +01:00
values-ru
Pull from transifex
2015-03-23 15:54:48 +01:00
values-sl
Pull from transifex
2015-03-23 15:54:48 +01:00
values-sr
Manage my keys wizard
2015-03-19 17:16:23 +01:00
values-sv
Pull from transifex
2015-03-23 15:54:48 +01:00
values-tr
Pull from transifex
2015-03-23 15:54:48 +01:00
values-uk
Pull from transifex
2015-03-23 15:54:48 +01:00
values-v21
Fix toolbar margins on Android lower 5
2015-03-03 20:15:09 +01:00
values-zh
Pull from transifex
2015-03-23 15:54:48 +01:00
values-zh-rTW
Pull from transifex
2015-03-23 15:54:48 +01:00
xml
Fix language problems reported by yahoe.001 on transifex
2015-03-23 22:18:29 +01:00