Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -12/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml | ||||
| * | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 1 | -34/+4 |
| | | |||||
| * | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 1 | -5/+11 |
| | | |||||
* | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 1 | -0/+1 |
| | | |||||
* | | beta4 | Dominik Schürmann | 2014-03-08 | 1 | -2/+2 |
| | | |||||
* | | remove unused search definitions from manifest | Dominik Schürmann | 2014-03-06 | 1 | -40/+0 |
| | | |||||
* | | 2.3.1 beta3 | Dominik Schürmann | 2014-03-06 | 1 | -2/+2 |
| | | |||||
* | | Put Preferences in subscreen | uberspot | 2014-03-05 | 1 | -1/+10 |
| | | |||||
* | | 2.3.1 beta2 | Dominik Schürmann | 2014-03-04 | 1 | -2/+2 |
| | | |||||
* | | return SIGNATURE_SUCCESS_UNCERTIFIED from service | Dominik Schürmann | 2014-03-04 | 1 | -1/+2 |
|/ | |||||
* | version code 23101 for beta testing | Dominik Schürmann | 2014-03-02 | 1 | -1/+1 |
| | |||||
* | version code 23101 for beta testing | Dominik Schürmann | 2014-03-02 | 1 | -1/+1 |
| | |||||
* | AndroidManfiest code for later... | Dominik Schürmann | 2014-02-21 | 1 | -2/+22 |
| | |||||
* | import key from email app directly | Dominik Schürmann | 2014-02-21 | 1 | -25/+37 |
| | |||||
* | rename intent helper | Dominik Schürmann | 2014-02-16 | 1 | -0/+8 |
| | |||||
* | fix some intents and demos | Dominik Schürmann | 2014-02-16 | 1 | -2/+3 |
| | |||||
* | intent demo, fix some intents | Dominik Schürmann | 2014-02-15 | 1 | -14/+28 |
| | |||||
* | conversion of other methods | Dominik Schürmann | 2014-02-14 | 1 | -13/+13 |
| | |||||
* | PendingIntent to handle user input | Dominik Schürmann | 2014-02-14 | 1 | -4/+3 |
| | |||||
* | Introducing new ParcelFileDescriptor pipes | Dominik Schürmann | 2014-02-14 | 1 | -1/+1 |
| | |||||
* | Hotfix for database upgrade, version 2.3.1 | Dominik Schürmann | 2014-02-05 | 1 | -2/+2 |
| | |||||
* | Version 2.3 | Dominik Schürmann | 2014-02-05 | 1 | -2/+2 |
| | |||||
* | temporary fix for nullpointer on orientation change in import activity | Dominik Schürmann | 2014-02-04 | 1 | -0/+1 |
| | |||||
* | Certify not sign a key, added as button, does not belong to menu | Dominik Schürmann | 2014-02-04 | 1 | -2/+2 |
| | |||||
* | expose key server API | Dominik Schürmann | 2014-02-02 | 1 | -0/+1 |
| | |||||
* | Update version code for beta | Dominik Schürmann | 2014-02-02 | 1 | -1/+1 |
| | |||||
* | Use buttons for encrypt decrypt instead of actionbar | Dominik Schürmann | 2014-02-02 | 1 | -5/+1 |
| | |||||
* | Hacks to make dialogs on Android 2.3 black on white, and not black on black | Dominik Schürmann | 2014-02-02 | 1 | -1/+1 |
| | |||||
* | Switch from ActionBarSherlock to ActionBarCompat | Dominik Schürmann | 2014-02-02 | 1 | -22/+22 |
| | |||||
* | Reworking import, testing needed... | Dominik Schürmann | 2014-02-01 | 1 | -4/+0 |
| | |||||
* | rename KeyServerUploadActivity to UploadKeyActivity | Dominik Schürmann | 2014-02-01 | 1 | -1/+1 |
| | |||||
* | Fix layout, add API notes to README, register fingerprint URIs, some ↵ | Dominik Schürmann | 2014-02-01 | 1 | -0/+14 |
| | | | | reformatting (sry) | ||||
* | New Gradle project structure | Dominik Schürmann | 2014-01-27 | 1 | -0/+408 |