aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* pass through original primary IDAshley Hughes2014-03-273-0/+21
* keep up with masterAshley Hughes2014-03-0725-364/+939
|\
| * remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
| * Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-067-49/+49
| |\
| | * corrected commitAnkush2014-03-077-49/+49
| * | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-063-12/+19
| * | Merge pull request #342 from mb-14/searchDominik Schürmann2014-03-062-10/+79
| |\ \ | | |/ | |/|
| | * Use selectionArgs parameter to pass mCurquery.Miroojin Bakshi2014-03-062-8/+12
| | * Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-061-5/+31
| | * Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-061-4/+43
| * | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-063-86/+287
| |\ \
| | * \ Merge pull request #328 from bhargavgolla/patch-1Dominik Schürmann2014-03-051-1/+20
| | |\ \ | | | |/ | | |/|
| | | * Removed log statements as per Dominik's suggestionsBhargav Golla2014-03-051-4/+0
| | | * Set min date to one day after Created Date. Works on Honeycomb and aboveBhargav Golla2014-03-051-4/+25
| | | * Adding a min date not to go below creation dateBhargav Golla2014-03-041-1/+3
| | * | Put Preferences in subscreenuberspot2014-03-051-66/+226
| | |/
| | * 2.3.1 beta2Dominik Schürmann2014-03-041-1/+1
| | * Enforce private key for applications, verify signed-only texts without passph...Dominik Schürmann2014-03-041-19/+38
| * | Use string from strings.xmlMiroojin Bakshi2014-03-061-1/+1
| * | Add documentationMiroojin Bakshi2014-03-061-3/+8
| * | Hide CalendarView in tabletsMiroojin Bakshi2014-03-041-0/+3
| * | Extend DatePickerDialog and override setTitle() method.Miroojin Bakshi2014-03-041-1/+12
| |/
| * Merge pull request #322 from mj7007/smooth_activity_switchDominik Schürmann2014-03-041-8/+15
| |\
| | * Smooth Activity Switch Fixedmj70072014-03-041-8/+15
| * | Merge pull request #315 from jessicayuen/masterDominik Schürmann2014-03-044-10/+61
| |\ \
| | * | #226: Async key gen task is stopped if progress is canceledJessica Yuen2014-03-024-14/+37
| | * | #226: Activity no longer closes if progress is canceled for key creation in E...Jessica Yuen2014-03-024-7/+13
| | * | #226: Added cancel option to ProgressDialogFragments. Create Key is now cance...Jessica Yuen2014-03-024-8/+30
| * | | Fix NewApi Lint ErrorsEmantor2014-03-032-2/+7
| |/ /
| * | Merge pull request #306 from danielhass/keyserver-conerrorDominik Schürmann2014-02-284-27/+99
| |\ \
| | * | Some clean upDaniel Haß2014-02-281-4/+2
| | * | Added different notifys for different exceptionsDaniel Haß2014-02-271-6/+17
| | * | Added StackOverflow link to documentationDaniel Haß2014-02-271-0/+2
| | * | Added documentation to the AsyncTaskResultWrapperDaniel Haß2014-02-271-0/+5
| | * | Adapted the ImportKeysLoader to work with the new AsyncWrapperDaniel Haß2014-02-263-9/+13
| | * | Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is ...Daniel Haß2014-02-262-20/+34
| | * | Added the AsyncTaskResultWrapperDaniel Haß2014-02-261-0/+38
| * | | cleanupDominik Schürmann2014-02-274-40/+22
| * | | Added GPL headersNikhil Peter Raj2014-02-272-11/+31
| * | | Complete fix for #304Nikhil Peter Raj2014-02-272-94/+170
| * | | Partial fix for #304Nikhil Peter Raj2014-02-262-32/+82
| |/ /
| * | Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
| * | Fix for #266Nikhil Peter Raj2014-02-252-2/+3
| |/
| * Replaced Toast with AppMsg in DecryptActivityDaniel Haß2014-02-241-16/+17
| * remove debug stuffDaniel Haß2014-02-231-2/+1
| * Revert "Replaced Toast with AppMsg in EncryptActivity"Daniel Haß2014-02-231-13/+15
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-15/+13
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-13/+15
* | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-061-29/+17
* | fix saving new key (tmp)Ashley Hughes2014-03-061-1/+4