Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rework menu items | Dominik Schürmann | 2014-04-05 | 1 | -3/+1 |
| | |||||
* | Change headers in encrypt activity to be more descriptive | Dominik Schürmann | 2014-04-04 | 1 | -2/+2 |
| | |||||
* | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
| | |||||
* | confirm that empty IDs are really wanted | Ashley Hughes | 2014-04-02 | 1 | -0/+1 |
| | |||||
* | Menu cleanup | Dominik Schürmann | 2014-04-01 | 1 | -2/+4 |
| | |||||
* | language | Dominik Schürmann | 2014-04-01 | 1 | -2/+2 |
| | |||||
* | Language clarifications | Dominik Schürmann | 2014-04-01 | 1 | -7/+8 |
| | |||||
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 1 | -0/+1 |
|\ | |||||
| * | don't disable save button, show message if nothing needs to be done | Ashley Hughes | 2014-04-01 | 1 | -0/+1 |
| | | |||||
* | | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 1 | -2/+0 |
|/ | |||||
* | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 1 | -0/+1 |
| | |||||
* | merge master | Ashley Hughes | 2014-03-29 | 5 | -7/+72 |
|\ | |||||
| * | Text for creation of new api accounts | Dominik Schürmann | 2014-03-26 | 1 | -0/+1 |
| | | |||||
| * | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 1 | -0/+2 |
| | | |||||
| * | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 1 | -0/+4 |
| | | |||||
| * | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 1 | -0/+11 |
| | | |||||
| * | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 1 | -0/+2 |
| |\ | | | | | | | New Fix for #410 | ||||
| | * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -0/+2 |
| | | | |||||
| * | | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵ | Daniel Hammann | 2014-03-20 | 1 | -0/+3 |
| |/ | | | | | | | and clipboard button | ||||
| * | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #431 from honnel/ui-modification | Dominik Schürmann | 2014-03-18 | 2 | -3/+4 |
| |\ | | | | | | | Ui modification | ||||
| | * | #429 4) | Daniel Hammann | 2014-03-17 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | 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 | 1 | -0/+2 |
| |\ \ | | | | | | | | | 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 | 1 | -0/+1 |
| | |/ | | | | | | | | | | | | | | | | 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. | ||||
| * | | Lock drawer as open in tablets | uberspot | 2014-03-16 | 1 | -0/+5 |
| | | | |||||
| * | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 1 | -0/+1 |
| |/ | |||||
| * | 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 | 1 | -1/+2 |
| | | |||||
| * | 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 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | ||||
| | * | 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 | 1 | -0/+2 |
| | |\ | |||||
| | * | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -0/+11 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | add contact count to My Keys header | Vincent Breitmoser | 2014-03-08 | 1 | -0/+5 |
| | | | | |||||
| | * | | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 1 | -0/+4 |
| | | | | |||||
| | * | | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 1 | -0/+2 |
| |\ \ \ | | |_|/ | |/| | | Fix to passphrase dialog and Issue #207 | ||||
| | * | | Added string reference for Issue #207 | Sreeram Boyapati | 2014-03-10 | 1 | -0/+2 |
| | | | | |||||
| * | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee. | ||||
| * | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Lint changes #223 | ||||
| | * | | | Lint changes | Bhargav Golla | 2014-03-10 | 1 | -2/+2 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore | ||||
| * | | | remove double definition of progress_generating | Dominik Schürmann | 2014-03-10 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge pull request #368 from ajit766/master | Dominik Schürmann | 2014-03-09 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | | | progress is shown when creating the default key based on number of keys created till then | ||||
| | * | | | progress bar while key creation - added plurals based on no.of keys while ↵ | grait | 2014-03-09 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | key creation | ||||
| | * | | | progress bar during key creation - minor text change | grait | 2014-03-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Issue #178 - Hide advanced options in EncryptActivity | rafaelav | 2014-03-09 | 1 | -0/+2 |
| |/ / / |