 Daniel Albert
|
cc63b0e72c
|
Fixed gitmodules
|
2014-07-17 22:00:24 +02:00 |
|
|
Daniel Albert
|
db002bde7c
|
Fixed another unescaped apostrophe.
|
2014-07-17 21:17:39 +02:00 |
|
|
Daniel Albert
|
8a8d8c5a68
|
Fixed unescaped apostrophe
|
2014-07-17 20:53:10 +02:00 |
|
|
Daniel Albert
|
01046fc0e7
|
Added description to Setting, Changed title to suggested one
|
2014-07-17 20:01:53 +02:00 |
|
|
Daniel Albert
|
f15df98ab5
|
Hopefully fixes Travis build errors
|
2014-07-16 19:59:55 +02:00 |
|
|
Daniel Albert
|
d63534d655
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
|
2014-07-16 18:49:16 +02:00 |
|
|
Daniel Albert
|
e375cde7e1
|
Final Commit for #662
|
2014-07-16 18:17:46 +02:00 |
|
|
Daniel Albert
|
c101ee0240
|
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
|
2014-07-13 15:39:16 +02:00 |
|
|
Daniel Albert
|
bd909375c2
|
Fixed misplaced bracket
|
2014-07-12 19:24:51 +02:00 |
|
|
Daniel Albert
|
92c66743e0
|
Added Preference for concealing the PgpApplication
|
2014-07-12 19:19:12 +02:00 |
|
|
Daniel Albert
|
066591dab1
|
Wello there, That's Java, not C^^
|
2014-07-12 18:53:52 +02:00 |
|
|
Daniel Albert
|
079194abe5
|
Fixed issues discussed in #713
|
2014-07-12 18:12:03 +02:00 |
|
|
Daniel Albert
|
7a3fe61a1f
|
Put text into strings.xml, for internationalization
|
2014-07-12 12:52:44 +02:00 |
|
|
Daniel Albert
|
2568ea4b2e
|
Added Purging for Android < 4.1
|
2014-07-12 12:42:48 +02:00 |
|
|
Daniel Albert
|
cf40517eac
|
Implemented Notification, no fallback yet
|
2014-07-12 12:27:19 +02:00 |
|
|
Daniel Albert
|
af90db96a5
|
new PassphraseCache, storing UserIDs as well
|
2014-07-12 10:51:12 +02:00 |
|
|
Daniel Albert
|
5dcbc07af9
|
Fixed Bootstrap resource
|
2014-06-30 21:32:40 +02:00 |
|
|
Daniel Albert
|
cc095a2098
|
(should have) fixed Travis builds
|
2014-06-30 21:24:31 +02:00 |
|
|
Daniel Albert
|
f3b68a9932
|
Deprecated Android Bootstrap, thus fixing #597
|
2014-06-30 19:18:20 +02:00 |
|
|
Daniel Albert
|
158d19a945
|
Fixed, issue #702
|
2014-06-30 19:13:09 +02:00 |
|
|
Daniel Albert
|
df9af316b4
|
Merge branch 'master' of https://github.com/open-keychain/open-keychain
|
2014-06-30 19:09:56 +02:00 |
|
|
Daniel Albert
|
1e9789f5b4
|
Converted all other buttons
|
2014-06-30 19:09:13 +02:00 |
|
|
Daniel Albert
|
2406842847
|
Ported even more buttons to use new design (Key and User editor)
Added drawables for them
|
2014-06-29 22:31:37 +02:00 |
|
|
Daniel Albert
|
e8bb14ca26
|
Converted AsymetricKeyFragment to new button style
|
2014-06-29 15:28:24 +02:00 |
|
|
Daniel Albert
|
9091c22240
|
Added new button style and converted account_settings and the select_secret_key_layout to use it
|
2014-06-29 13:59:51 +02:00 |
|
|
Daniel Albert
|
4beff43a83
|
Updated file_dialog to use the new buttons
|
2014-06-29 13:21:33 +02:00 |
|
|
Daniel Albert
|
e731dc139f
|
Improved button style
centered buttons
removed commented-out button
|
2014-06-29 12:33:02 +02:00 |
|
|
Daniel Albert
|
bd44516576
|
Added button_rounded style
converted decrypt_file_fragment to new style
|
2014-06-28 21:12:56 +02:00 |
|
|
Daniel Albert
|
2da5bfabd3
|
Merge remote-tracking branch 'upstream/master'
|
2014-06-28 12:30:30 +02:00 |
|
|
Daniel Albert
|
d19c97a714
|
Switched to the dark icons
|
2014-06-28 12:25:41 +02:00 |
|
|
Daniel Albert
|
567e5cc6a5
|
Added unlock icon, fixed drawer items, switched to icons from resource in drawer
|
2014-06-27 21:03:19 +02:00 |
|
|
Daniel Albert
|
1b90b46b00
|
Swapped out FontawesomeText with normal ImageView
|
2014-06-26 21:33:42 +02:00 |
|
|
Daniel Albert
|
607af7bcca
|
Temporary fix for #648
|
2014-06-25 19:20:17 +02:00 |
|
|
Daniel Albert
|
02bcd391bf
|
Fix for #687
|
2014-06-24 20:15:48 +02:00 |
|
|
Daniel Albert
|
85bf24521d
|
Merge branch 'master' of https://github.com/da-kid/open-keychain
|
2014-06-23 19:24:42 +02:00 |
|