199 Commits

Author	SHA1	Message	Date
Dominik Schürmann	55f067b063	Work on edit	2014-07-03 15:06:05 +02:00
Dominik Schürmann	12db94abca	A little bit less purple	2014-07-02 18:59:23 +02:00
Vincent Breitmoser	a920f9ce0c	Merge remote-tracking branch 'origin/master'	2014-07-02 16:05:58 +02:00
Vincent Breitmoser	100b5f4c5f	Merge branch 'create-keyring'	2014-07-02 16:05:28 +02:00
Vincent Breitmoser	ebcd243e97	support changing primary user id in SaveKeyringParcel ... Closes #695	2014-07-02 16:02:56 +02:00
Dominik Schürmann	3d34eb8ca4	edit key: work on saving	2014-07-02 15:42:38 +02:00
Dominik Schürmann	a66c6b5b7a	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-02 15:11:13 +02:00
Dominik Schürmann	4f83a4f163	Edit key: adding user ids	2014-07-02 15:10:50 +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	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
Daniel Albert	cc095a2098	(should have) fixed Travis builds	2014-06-30 21:24:31 +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	d6a2875816	code cleanup and plurals in import log entries ... closes #698	2014-06-28 19:15:28 +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
Daniel Albert	607af7bcca	Temporary fix for #648	2014-06-25 19:20:17 +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	e84aa5a69d	Rename registered apps to apps	2014-06-24 13:54:24 +02:00
Dominik Schürmann	bfd7c03b0a	remove margin in import keys (leftover from nav drawer)	2014-06-23 18:38:26 +02:00
Dominik Schürmann	b43fb63753	new edit key: diff for existing user ids	2014-06-22 18:12:04 +02:00
Dominik Schürmann	c52828d247	add buttons in edit key	2014-06-22 13:33:50 +02:00
Dominik Schürmann	9d20e68f11	Revert hint_keybase_search	2014-06-22 10:59:50 +02:00
Dominik Schürmann	4ae5c56b73	Merge pull request #668 from timbray/master ... Moved Keybase stuff into KeybaseLib submodule	2014-06-21 21:25:03 +02:00
Dominik Schürmann	18430bef17	Start new designed activity	2014-06-21 20:25:51 +02:00
Tim Bray	17f43ad21b	Moved Keybase stuff into KeybaseLib submodule	2014-06-20 09:31:34 -07:00
Dominik Schürmann	f0b8261ad3	Use actionbar button for log activity	2014-06-20 15:49:54 +02:00
Dominik Schürmann	717d66961b	Fix onTouchEvent delegation, with workaround for Android bug	2014-06-20 15:39:27 +02:00
Dominik Schürmann	47edcacf61	Remove unused code to import splitted qr codes	2014-06-19 00:54:52 +02:00
Dominik Schürmann	0db425b289	Reference ic_launcher instead of icon	2014-06-18 23:19:54 +02:00
Dominik Schürmann	bce874db09	decrease size of search icons in import	2014-06-18 23:06:58 +02:00
Dominik Schürmann	a246dc9675	Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions	2014-06-18 22:30:54 +02:00
Dominik Schürmann	37a81af748	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-06-18 22:02:07 +02:00
Dominik Schürmann	d9ccef4899	consistent button design in import activity	2014-06-18 22:01:58 +02:00