moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-11 09:52:16 -05:00
Code Issues Releases Wiki Activity
1,605 Commits 12 Branches 24 Tags 116 MiB
270c7ffa1f
Commit Graph

1605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uberspot
b12392594f Make email address less restrictive and add icon to show when it's correct 2014-03-14 00:02:31 +02:00
Dominik Schürmann
c737f01a72 Merge pull request #415 from uberspot/master 
final code style changes
 2014-03-13 22:12:06 +01:00
uberspot
2d0817bd74 final code style changes 2014-03-13 23:03:20 +02:00
Dominik Schürmann
b1476a7429 Merge pull request #413 from uberspot/master 
More code style fixes
 2014-03-13 21:49:58 +01:00
uberspot
1c95970ea3 fix code style in /pgp 2014-03-13 22:08:13 +02:00
uberspot
6ac4d6c218 final ui code style changes 2014-03-13 21:39:14 +02:00
uberspot
2ff6949c95 more code style changes in /ui and /util 2014-03-13 21:30:56 +02:00
uberspot
4353ea37e2 more UI code style fixes 2014-03-13 21:30:56 +02:00
uberspot
dc5c34ffc5 More code style fixes for /ui 2014-03-13 21:30:56 +02:00
Dominik Schürmann
37c81400ac Fix colors in item view 2014-03-13 20:18:25 +01:00
Dominik Schürmann
c1e16995db remove unused color 2014-03-13 20:12:57 +01:00
Dominik Schürmann
ba9a4bec3a Improve list item view, borderless button for API < 11 2014-03-13 20:11:21 +01:00
Dominik Schürmann
793d8c266a Merge pull request #412 from uberspot/master 
Code style changes
 2014-03-13 19:40:56 +01:00
uberspot
ad1e047aa9 First code style changes in ui 2014-03-13 20:25:01 +02:00
uberspot
f26ba217e5 Fix code style in /helper 2014-03-13 20:14:04 +02:00
uberspot
540aa044e2 Fix code style in keychain/service/ 2014-03-13 20:14:04 +02:00
uberspot
79a8528a63 Optimize imports in all files, remove useless whitespace in some and fix indentation 2014-03-13 20:14:04 +02:00
Dominik Schürmann
5b907f222e Merge pull request #407 from uberspot/master 
Add apg's change to colorizing, no more background changes needed
 2014-03-13 19:09:13 +01:00
Dominik Schürmann
5c5e9d8e32 Forgot faq file 2014-03-13 19:09:54 +01:00
Dominik Schürmann
bc1a3850ac Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-13 19:08:29 +01:00
Dominik Schürmann
908cf8e769 Add FAQ tab to help 2014-03-13 19:08:03 +01:00
Dominik Schürmann
32dcf86212 Merge pull request #408 from gogowitczak/master 
Specifying connection port in KeyServer
 2014-03-13 19:02:35 +01:00
Dominik Schürmann
4c5ae3cdaa Readd create key menu items 2014-03-13 19:01:24 +01:00
Dominik Schürmann
cf51e5ff56 XML cleanup and bigger filename EditText 2014-03-13 18:53:21 +01:00
Dominik Schürmann
471cefa71f Cleanup and simplification 2014-03-13 18:27:08 +01:00
Dominik Schürmann
fb1b0deaf5 Merge pull request #403 from Valodim/master 
unify public and secret key lists
 2014-03-13 18:14:19 +01:00
gogowitczak
ccde4212e0 Added possibility to specify port for KeyServer. 2014-03-13 15:53:43 +01:00
gogowitczak
f4370b3ac8 Added possibility to specify port for KeyServer. 2014-03-13 15:39:38 +01:00
uberspot
f055228e5b add apg's change to colorizing, no more background changes needed 2014-03-13 16:09:37 +02:00
Vincent Breitmoser
be3828c89e drop unified uri in favor of generic /key_rings 
this works well in the uri schema, and we get notifications back with no
effort.

....also remove a line I committed accidentally oO
 2014-03-13 14:34:07 +01:00
Vincent Breitmoser
9a1ce093bf Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
 2014-03-13 13:40:47 +01:00
Vincent Breitmoser
6af65a2a9b merge fixes as per comments in merge 
https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
 2014-03-13 13:06:23 +01:00
Dominik Schürmann
f5c50c3896 Merge pull request #388 from ajit766/exportkeyfix 
Export is cancellable now
 2014-03-13 09:35:07 +01:00
grait
ccdf646c19 Export cancellable - minor changes 2014-03-13 05:58:48 +05:30
grait
3f649d4458 Export is cancellable now 2014-03-13 05:40:40 +05:30
Vincent Breitmoser
b9a907df0b remove special treatment for unified list query 
note: the unified query /will/ need special treatment once certs are
joined in, so I am leaving this as an artifact commit for later
reference or point to revert to.
 2014-03-13 00:29:28 +01:00
Vincent Breitmoser
0b0809ec17 keychainprovider cleanup, kindasorta 
removed code redundancy, and the query is in the switch thing now, I
didn't put everything into its own separate sources (yet?).
 2014-03-13 00:16:11 +01:00
Dominik Schürmann
217f4a1cef Merge pull request #396 from bhargavgolla/Lint-error-fix 
Lint error fix after testing
 2014-03-12 22:28:25 +01:00
Dominik Schürmann
65633112a0 Merge pull request #404 from uberspot/master 
Change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc
 2014-03-12 22:12:51 +01:00
Dominik Schürmann
c8c8d8f4b6 Merge pull request #405 from honnel/checkstyle 
Checkstyle configuration information reworked
 2014-03-12 22:10:11 +01:00
Dominik Schürmann
0749eef1c5 Merge pull request #406 from Emantor/tests_and_travis 
Reduce travis library installation overhead
 2014-03-12 22:09:50 +01:00
Daniel Hammann
5eb12ef88f Squashed commit of the following: 
commit 1df4d4a9e0
Author: Daniel Hammann <github@honnel.de>
Date:   Wed Mar 12 21:33:13 2014 +0100

    Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up).
 2014-03-12 21:36:42 +01:00
Daniel Hammann
1df4d4a9e0 Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up). 2014-03-12 21:33:13 +01:00
Daniel Hammann
6ca58dd211 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-12 20:44:33 +01:00
Emantor
5848172621 Reduce library installation overhead 2014-03-12 20:33:08 +01:00
uberspot
e909b6bb9d change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526 2014-03-12 19:14:13 +02:00
Vincent Breitmoser
69f5bf6b57 Merge branch 'unified-keylist' 
Conflicts:
	OpenPGP-Keychain/src/main/AndroidManifest.xml
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
	OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
	OpenPGP-Keychain/src/main/res/menu/key_list.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
 2014-03-12 18:05:28 +01:00
Dominik Schürmann
a9e5619a14 Merge pull request #395 from uberspot/master 
Remove duplicate code from ActionBarHelper. Add export in multiselect.
 2014-03-12 16:23:22 +01:00
Dominik Schürmann
5a5509053f Merge pull request #397 from tharinduwijewardane/master 
Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted )
 2014-03-12 16:12:35 +01:00
Dominik Schürmann
c7f4fc72d8 Merge pull request #402 from mb-14/hkpget 
Fix error in  importing/updating keys from keyserver by removing extra 0x
 2014-03-12 15:59:47 +01:00