| Commit message (Expand) | Author | Age | Files | Lines |
* | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 2 | -6/+6 |
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 53 | -178/+276 |
|\ |
|
| * | Remove help button for now | Dominik Schürmann | 2015-03-04 | 1 | -15/+3 |
| * | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 7 | -36/+49 |
| * | Partially fix file names | Dominik Schürmann | 2015-03-04 | 12 | -13/+13 |
| * | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -17/+20 |
| * | Crop image view to center | Dominik Schürmann | 2015-03-04 | 1 | -4/+4 |
| * | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 1 | -1/+7 |
| * | Fix status bar orange | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| * | Merge pull request #1097 from ishan1604/orange-toolbar | Dominik Schürmann | 2015-03-04 | 3 | -2/+33 |
| |\ |
|
| | * | Orange Toolbar Added Fixes #1088 | Ishan Khanna | 2015-03-04 | 3 | -2/+33 |
| * | | Merge branch 'development' of https://github.com/vectorijk/open-keychain into... | Dominik Schürmann | 2015-03-03 | 23 | -39/+39 |
| |\ \ |
|
| | * | | change icon name in layout files | jiangkai | 2015-03-03 | 23 | -39/+39 |
| * | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 1 | -17/+43 |
| * | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -9/+18 |
| | |/
| |/| |
|
| * | | Fix toolbar margins on Android lower 5 | Dominik Schürmann | 2015-03-03 | 6 | -6/+6 |
| * | | Use spinner DatePicker, not full calendar, also on Android 5 | Dominik Schürmann | 2015-03-03 | 2 | -37/+59 |
| |/ |
|
* | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 4 | -0/+212 |
* | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -1/+29 |
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 2 | -7/+19 |
|\| |
|
| * | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 2 | -7/+19 |
* | | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 3 | -3/+3 |
* | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 87 | -1517/+2232 |
|\| |
|
| * | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 1 | -2/+4 |
| * | Upload new keys to keyserver by default | Dominik Schürmann | 2015-02-28 | 1 | -0/+1 |
| * | padding fixes for key list | Dominik Schürmann | 2015-02-28 | 1 | -2/+1 |
| * | Reorder advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -52/+0 |
| * | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 1 | -41/+27 |
| * | Fix keyboard overlay bug on top of edittexts | Dominik Schürmann | 2015-02-27 | 9 | -4/+46 |
| * | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 1 | -0/+9 |
| * | Keybase header text | Dominik Schürmann | 2015-02-27 | 3 | -105/+126 |
| * | Better qr code resizing | Dominik Schürmann | 2015-02-27 | 4 | -4/+8 |
| * | Prettify qr code cleanup | Dominik Schürmann | 2015-02-27 | 1 | -10/+0 |
| * | Prettify qr code in advanced key view | Dominik Schürmann | 2015-02-27 | 1 | -5/+27 |
| * | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -133/+0 |
| * | Fix margins of dialog views | Dominik Schürmann | 2015-02-27 | 6 | -21/+30 |
| * | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 2 | -0/+124 |
| |\ |
|
| | * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 2 | -2/+0 |
| | |\ |
|
| | * \ | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -15/+9 |
| | |\ \ |
|
| | * | | | XML fragment for proof listing | Tim Bray | 2014-11-07 | 1 | -0/+19 |
| | * | | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -0/+105 |
| * | | | | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 7 | -28/+203 |
| * | | | | Dont show verification icons in my key view, hide edit button for non-secret ... | Dominik Schürmann | 2015-02-25 | 1 | -8/+0 |
| * | | | | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 2 | -2/+10 |
| * | | | | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 3 | -3/+3 |
| * | | | | Design fixes for header, QR Code shared element transitions | Dominik Schürmann | 2015-02-25 | 2 | -13/+23 |
| * | | | | CardView and more header design | Dominik Schürmann | 2015-02-25 | 2 | -21/+31 |
| * | | | | Use material icon for safeslinger | Dominik Schürmann | 2015-02-25 | 3 | -3/+3 |
| * | | | | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 2 | -375/+75 |
| * | | | | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 10 | -26/+34 |