Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 4 | -5/+23 |
| | |||||
* | Merge pull request #477 from thi/adjust-getting-started-text | Dominik Schürmann | 2014-03-25 | 17 | -17/+17 |
|\ | | | | | Change the getting started text | ||||
| * | Change the getting started text | Thialfihar | 2014-03-24 | 17 | -17/+17 |
| | | | | | | | | "My Keys" is now wrapped into "Contacts". | ||||
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 20 | -78/+22 |
|\| | |||||
| * | Remove icon set credits | Thialfihar | 2014-03-23 | 19 | -38/+0 |
| | | |||||
| * | Adjust encrypt layout, align signature with button | Thialfihar | 2014-03-23 | 1 | -2/+3 |
| | | |||||
| * | Adjust credits | Thialfihar | 2014-03-23 | 19 | -38/+19 |
| | | |||||
* | | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 5 | -42/+138 |
|/ | |||||
* | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 1 | -18/+10 |
| | |||||
* | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 4 | -93/+126 |
| | |||||
* | remove ach language, not supported by android | Dominik Schürmann | 2014-03-21 | 6 | -222/+0 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-03-21 | 24 | -0/+1311 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-03-21 | 21 | -92/+294 |
| | |||||
* | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 2 | -0/+40 |
|\ | | | | | New Fix for #410 | ||||
| * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 2 | -0/+40 |
| | | |||||
* | | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵ | Daniel Hammann | 2014-03-20 | 2 | -3/+7 |
| | | | | | | | | and clipboard button | ||||
* | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -3/+4 |
| | | |||||
* | | Move fingerprint up below the algorithm in key view | Thialfihar | 2014-03-20 | 1 | -15/+15 |
| | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification. | ||||
* | | Move fingerprint to the right in key list entry | Thialfihar | 2014-03-20 | 1 | -8/+8 |
|/ | | | | Fits much better there and doesn't separate the user ID. | ||||
* | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 1 | -3/+4 |
| | |||||
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-19 | 2 | -0/+8 |
|\ | |||||
| * | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 2 | -0/+8 |
| | | |||||
* | | Remove oxygen text from icon | Dominik Schürmann | 2014-03-19 | 6 | -0/+0 |
|/ | |||||
* | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 3 | -0/+4 |
|\ | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 3 | -0/+4 |
| | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | ||||
* | | Merge pull request #431 from honnel/ui-modification | Dominik Schürmann | 2014-03-18 | 3 | -4/+5 |
|\| | | | | | Ui modification | ||||
| * | #429 4) | Daniel Hammann | 2014-03-17 | 3 | -4/+5 |
| | | | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server' | ||||
* | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 5 | -8/+146 |
|\ \ | | | | | | | Revamp certify dialogue | ||||
| * | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 1 | -0/+1 |
| | | | |||||
| * | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 2 | -0/+88 |
| | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled. | ||||
| * | | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 1 | -5/+34 |
| | | | |||||
| * | | certify: selectsecretkeyfragment cosmetics | Vincent Breitmoser | 2014-03-15 | 1 | -3/+12 |
| | | | |||||
| * | | certify: add certify action button to viewkeymainfragment | Vincent Breitmoser | 2014-03-15 | 1 | -0/+11 |
| |/ | |||||
* | | Merge pull request #420 from gogowitczak/master | Dominik Schürmann | 2014-03-18 | 1 | -2/+3 |
|\ \ | | | | | | | Added FAQ: specifying connection port for Keyserver. | ||||
| * | | Added FAQ: specifying connection port for Keyserver. | gogowitczak | 2014-03-14 | 1 | -2/+3 |
| |/ | |||||
* | | Lock drawer as open in tablets | uberspot | 2014-03-16 | 18 | -666/+799 |
| | | |||||
* | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 1 | -0/+1 |
|/ | |||||
* | Fix colors in item view | Dominik Schürmann | 2014-03-13 | 2 | -2/+2 |
| | |||||
* | remove unused color | Dominik Schürmann | 2014-03-13 | 1 | -1/+0 |
| | |||||
* | Improve list item view, borderless button for API < 11 | Dominik Schürmann | 2014-03-13 | 4 | -55/+78 |
| | |||||
* | Forgot faq file | Dominik Schürmann | 2014-03-13 | 1 | -0/+12 |
| | |||||
* | Add FAQ tab to help | Dominik Schürmann | 2014-03-13 | 1 | -0/+1 |
| | |||||
* | Readd create key menu items | Dominik Schürmann | 2014-03-13 | 2 | -4/+23 |
| | |||||
* | XML cleanup and bigger filename EditText | Dominik Schürmann | 2014-03-13 | 3 | -161/+173 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 7 | -16/+10 |
|\ | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | ||||
| * | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 8 | -17/+11 |
| |\ | | | | | | | Lint error fix after testing | ||||
| | * | Removing tab | Bhargav Golla | 2014-03-10 | 1 | -1/+1 |
| | | | |||||
| | * | Removing unused string | Bhargav Golla | 2014-03-10 | 1 | -1/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 33 | -278/+949 |
| | |\ | |||||
| | * | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 8 | -18/+12 |
| | | | |