Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 2 | -23/+15 | |
| | ||||||
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 | |
| | ||||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 2 | -0/+296 | |
|\ | | | | | Improve file encrypt | |||||
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 1 | -0/+11 | |
| | | ||||||
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 1 | -12/+21 | |
| | | ||||||
| * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 | |
| | | ||||||
| * | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 2 | -7/+36 | |
| | | | | | | | | | | - UI fixes - refactoring | |||||
| * | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 2 | -4/+2 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml | |||||
| * | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 2 | -0/+248 | |
| | | | | | | | | | | | | | | | - Multi file - Reworked UI | |||||
* | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 2 | -4/+2 | |
|/ | ||||||
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 1 | -1/+1 | |
|\ | ||||||
| * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 | |
| | | ||||||
* | | Converted all other buttons | Daniel Albert | 2014-06-30 | 3 | -21/+12 | |
| | | ||||||
* | | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 3 | -10/+9 | |
|/ | | | | Added drawables for them | |||||
* | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -5/+3 | |
| | ||||||
* | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 2 | -0/+529 | |
| | ||||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -2/+2 | |
| | ||||||
* | wrapped-key-ring: encapsulate key flags | Vincent Breitmoser | 2014-05-22 | 2 | -18/+20 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -69/+0 | |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | Always use section style instead of custom class | Dominik Schürmann | 2014-05-06 | 1 | -69/+0 | |
| | | ||||||
* | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 2 | -31/+30 | |
|/ | ||||||
* | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 | |
| | ||||||
* | use project icons for certification status | Vincent Breitmoser | 2014-04-17 | 1 | -2/+2 | |
| | | | | Closes #573 | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 5 | -2/+5 | |
| | ||||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -14/+16 | |
| | ||||||
* | key edit: fix crash when create date was after expiry date, change from ↵ | Dominik Schürmann | 2014-04-14 | 1 | -17/+19 | |
| | | | | gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity | |||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 3 | -38/+39 | |
| | ||||||
* | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 5 | -45/+50 | |
| | ||||||
* | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 5 | -5/+5 | |
| | ||||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 9 | -0/+1601 | |