Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rewording secret_key_deletion_confirmation | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | |||||
* | Use material save icon | Dominik Schürmann | 2015-03-04 | 10 | -1/+1 |
| | |||||
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 6 | -0/+22 |
|\ | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-03-02 | 2 | -2/+3 |
| |\ | | | | | | | | | | into development | ||||
| * | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 57 | -452/+1294 |
| |\ \ | | | | | | | | | | | | | into development | ||||
| * \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 11 | -159/+229 |
| |\ \ \ | | | | | | | | | | | | | | | | into development | ||||
| * \ \ \ | merged dialog | Adithya Abraham Philip | 2015-02-26 | 614 | -1759/+5032 |
| |\ \ \ \ | |||||
| * | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 6 | -0/+15 |
| | | | | | | |||||
* | | | | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 6 | -15/+3 |
| | | | | | | |||||
* | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 21 | -40/+53 |
| | | | | | | |||||
* | | | | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 158 | -13/+13 |
| | | | | | | |||||
* | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 53 | -764/+74 |
| | | | | | | |||||
* | | | | | | Update lib list | Dominik Schürmann | 2015-03-04 | 1 | -7/+9 |
| | | | | | | |||||
* | | | | | | 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 |
| | | | | | | |||||
* | | | | | | More simplification of delete strings | 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 for certify and fingerprint activity added | ||||
| * | | | | | | Orange Toolbar Added Fixes #1088 | Ishan Khanna | 2015-03-04 | 3 | -2/+33 |
| | | | | | | | |||||
* | | | | | | | Simplify certify strings | Dominik Schürmann | 2015-03-04 | 1 | -11/+2 |
| | | | | | | | |||||
* | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 244 | -40/+40 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development | ||||
| * | | | | | | | delete holo icons | jiangkai | 2015-03-03 | 95 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | change icon name in layout files | jiangkai | 2015-03-03 | 24 | -40/+40 |
| | | | | | | | | |||||
| * | | | | | | | download new material design icons | jiangkai | 2015-03-03 | 125 | -0/+0 |
| | | | | | | | | |||||
* | | | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 2 | -19/+46 |
| | | | | | | | | |||||
* | | | | | | | | 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 | 9 | -9/+8 |
| | | | | | | | |||||
* | | | | | | | Use spinner DatePicker, not full calendar, also on Android 5 | Dominik Schürmann | 2015-03-03 | 2 | -37/+59 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-03-02 | 2 | -2/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | development | ||||
| * | | | | | Search string simplified | Dominik Schürmann | 2015-03-02 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Re-add black color | Dominik Schürmann | 2015-03-02 | 1 | -0/+2 |
| | |_|_|/ | |/| | | | |||||
* / | | | | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 2 | -7/+19 |
|/ / / / | |||||
* | | | | Strings: File size | Dominik Schürmann | 2015-02-28 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fix strings based on transifex reports | Dominik Schürmann | 2015-02-28 | 1 | -13/+13 |
| | | | | |||||
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-28 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | ||||
| * | | | | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Update from transifex | Dominik Schürmann | 2015-02-28 | 33 | -236/+1010 |
|/ / / / | |||||
* | | | | 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 | 3 | -0/+25 |
| | | | | |||||
* | | | | Keybase header text | Dominik Schürmann | 2015-02-27 | 4 | -105/+127 |
| | | | | |||||
* | | | | Better qr code resizing | Dominik Schürmann | 2015-02-27 | 5 | -4/+47 |
| |_|/ |/| | | |||||
* | | | 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 |
| | | |