aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* comments, slight change to progress barAshley Hughes2014-03-241-6/+10
* make sure ID info is savedAshley Hughes2014-03-241-3/+10
* work on savingAshley Hughes2014-03-241-22/+23
* move stuff around, save workAshley Hughes2014-03-231-59/+61
* unused importsAshley Hughes2014-03-111-4/+0
* start modifying save codeAshley Hughes2014-03-101-8/+26
* uncomment, use Parcel. Builds, not functionalAshley Hughes2014-03-071-25/+23
* keep up with masterAshley Hughes2014-03-07168-3031/+2898
|\
| * API: get keyDominik Schürmann2014-03-072-15/+55
| * Fix API docsDominik Schürmann2014-03-071-27/+36
| * Fix API docsDominik Schürmann2014-03-071-14/+14
| * remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
| * back to Gradle 1.10, Using Gradle 1.11 requires Android Studio 0.5.0 which is...Dominik Schürmann2014-03-066-6/+6
| * Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-0628-85/+85
| |\
| | * corrected commitAnkush2014-03-0728-85/+85
| * | fix pathes in READMEDominik Schürmann2014-03-061-3/+3
| * | remove unused search definitions from manifestDominik Schürmann2014-03-061-40/+0
| * | Merge pull request #354 from uberspot/masterDominik Schürmann2014-03-0610-12/+28
| |\ \
| | * | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-0610-12/+28
| * | | sdk 17 no longer neededDominik Schürmann2014-03-061-1/+1
| |/ /
| * | Merge pull request #353 from Emantor/new_gradleDominik Schürmann2014-03-069-11/+20
| |\ \
| | * | Update READMEEmantor2014-03-061-0/+9
| | * | Update missing build.gradle filesEmantor2014-03-062-2/+2
| | * | Switch from 0.9+ to 0.9.0Emantor2014-03-061-1/+1
| | * | Add new gradle-wrapper.jarEmantor2014-03-064-4/+4
| | * | Update gradlewrapper to gradle 1.11Emantor2014-03-062-3/+3
| | * | Update to gradle 0.9+ jarEmantor2014-03-061-2/+2
| |/ /
| * | Merge pull request #350 from uberspot/masterDominik Schürmann2014-03-065-0/+1
| |\ \
| | * | add lock icon for 'Encrypt to..' multiselect optionuberspot2014-03-065-0/+1
| |/ /
| * | Merge pull request #349 from uberspot/masterDominik Schürmann2014-03-063-0/+0
| |\ \
| | * | Add search icon for other dpiuberspot2014-03-063-0/+0
| * | | 2.3.1 beta3Dominik Schürmann2014-03-061-2/+2
| * | | Fix documentation and variable naming in APIDominik Schürmann2014-03-064-58/+70
| * | | Fix verify of cleartext signatures with unknown keysDominik Schürmann2014-03-061-3/+5
| |/ /
| * | Merge pull request #342 from mb-14/searchDominik Schürmann2014-03-065-11/+93
| |\ \ | | |/ | |/|
| | * Use selectionArgs parameter to pass mCurquery.Miroojin Bakshi2014-03-062-8/+12
| | * Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-062-5/+39
| | * Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-063-5/+49
| * | Merge pull request #324 from mb-14/datefixDominik Schürmann2014-03-052-2/+25
| |\ \
| | * \ Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-0643-590/+1109
| | |\ \ | | |/ / | |/| |
| * | | 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
| * | | Merge pull request #339 from uberspot/masterDominik Schürmann2014-03-056-83/+323
| |\ \ \
| | * | | Put Preferences in subscreenuberspot2014-03-056-83/+323
| | |/ /
| * | | Merge pull request #336 from Emantor/travis_new_build_toolsDominik Schürmann2014-03-051-1/+1
| |\ \ \
| | * | | Update travis to build-tools-19.0.3Emantor2014-03-051-1/+1
| | |/ /
| * | | Merge pull request #335 from honnel/masterDominik Schürmann2014-03-0522-277/+312
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/honnel/openpgp-keychainDaniel Hammann2014-03-050-0/+0
| | |\ \ \