Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 7 | -16/+10 | |
|\ | ||||||
| * | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 8 | -17/+11 | |
| |\ | ||||||
| | * | 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 | |
* | | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 13 | -133/+111 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | add contact count to My Keys header | Vincent Breitmoser | 2014-03-08 | 2 | -1/+20 | |
| * | | | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 11 | -289/+1 | |
| * | | | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 2 | -1/+35 | |
| * | | | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 2 | -2/+4 | |
| * | | | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 3 | -2/+97 | |
| * | | | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 4 | -0/+124 | |
* | | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 1 | -1/+1 | |
* | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ... | uberspot | 2014-03-11 | 3 | -3/+0 | |
* | | | | Add export... button and functionality in multi-select | uberspot | 2014-03-11 | 2 | -0/+8 | |
* | | | | Remove duplicate code from ActionBarHelper. You can now set the drawables via... | uberspot | 2014-03-11 | 3 | -92/+0 | |
| |_|/ |/| | | ||||||
* | | | more tight layout | Dominik Schürmann | 2014-03-11 | 1 | -12/+10 | |
* | | | linear layout edited to display test horizontally | Sreeram Boyapati | 2014-03-11 | 1 | -1/+4 | |
* | | | Appropriate save Icon in EditKeyActivity | uberspot | 2014-03-11 | 7 | -0/+92 | |
* | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 3 | -7/+26 | |
|\ \ \ | ||||||
| * | | | Added string reference for Issue #207 | Sreeram Boyapati | 2014-03-10 | 1 | -0/+2 | |
| * | | | Fix to passphrase dialog and Issue #207 | Sreeram Boyapati | 2014-03-10 | 2 | -7/+24 | |
* | | | | Pull from transifex | Dominik Schürmann | 2014-03-10 | 23 | -269/+828 | |
| |_|/ |/| | | ||||||
* | | | @color/white instead of hex | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 | |
* | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 11 | -16/+23 | |
* | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 11 | -23/+16 | |
|\ \ \ | ||||||
| * | | | Lint changes | Bhargav Golla | 2014-03-10 | 11 | -23/+16 | |
| |/ / | ||||||
* | | | 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 | 2 | -40/+76 | |
|/ / / | ||||||
* | | | Merge pull request #369 from hav3n/branch-fixes | Dominik Schürmann | 2014-03-09 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 1 | -2/+2 | |
* | | | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -1/+1 | |
* | | | | 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 | |
* | | | | Merge pull request #366 from uberspot/master | Dominik Schürmann | 2014-03-07 | 10 | -10/+13 | |
|\ \ \ \ | ||||||
| * | | | | move hardcode strings to strings.xml | uberspot | 2014-03-07 | 10 | -10/+13 | |
* | | | | | Move search view into onCreateView, fixes #365 | Dominik Schürmann | 2014-03-07 | 1 | -7/+0 | |
|/ / / / | ||||||
* | | | | move search view from activity to fragment by setting it as a list header, be... | Dominik Schürmann | 2014-03-07 | 2 | -8/+7 | |
* | | | | Reworking main KeyListPublicFragment to get progress indicator | Dominik Schürmann | 2014-03-07 | 1 | -54/+85 | |
| |/ / |/| | | ||||||
* | | | Add option for sharing encrypted file. | Miroojin Bakshi | 2014-03-07 | 2 | -0/+15 | |
* | | | Merge pull request #344 from ankushb92/ankush2 | Dominik Schürmann | 2014-03-06 | 14 | -20/+20 | |
|\ \ \ | ||||||
| * | | | corrected commit | Ankush | 2014-03-07 | 14 | -20/+20 | |
* | | | | Multiselect: Create 'select all' in public and secret keylist | uberspot | 2014-03-06 | 7 | -0/+9 | |
* | | | | add lock icon for 'Encrypt to..' multiselect option | uberspot | 2014-03-06 | 5 | -0/+1 | |
* | | | | Add search icon for other dpi | uberspot | 2014-03-06 | 3 | -0/+0 |