moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
3,727 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

3727 Commits

Author SHA1 Message Date
Dominik Schürmann c121657c2c Better selection of preferred algorithm 2015-03-05 10:49:57 +01:00
Dominik Schürmann 8c8fdd6c49 Merge pull request #1101 from danielnelz/development 
#1042 replaced some int constants with enums
 2015-03-04 22:05:55 +01:00
Dominik Schürmann 0706bca8c6 Rewording secret_key_deletion_confirmation 2015-03-04 21:14:37 +01:00
Dominik Schürmann f3af54c814 Show fingerprint menu item only if not revoked or expired 2015-03-04 21:12:52 +01:00
Daniel Nelz fe8b08ac84 #1042 replaced some int constants with enums 
Created enum FragAction in CreateKeyActivity.java and enum State in
KeyFormattingUtils.java and replaced int constants with them
 2015-03-04 21:07:32 +01:00
Dominik Schürmann 7c8f338297 Use material save icon 2015-03-04 20:57:11 +01:00
Dominik Schürmann 83a7090681 Merge branch 'adithyaphilip-development' into development 2015-03-04 20:54:23 +01:00
Dominik Schürmann bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development 
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2015-03-04 20:54:11 +01:00
Dominik Schürmann e312b0e675 Set key signature algo from SHA512 to SHA256 2015-03-04 20:47:37 +01:00
Dominik Schürmann 484a9371b7 Remove help button for now 2015-03-04 20:40:55 +01:00
Dominik Schürmann 2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann de31fcc45f Partially fix file names 2015-03-04 19:04:15 +01:00
Dominik Schürmann 1aebd7412f Fix transifex 2015-03-04 18:38:58 +01:00
Dominik Schürmann 17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Dominik Schürmann fcc819d437 Update lib list 2015-03-04 15:52:06 +01:00
Dominik Schürmann b662ff6c49 Get high res version of contact photo 2015-03-04 15:39:41 +01:00
Dominik Schürmann 502a0b5376 Crop image view to center 2015-03-04 15:26:09 +01:00
Dominik Schürmann 2389ce9aeb Full height contact pic in key view 2015-03-04 15:23:33 +01:00
Dominik Schürmann 46944198e4 ContactHelper cleanup 2015-03-04 15:12:00 +01:00
Dominik Schürmann ff42dfc9db Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED instead of EXPIRY where possible 2015-03-04 15:02:51 +01:00
Dominik Schürmann b10fe01b82 Fix status bar orange 2015-03-04 11:46:31 +01:00
Dominik Schürmann 9b565f1875 More simplification of delete strings 2015-03-04 11:44:37 +01:00
Dominik Schürmann 8e12e93bc0 Merge pull request #1097 from ishan1604/orange-toolbar 
Orange toolbar for certify and fingerprint activity added
 2015-03-04 11:40:37 +01:00
Dominik Schürmann 71db34ed75 Simplify certify strings 2015-03-04 11:40:12 +01:00
Dominik Schürmann aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +01:00
Ishan Khanna 0362dc6c1d Orange Toolbar Added Fixes #1088 2015-03-04 15:47:44 +05:30
Vincent c17599f13f Merge pull request #1080 from indrora/avoid-large-log-parcels 
Fix root cause of #1077
 2015-03-04 00:43:48 +01:00
Dominik Schürmann 9d23b19458 Merge branch 'vectorijk-development' into development 2015-03-03 23:55:19 +01:00
Dominik Schürmann 1cc860d23f Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development 2015-03-03 23:46:20 +01:00
Adithya Abraham Philip 024ba19499 corrected code style 2015-03-04 04:14:28 +05:30
Dominik Schürmann c00a1f1ec3 Show name only in passphrase dialog 2015-03-03 23:43:25 +01:00
Dominik Schürmann b6e30e0bb2 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-03 22:44:37 +01:00
Dominik Schürmann 7b0e067f63 Fix expiry dialog, reorder layouts 2015-03-03 22:44:32 +01:00
Dominik Schürmann 188559bbcd Prettify passphrase dialog, it no longer resizes on unlocking the key 2015-03-03 22:27:14 +01:00
Ishan Khanna eedc7064b9 Fixes Issue#1088 2015-03-04 02:36:33 +05:30
Ishan Khanna 3dda761791 Merge remote-tracking branch 'upstream/development' into development 
Conflicts:
	.gitmodules
 2015-03-04 02:31:39 +05:30
Dominik Schürmann 568854f6dd Merge pull request #1089 from ishan1604/submodulesfix 
Submodulesfix
 2015-03-03 21:54:58 +01:00
Ishan Khanna f3fd3c464c Merge remote-tracking branch 'upstream/development' into development 2015-03-04 02:20:08 +05:30
Ishan Khanna f5b877ca22 Fixed Submodules 2015-03-04 02:19:59 +05:30
jiangkai 57dca38374 if needed change name options.templ.json 2015-03-03 12:30:56 -08:00
jiangkai f195055107 icon name changes in UI files 2015-03-03 12:19:00 -08:00
jiangkai f186199017 delete holo icons 2015-03-03 12:17:11 -08:00
Ishan Khanna 32d934808b Fixed Spacing issue 2015-03-04 01:39:02 +05:30
Ishan Khanna 89ebb985fb This edit prevents some modules from throwing untracked content warning in git 2015-03-04 01:31:38 +05:30
jiangkai 6c0a5c04e7 change icon name in layout files 2015-03-03 11:26:59 -08:00
Dominik Schürmann 5a4fc0a071 Fix toolbar margins on Android lower 5 2015-03-03 20:15:09 +01:00
jiangkai ba1cd87d39 download new material design icons 2015-03-03 10:36:38 -08:00
jiangkai ce37b7255d get more material icon script 2015-03-03 10:09:04 -08:00
Dominik Schürmann be06c4cd58 Use spinner DatePicker, not full calendar, also on Android 5 2015-03-03 19:04:40 +01:00
Morgan Gangwere ba5eb3543e Cleanup for style 
Some nitpicks were had. Also, change the null UUID to a constant.
 2015-03-03 08:47:16 -07:00