Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master | Ashley Hughes | 2014-03-29 | 8 | -102/+344 |
|\ | |||||
| * | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 1 | -2/+2 |
| | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs | ||||
| * | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 1 | -0/+203 |
| | | |||||
| * | Make email address less restrictive and add icon to show when it's correct | uberspot | 2014-03-14 | 1 | -9/+28 |
| | | |||||
| * | more UI code style fixes | uberspot | 2014-03-13 | 4 | -31/+31 |
| | | |||||
| * | First code style changes in ui | uberspot | 2014-03-13 | 7 | -40/+25 |
| | | |||||
| * | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 1 | -0/+2 |
| |\ | | | | | | | Lint error fix after testing | ||||
| | * | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 1 | -46/+55 |
| | |\ | |||||
| | * | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 1 | -0/+2 |
| | | | | |||||
| * | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 1 | -5/+12 |
| | |/ | |/| | |||||
| * | | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 1 | -46/+55 |
| |/ | |||||
| * | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 1 | -2/+0 |
| | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee. | ||||
| * | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 1 | -0/+2 |
| |\ | | | | | | | Lint changes #223 | ||||
| | * | Lint changes | Bhargav Golla | 2014-03-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore | ||||
| * | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -3/+2 |
| |/ | |||||
| * | removed useless semicolons, fixed some parameters in documenation, ↵ | uberspot | 2014-03-07 | 1 | -1/+1 |
| | | | | | | | | simplified some conditionals | ||||
* | | pass through original primary ID | Ashley Hughes | 2014-03-27 | 2 | -0/+20 |
| | | |||||
* | | keep up with master | Ashley Hughes | 2014-03-07 | 2 | -88/+78 |
|\| | |||||
| * | corrected commit | Ankush | 2014-03-07 | 1 | -4/+4 |
| | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338 | ||||
| * | Merge branch 'master' of ↵ | Miroojin Bakshi | 2014-03-06 | 1 | -2/+24 |
| |\ | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain into datefix | ||||
| | * | Removed log statements as per Dominik's suggestions | Bhargav Golla | 2014-03-05 | 1 | -4/+0 |
| | | | |||||
| | * | Set min date to one day after Created Date. Works on Honeycomb and above | Bhargav Golla | 2014-03-05 | 1 | -4/+25 |
| | | | |||||
| | * | Adding a min date not to go below creation date | Bhargav Golla | 2014-03-04 | 1 | -1/+3 |
| | | | |||||
| * | | Use string from strings.xml | Miroojin Bakshi | 2014-03-06 | 1 | -1/+1 |
| | | | |||||
| * | | Add documentation | Miroojin Bakshi | 2014-03-06 | 1 | -3/+8 |
| | | | |||||
| * | | Hide CalendarView in tablets | Miroojin Bakshi | 2014-03-04 | 1 | -0/+3 |
| | | | |||||
| * | | Extend DatePickerDialog and override setTitle() method. | Miroojin Bakshi | 2014-03-04 | 1 | -1/+12 |
| |/ | |||||
| * | #226: Async key gen task is stopped if progress is canceled | Jessica Yuen | 2014-03-02 | 1 | -2/+8 |
| | | |||||
| * | #226: Activity no longer closes if progress is canceled for key creation in ↵ | Jessica Yuen | 2014-03-02 | 1 | -1/+1 |
| | | | | | | | | EditKeyActivity | ||||
| * | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵ | Jessica Yuen | 2014-03-02 | 1 | -1/+1 |
| | | | | | | | | cancelable. | ||||
| * | Complete fix for #304 | Nikhil Peter Raj | 2014-02-27 | 1 | -94/+23 |
| | | |||||
* | | pass through which keys are new | Ashley Hughes | 2014-02-22 | 2 | -0/+17 |
| | | |||||
* | | change how primary id changing is passed through | Ashley Hughes | 2014-02-22 | 2 | -1/+19 |
| | | |||||
* | | put main original id at the top | Ashley Hughes | 2014-02-21 | 1 | -1/+4 |
| | | |||||
* | | pass through deleted keys | Ashley Hughes | 2014-02-15 | 1 | -2/+13 |
| | | |||||
* | | propgate through | Ashley Hughes | 2014-02-14 | 2 | -7/+29 |
| | | |||||
* | | save work, this code doesn't work... | Ashley Hughes | 2014-02-13 | 1 | -0/+19 |
| | | |||||
* | | saving fixes | Ashley Hughes | 2014-02-08 | 2 | -10/+20 |
| | | |||||
* | | fix a crash | Ashley Hughes | 2014-02-06 | 1 | -4/+8 |
| | | |||||
* | | action bar and a small fix | Ashley Hughes | 2014-02-06 | 2 | -4/+7 |
| | | |||||
* | | select old date doesn't need save | Ashley Hughes | 2014-02-06 | 1 | -2/+6 |
| | | |||||
* | | pass message when key added | Ashley Hughes | 2014-02-06 | 1 | -0/+6 |
| | | |||||
* | | some fixes | Ashley Hughes | 2014-02-06 | 1 | -20/+27 |
| | | |||||
* | | final link in chain, fix compile | Ashley Hughes | 2014-02-06 | 2 | -2/+6 |
| | | |||||
* | | allow blank names and emails | Ashley Hughes | 2014-02-06 | 1 | -50/+17 |
| | | |||||
* | | new Ids need to be saved | Ashley Hughes | 2014-02-06 | 2 | -5/+6 |
| | | |||||
* | | notify of changes | Ashley Hughes | 2014-02-05 | 2 | -1/+47 |
| | | |||||
* | | edit ui knows it it has been changed | Ashley Hughes | 2014-02-05 | 2 | -6/+21 |
| | | |||||
* | | save | Ashley Hughes | 2014-02-05 | 5 | -10/+69 |
| | | |||||
* | | use usage argument if needed | Ashley Hughes | 2014-02-04 | 2 | -5/+7 |
| | |