Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 1 | -14/+13 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | ||||
| * | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -14/+13 |
| | | |||||
* | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 1 | -4/+4 |
|/ | |||||
* | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 1 | -3/+3 |
| | |||||
* | Delete using Document API (unsafe) | mar-v-in | 2014-06-10 | 1 | -3/+12 |
| | |||||
* | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -19/+58 |
| | |||||
* | Modify KeychainIntentService to support I/O with URIs, allow input and ↵ | mar-v-in | 2014-06-08 | 1 | -1/+1 |
| | | | | output to/from different types (eg. encrypt file and return byte array) | ||||
* | ui: use textviews instead of bootstrap buttons in SignEncrypt | Vincent Breitmoser | 2014-05-06 | 1 | -2/+2 |
| | |||||
* | Trying a fix for #585 | Dominik Schürmann | 2014-04-19 | 1 | -1/+0 |
| | |||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 1 | -1/+1 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -5/+4 |
| | |||||
* | key edit: fix crash when create date was after expiry date, change from ↵ | Dominik Schürmann | 2014-04-14 | 1 | -1/+1 |
| | | | | gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity | ||||
* | Remove some Ids... | Dominik Schürmann | 2014-04-11 | 1 | -13/+13 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+380 |