2302 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dominik Schürmann	583467356c	Revert "Remove cancel from app menu" ... This reverts commit 3c0b97f280.	2014-03-30 19:28:35 +02:00
Dominik Schürmann	3c0b97f280	Remove cancel from app menu	2014-03-30 19:26:41 +02:00
Dominik Schürmann	7b53150ad5	Remove FLAG_ONE_SHOT from most PIs	2014-03-30 19:25:39 +02:00
Dominik Schürmann	fc4f9beb6a	Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain	2014-03-30 19:18:41 +02:00
Dominik Schürmann	e3a7d372a3	Increase API_VERSION to 3	2014-03-30 19:18:18 +02:00
Dominik Schürmann	b648d87d76	Parcelable versioning	2014-03-30 19:13:10 +02:00
Dominik Schürmann	6b5d60e1f4	Merge pull request #491 from openpgp-keychain/edit-key ... Edit key changes	2014-03-30 18:04:43 +02:00
Ashley Hughes	be007ecc56	style changes	2014-03-30 16:22:13 +01:00
Dominik Schürmann	b2342744b5	Actually use fixBadCharactersForGmail	2014-03-30 14:02:09 +02:00
Ashley Hughes	95eb33b2ed	use save icon, not tick	2014-03-29 15:33:03 +00:00
Ashley Hughes	556d6ff226	revert mistake	2014-03-29 15:19:38 +00:00
Ashley Hughes	e1d07214df	merge master	2014-03-29 13:21:39 +00:00
Dominik Schürmann	c8defe2e6d	Merge pull request #489 from mb-14/clipboard_fp ... Enable importing of fingerprints from clipboard.	2014-03-27 21:47:33 +01:00
Miroojin Bakshi	d5e3958565	Enable importing of fingerprints from clipboard.	2014-03-28 00:34:24 +05:30
Ashley Hughes	7a2d880c4d	all editing cases I can think of now work	2014-03-27 15:00:35 +00:00
Ashley Hughes	56447ad0b5	fix for editing master keys and IDs, case of change primary ID and modify master key props fails	2014-03-27 14:48:27 +00:00
Ashley Hughes	140646fa12	pass through original primary ID	2014-03-27 13:35:03 +00:00
Dominik Schürmann	68668fd444	Version 2.4	2014-03-26 22:56:51 +01:00
Dominik Schürmann	619c079f00	Sync changelog and about with transifex	2014-03-26 22:55:33 +01:00
Dominik Schürmann	a589b6e7fe	Changelog for 2.4	2014-03-26 22:48:23 +01:00
Dominik Schürmann	8e9ceffae3	Changelog for 2.4	2014-03-26 22:45:35 +01:00
Dominik Schürmann	19bbaecf32	Update from transifex	2014-03-26 22:20:23 +01:00
Dominik Schürmann	cc8fd35137	Show divider only when used	2014-03-26 18:34:48 +01:00
Dominik Schürmann	ac134790a0	Text for creation of new api accounts	2014-03-26 18:23:48 +01:00
Dominik Schürmann	399106015e	Rename layouts for remote activity	2014-03-26 18:18:00 +01:00
Dominik Schürmann	aba6a44a0a	Improve demo for API accounts	2014-03-26 18:13:48 +01:00
Dominik Schürmann	2e063a42ed	Fix provider for API_ACCOUNTS	2014-03-26 17:55:48 +01:00
Dominik Schürmann	ba37fc254d	Accounts activity prettified	2014-03-26 17:50:16 +01:00
Dominik Schürmann	65857d2b5f	Accounts list prettified	2014-03-26 17:43:26 +01:00
Dominik Schürmann	de553e9b43	Merge pull request #483 from uberspot/master ... fix capability icons and remove red text for revoked keys	2014-03-26 14:11:04 +01:00
Dominik Schürmann	ec34597331	Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT	2014-03-26 14:11:28 +01:00
uberspot	c8b7717105	fix capability icons and remove red text for revoked keys	2014-03-26 14:46:03 +02:00
Dominik Schürmann	0d5e99e1f0	Coding style	2014-03-26 13:42:16 +01:00
Dominik Schürmann	e5fe4245bf	remove old icon entry	2014-03-26 13:39:30 +01:00
Dominik Schürmann	b75428daf7	Revert "Update README.md, icon set not used anymore" ... This reverts commit 9d4582f968.	2014-03-26 13:38:45 +01:00
Dominik Schürmann	f10235220d	Forgot resource	2014-03-26 13:32:36 +01:00
Dominik Schürmann	de718c24c4	Merge pull request #482 from uberspot/master ... Fix style for expired/revoked keys	2014-03-26 13:23:50 +01:00
Dominik Schürmann	92a4d0e914	Part 2 of basic user interface for api accounts	2014-03-26 13:21:29 +01:00
uberspot	8d23ba968a	add strike through text for revoked or expired keys and disable views for revoked keys as well	2014-03-26 14:07:41 +02:00
uberspot	438c050250	put expiry on a separate line	2014-03-26 14:07:41 +02:00
Dominik Schürmann	9542dc0e12	Accounts API, user interface	2014-03-26 13:07:32 +01:00
Ashley Hughes	4923c9b8e3	add original primary ID field to parcel	2014-03-26 00:29:39 +00:00
Dominik Schürmann	930d722013	Simplify can encrypt check	2014-03-26 00:40:13 +01:00
Dominik Schürmann	30a002634d	Merge pull request #471 from sreeram-boyapati/encryption ... Added can_encrypt check	2014-03-26 00:33:29 +01:00
Dominik Schürmann	dbbb782911	Merge pull request #479 from AlexanderS/subkey-expiry ... Display expiry of subkeys in single key view.	2014-03-26 00:20:17 +01:00
Dominik Schürmann	028af0c119	Fix constraints and insert	2014-03-26 00:11:49 +01:00
Ashley Hughes	b77e0504aa	allow master key updates by removing old primary ID cert	2014-03-25 23:01:17 +00:00
Ashley Hughes	259a8a63a2	delete IDs needs to update keyring, flag it	2014-03-25 22:40:05 +00:00
Ashley Hughes	68f035ff88	allow lists to be subkeys or keyrings	2014-03-25 22:28:32 +00:00
Dominik Schürmann	0edfd7ed48	Temporary fix for inserting by content provider	2014-03-25 23:25:03 +01:00