moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-24 07:21:49 -05:00
Code Issues Releases Wiki Activity
3,689 Commits 12 Branches 24 Tags
Commit Graph

3689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
b4edb88f45 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:02:58 +01:00
Dominik Schürmann
c94ef60c5d Fix SearchView 2015-01-14 14:02:51 +01:00
Vincent Breitmoser
2e04888d36 involve user attributes in unit tests for merge and canonicalize! 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
bbc9d90c3e add basic tests for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
503ecba23d involve user attributes in unit tests for merge and canonicalize! 2015-01-14 13:23:03 +01:00
Dominik Schürmann
99361bdcff Better way to have dark toolbar and light theme 2015-01-14 13:19:21 +01:00
Vincent Breitmoser
2d5abc7da9 small fixes to user attribute handling 2015-01-14 13:05:13 +01:00
Vincent Breitmoser
6f4226911a add basic tests for addition of user attributes 2015-01-14 13:04:09 +01:00
Vincent Breitmoser
a75394fbd3 fix log entry for addition of user attributes 2015-01-14 11:07:27 +01:00
Dominik Schürmann
d9e0f0a271 Fix Toolbars in decrypt activities 2015-01-14 10:35:40 +01:00
Dominik Schürmann
47051f9a09 svg backup icon 2015-01-14 10:28:09 +01:00
Dominik Schürmann
5517b4f8cf Launcher icon fixes 2015-01-14 02:03:20 +01:00
Dominik Schürmann
318d3eb120 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 00:04:10 +01:00
Vincent Breitmoser
c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser
2b1c5358b7 make user_ids table typed, with attribute_data support 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2015-01-14 00:02:53 +01:00
Vincent Breitmoser
965003784b actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:00:04 +01:00
Dominik Schürmann
7da3ddae7b Refactor BaseActivity 2015-01-13 23:43:18 +01:00
Dominik Schürmann
d8ff737fc5 Use Toolbar and new BaseActivity 2015-01-13 23:15:13 +01:00
Vincent Breitmoser
8b0e04b9df make user_ids table typed, with attribute_data support 2015-01-13 23:09:48 +01:00
Dominik Schürmann
862d1f1971 Green 2015-01-13 22:18:40 +01:00
Dominik Schürmann
2e3545949b Start working on Material Design 2015-01-13 21:55:53 +01:00
Vincent Breitmoser
cb997fbda6 update spongycastle with more public methods for WrappedUserAttribute 2015-01-13 20:54:03 +01:00
Vincent Breitmoser
33ab856214 update spongycastle with more public methods for WrappedUserAttribute 2015-01-13 20:53:38 +01:00
Vincent Breitmoser
abd1211613 hack to make WrappedUserAttribute serializable 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
 2015-01-13 20:42:40 +01:00
Vincent Breitmoser
84eece622b support addition of user attributes 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-01-13 20:41:01 +01:00
Vincent Breitmoser
50e515c6cd add support for user attributes in merge() routine 2015-01-13 20:37:26 +01:00
Vincent Breitmoser
4b5de13e42 certification of the first linked identity packet! 2015-01-13 20:36:37 +01:00
Vincent Breitmoser
08ea4e1b7e add support for user attributes in merge() routine 2015-01-13 20:35:27 +01:00
Vincent Breitmoser
189c321528 hack to make WrappedUserAttribute serializable 2015-01-13 20:34:19 +01:00
Vincent Breitmoser
f48b8121bd add back button to wizard fragments 2015-01-13 19:06:38 +01:00
Dominik Schürmann
2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Vincent Breitmoser
fc85ef71a8 remove LinkedIdentity (committed earlier by accident) 2015-01-13 00:10:59 +01:00
Vincent Breitmoser
e71d620840 some work on twitter resource 2015-01-13 00:09:48 +01:00
Vincent Breitmoser
d51621538a forgot to commit WrappedUserAttribute 2015-01-12 21:04:34 +01:00
Vincent Breitmoser
3bbff31d47 add dns button to linked identity selection 2015-01-12 21:04:18 +01:00
Vincent Breitmoser
ea72b29f2d support addition of user attributes 2015-01-12 20:59:37 +01:00
Vincent Breitmoser
fc3397de5d add support for user attributes (during canonicalization) 2015-01-12 20:08:35 +01:00
Vincent Breitmoser
9fe701c866 work on affirmations (begin rename to LinkedIdentity 2015-01-12 20:04:15 +01:00
Vincent Breitmoser
8408113322 add support for user attributes (during canonicalization) 2015-01-12 20:03:03 +01:00
Vincent Breitmoser
e0847cafaf even more intermediate result 2015-01-12 19:27:46 +01:00
Dominik Schürmann
01c3e7bbf9 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-12 15:38:25 +01:00
Dominik Schürmann
374de7ed96 Update safeslinger lib 2015-01-12 15:38:16 +01:00
Dominik Schürmann
b73ad7d87e Update safeslinger lib 2015-01-12 15:37:41 +01:00
Vincent Breitmoser
5faeb5f5f0 intermediate state, nothing really working yet 2015-01-12 13:17:18 +01:00
Dominik Schürmann
3e74405f3c Merge pull request #1023 from adithyaphilip/development 
Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
 2015-01-12 11:03:42 +01:00
Abraham Philip
16f924eef3 fixed crash when file scheme is passed, broadened deletion scope 2015-01-09 05:07:50 +05:30
Dominik Schürmann
a87a45aa9a No output stream for detached signatures, makes no sense to pipe it through 2015-01-08 14:57:09 +01:00
Dominik Schürmann
1c4b8c193d Experimental API support for detached signatures (not tested) 2015-01-08 14:48:13 +01:00