moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity
2,283 Commits 12 Branches 24 Tags 116 MiB
c101ee0240
Commit Graph

2283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser
9fb92c8642 fix subkey addition 2014-07-02 15:03:28 +02:00
Vincent Breitmoser
858be93f3d update spongycastle to include addSubkeyBindingCertification 2014-07-02 15:02:11 +02:00
Vincent Breitmoser
144a10a3d0 forgot a line in previous commit 2014-07-02 14:53:25 +02:00
Vincent Breitmoser
287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
Dominik Schürmann
7408a35e19 edit key: part 3 2014-07-01 12:36:02 +02:00
Dominik Schürmann
a901004588 remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
Dominik Schürmann
9c1c51bf0c Removed submodule AndroidBootstrap 2014-06-30 22:04:13 +02:00
Dominik Schürmann
7c84b1fffd Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-30 22:01:25 +02:00
Dominik Schürmann
c2ba7e2420 work on edit key 2014-06-30 22:01:17 +02:00
Dominik Schürmann
d07dbecef4 Merge pull request #704 from da-kid/master 
Fixed #702 and also #597
 2014-06-30 21:57:33 +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
Vincent Breitmoser
de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +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
Vincent Breitmoser
6d7a9ec48a pass import results through to viewkeyactivity on update 2014-06-28 20:54:14 +02:00
Vincent Breitmoser
3acb7fb087 fix nullpointerexception in importkeyactivity 2014-06-28 20:54:13 +02:00
Dominik Schürmann
0067cdf221 travis: update sdk 2014-06-28 20:49:54 +02:00
Dominik Schürmann
97e1f365c2 Update keybase lib 2014-06-28 20:44:01 +02:00
Dominik Schürmann
2d95ae6466 Try new travis hack 2014-06-28 20:36:54 +02:00
Dominik Schürmann
17aa5d1a90 Fix supertoast submodule 2014-06-28 20:24:02 +02:00
Dominik Schürmann
70bf0c67e1 Update git submodules for android gradle plugin to 0.12.0 2014-06-28 20:17:27 +02:00
Dominik Schürmann
2157ea59e4 Update android gradle plugin to 0.12.0 2014-06-28 20:15:19 +02:00
Vincent Breitmoser
d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Dominik Schürmann
b7b22beafc Update subnodule keybase to fixed version of support libs 2014-06-28 18:59:07 +02:00
Dominik Schürmann
1738b42968 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-28 18:56:49 +02:00
Dominik Schürmann
b34c744324 Change keybase submodule to our fork 2014-06-28 18:56:19 +02:00
Dominik Schürmann
6e188be81e Merge pull request #699 from da-kid/master 
Partial fix for #597 (Navbar)
 2014-06-28 17:44:11 +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
Dominik Schürmann
3f3e1cdb05 Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
Dominik Schürmann
1d5606a1a3 More wizardry 2014-06-27 23:01:11 +02:00
Dominik Schürmann
8bfba0826f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-27 21:40:26 +02:00
Dominik Schürmann
9fe07478e7 Start work on a first-time wizard 2014-06-27 21:40:18 +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
Dominik Schürmann
bd487bf732 Merge pull request #692 from da-kid/master 
Temporary fix for #648
 2014-06-25 20:07:29 +02:00
Daniel Albert
607af7bcca Temporary fix for #648 2014-06-25 19:20:17 +02:00
Dominik Schürmann
150090852b Merge pull request #690 from mar-v-in/hkps-by-default 
HKPS by default
 2014-06-25 08:48:40 +02:00
mar-v-in
f97ac83a89 Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
Dominik Schürmann
a1bcbe72a3 new edit key: first version to add user ids 2014-06-24 22:58:28 +02:00
Dominik Schürmann
94bd2a675e Merge pull request #688 from da-kid/master 
Fix for #687
 2014-06-24 20:22:50 +02:00