Dominik Schürmann
bb2d80bfc8
Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development
...
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
2015-03-04 20:54:11 +01:00
Dominik Schürmann
17a627919c
Simplified language: Confirm keys
2015-03-04 18:34:42 +01:00
Dominik Schürmann
9b565f1875
More simplification of delete strings
2015-03-04 11:44: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
7b0e067f63
Fix expiry dialog, reorder layouts
2015-03-03 22:44:32 +01:00
Dominik Schürmann
5a4fc0a071
Fix toolbar margins on Android lower 5
2015-03-03 20:15:09 +01:00
Adithya Abraham Philip
c2c8ee1efd
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
2015-03-02 22:31:13 +05:30
Dominik Schürmann
dae0873f5e
Search string simplified
2015-03-02 17:39:30 +01:00
Dominik Schürmann
9514719719
Re-add black color
2015-03-02 16:29:40 +01:00
Adithya Abraham Philip
95e9e2ac30
added logging, notify for log export
2015-03-01 02:02:39 +05:30
Adithya Abraham Philip
94114e35c2
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
2015-02-28 14:29:20 +05:30
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
fe31883f66
Keybase header text
2015-02-27 22:40:52 +01:00
Adithya Abraham Philip
960a163185
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
2015-02-28 01:30:41 +05:30
Dominik Schürmann
6dce7c88d8
Merge keybase-proof branch
2015-02-27 01:18:18 +01:00
Adithya Abraham Philip
99ff9d2340
merged dialog
2015-02-26 22:26:40 +05:30
Dominik Schürmann
1210a80a96
Remove old Holo design resources
2015-02-26 17:37: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
Adithya Abraham Philip
ec353b0c39
initial Log Display function
2015-02-26 21:58:25 +05:30
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
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
56d38dd68b
First work on new key view toolbar
2015-02-25 02:35:09 +01:00
Dominik Schürmann
2064d81aef
Refactor AppsListFragment
2015-02-23 21:52:04 +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
e20c6add43
Fix multi select and more colors
2015-02-22 23:52:29 +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
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
Łukasz Stelmach
db8ee77d56
move a string in the safe slinger activity to resources
2015-02-21 22:29:09 +01:00
Dominik Schürmann
5b75985f95
Status bar height fix
2015-02-21 20:01:19 +01:00
Vincent Breitmoser
3efaac2175
determine correct filesize during decryption from LiteralData packet
2015-02-17 18:08:45 +01:00
Dominik Schürmann
dfe92ceb24
Add FAB to key list
2015-02-03 18:51:58 +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
9e011860c4
More toolbar fixes
2015-02-03 18:10:13 +01:00
Dominik Schürmann
7914aa5c08
Toolbar fixes, Toolbar under status bar on Lollipop
2015-02-03 16:05:18 +01:00
Dominik Schürmann
e2a8819385
Floating Action Button added in app settings
2015-02-03 14:28:54 +01:00
Vincent Breitmoser
7b24ee7b55
rewrite PgpSignEncrypt data flow
...
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
2015-02-01 23:14:26 +01:00
Vincent Breitmoser
0b6dc65c97
Merge remote-tracking branch 'origin/development' into development
2015-01-31 18:49:54 +01:00
Vincent Breitmoser
5466d1e980
prevent recursive consolidate
2015-01-31 18:49:00 +01:00
Dominik Schürmann
38f7950d90
Saving of allowed keys
2015-01-29 21:00:58 +01:00
Dominik Schürmann
e0369a2f14
Header image tryout
2015-01-29 17:02:01 +01:00
Dominik Schürmann
34b01e9f2b
Remove files related to old nav drawer
2015-01-29 13:36:38 +01:00
Dominik Schürmann
03a01dc7ae
White popup theme
2015-01-29 11:03:19 +01:00
Dominik Schürmann
5564f65a69
Merge remote-tracking branch 'origin/t/snackbar' into development
...
Conflicts:
OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
Dominik Schürmann
e8780b4410
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
