Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 and... | Daniel Hammann | 2014-03-20 | 1 | -0/+3 |
| |/ | |||||
| * | 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 |
| |\ | |||||
| | * | #429 4) | Daniel Hammann | 2014-03-17 | 2 | -3/+4 |
| * | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | 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 |
| | |/ | |||||
| * | | 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 |
| |\ | |||||
| | * | 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 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | 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 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | 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 |
| * | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Lint changes | Bhargav Golla | 2014-03-10 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | 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 bar while key creation - added plurals based on no.of keys while key... | grait | 2014-03-09 | 1 | -1/+6 |
| | * | | | 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 |
| |/ / / | |||||
| * | | | Merge pull request #316 from danielhass/import-error | Dominik Schürmann | 2014-03-08 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Added handling for other exceptions in the ImportListLoader. | Daniel Haß | 2014-03-03 | 1 | -0/+5 |
| | * | | Added FileHasNoContent string | Daniel Haß | 2014-03-03 | 1 | -0/+1 |
| * | | | move hardcode strings to strings.xml | uberspot | 2014-03-07 | 1 | -0/+3 |
| * | | | Add option for sharing encrypted file. | Miroojin Bakshi | 2014-03-07 | 1 | -0/+2 |
* | | | | keep up with master | Ashley Hughes | 2014-03-07 | 2 | -7/+13 |
|\| | | | |||||
| * | | | Merge pull request #344 from ankushb92/ankush2 | Dominik Schürmann | 2014-03-06 | 2 | -3/+3 |
| |\ \ \ | |||||
| | * | | | corrected commit | Ankush | 2014-03-07 | 2 | -3/+3 |
| * | | | | Multiselect: Create 'select all' in public and secret keylist | uberspot | 2014-03-06 | 1 | -0/+1 |
| |/ / / |