Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-22 | 5 | -8/+326 |
|\ | |||||
| * | Start new designed activity | Dominik Schürmann | 2014-06-21 | 5 | -8/+326 |
| | | |||||
* | | use hashcode instead of keyid in import list (keyids may not be unique!) | Vincent Breitmoser | 2014-06-22 | 2 | -2/+2 |
|/ | |||||
* | Fix qr code finally | Dominik Schürmann | 2014-06-20 | 4 | -19/+31 |
| | |||||
* | import: forward motion events to activity regardless | Vincent Breitmoser | 2014-06-20 | 1 | -0/+12 |
| | |||||
* | Work on Qr code import | Dominik Schürmann | 2014-06-20 | 5 | -43/+70 |
| | |||||
* | Use actionbar button for log activity | Dominik Schürmann | 2014-06-20 | 2 | -4/+48 |
| | |||||
* | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -6/+7 |
| | |||||
* | Fix update from keyserver flow | Dominik Schürmann | 2014-06-20 | 2 | -5/+7 |
| | |||||
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵ | mar-v-in | 2014-06-19 | 6 | -243/+174 |
|\ | | | | | | | improve-file | ||||
| * | Fixing fingerprint search, part 1 | Dominik Schürmann | 2014-06-19 | 1 | -80/+88 |
| | | |||||
| * | Remove unused code to import splitted qr codes | Dominik Schürmann | 2014-06-19 | 1 | -77/+1 |
| | | |||||
| * | New callback model for ImportKeysActivity | Dominik Schürmann | 2014-06-19 | 6 | -99/+85 |
| | | |||||
| * | forward touch events to pager in import activity | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 15 | -350/+528 |
|\| | |||||
| * | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 2 | -10/+7 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 2 | -10/+7 |
| | | | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -0/+13 |
| |\| | |||||
| | * | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -0/+13 |
| | | | |||||
| * | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 10 | -322/+227 |
| |/ | |||||
| * | Moved Notify class to utils | Daniel Haß | 2014-06-16 | 2 | -71/+1 |
| | | |||||
| * | Removed unused import | Daniel Haß | 2014-06-16 | 1 | -1/+0 |
| | | |||||
| * | Replaced AppMsg with notify wrapper call | Daniel Haß | 2014-06-16 | 1 | -1/+4 |
| | | |||||
| * | Added notification wrapper for toast like notifys | Daniel Haß | 2014-06-16 | 1 | -0/+70 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 7 | -31/+643 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | ||||
| * | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -0/+2 |
| | | | |||||
| * | | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 1 | -3/+3 |
| | | | |||||
| * | | import-log: use holder pattern in log fragment | Vincent Breitmoser | 2014-06-11 | 1 | -16/+24 |
| | | | |||||
| * | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 2 | -14/+98 |
| | | | |||||
| * | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -46/+45 |
| | | | |||||
| * | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 2 | -17/+20 |
| | | | |||||
| * | | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 2 | -2/+3 |
| | | | |||||
| * | | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 3 | -4/+107 |
| | | | |||||
| * | | import-log: use supertoast in ImportKeyActivity | Vincent Breitmoser | 2014-06-10 | 1 | -26/+87 |
| | | | |||||
* | | | Delete using Document API (unsafe) | mar-v-in | 2014-06-10 | 3 | -5/+43 |
| | | | |||||
* | | | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 3 | -53/+161 |
| | | | |||||
* | | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵ | mar-v-in | 2014-06-08 | 4 | -4/+4 |
| |/ |/| | | | | | output to/from different types (eg. encrypt file and return byte array) | ||||
* | | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 2 | -4/+15 |
|\ \ | | | | | | | Automatic contact discovery and more | ||||
| * \ | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 22 | -72/+44 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
| * | | | Make keylist case insensitive | mar-v-in | 2014-06-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | You want "michael" to be next to "Michael", don't you? | ||||
* | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 4 | -2/+531 |
| | | | | |||||
* | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 2 | -10/+87 |
| |/ / |/| | | |||||
* | | | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 1 | -9/+8 |
| | | | |||||
* | | | Merge pull request #645 from timbray/master | Dominik Schürmann | 2014-06-05 | 1 | -6/+2 |
|\ \ \ | |_|/ |/| | | Don't show full fingerprint in key search result lists | ||||
| * | | Don't show full fingerprint in key search results | Tim Bray | 2014-06-05 | 1 | -6/+2 |
| | | | |||||
| * | | fixed error message | Tim Bray | 2014-06-04 | 1 | -3/+1 |
| |/ | |||||
* | | ui: do show Certify identities button even for secret keys | Vincent Breitmoser | 2014-06-04 | 1 | -8/+0 |
| | | | | | | | | Closes #636 | ||||
* | | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 21 | -49/+34 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 3 | -29/+15 |
|\ |