aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* progress is shown when creating the default key based on number of keys crea...grait2014-03-081-1/+1
* Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
* Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0715-33/+17
|\
| * removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-0711-22/+16
| * remove unused imports and unthrown exceptionsuberspot2014-03-075-11/+1
* | Merge pull request #367 from hav3n/branch-fixesDominik Schürmann2014-03-071-0/+3
|\ \
| * | Fix for #347Nikhil Peter Raj2014-03-081-0/+3
* | | Move search view into onCreateView, fixes #365Dominik Schürmann2014-03-071-6/+91
| |/ |/|
* | move search view from activity to fragment by setting it as a list header, be...Dominik Schürmann2014-03-072-18/+19
* | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-072-24/+72
|/
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-071-0/+11
|\
| * Add option for sharing encrypted file.Miroojin Bakshi2014-03-071-0/+11
* | Cleanup code, search with preceeding %Dominik Schürmann2014-03-072-34/+14
|/
* 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