Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-05 | 40 | -82/+550 |
* | Merge pull request #4138 from nextcloud/resources_match_fullid | Morris Jobke | 2017-04-04 | 1 | -1/+7 |
|\ | |||||
| * | Match slashes in ../{id} resource routes | Roeland Jago Douma | 2017-04-04 | 1 | -1/+7 |
* | | Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-s... | Morris Jobke | 2017-04-04 | 1 | -2/+2 |
|\ \ | |||||
| * | | Redirect to 2FA selection screen | Christoph Wurst | 2017-04-03 | 1 | -2/+2 |
* | | | Merge pull request #4204 from nextcloud/append-fixes-swift | Roeland Jago Douma | 2017-04-04 | 1 | -7/+4 |
|\ \ \ | |||||
| * | | | fix fseek against string not resource by removing append support | Arthur Schiwon | 2017-04-04 | 1 | -7/+4 |
|/ / / | |||||
* | | | Merge pull request #3310 from duritong/patch-1 | Morris Jobke | 2017-04-04 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | only chmod logfile if necessary | duritong | 2017-01-29 | 1 | -1/+3 |
* | | | | Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure | Joas Schilling | 2017-04-04 | 1 | -1/+30 |
|\ \ \ \ | |||||
| * | | | | Use false because null crashes the cache | Joas Schilling | 2017-03-26 | 1 | -3/+9 |
| * | | | | Make sure blob columns are correctly converted as parameters | Joas Schilling | 2017-03-26 | 1 | -1/+24 |
* | | | | | Merge pull request #2095 from nextcloud/bruteforcesetttings | Lukas Reschke | 2017-04-04 | 6 | -4/+160 |
|\ \ \ \ \ | |||||
| * | | | | | Fix tests | Roeland Jago Douma | 2017-04-04 | 7 | -20/+0 |
| * | | | | | Move app to own repo | Roeland Jago Douma | 2017-04-02 | 13 | -876/+0 |
| * | | | | | Fixed layout of bruteforcesettings | Morris Jobke | 2017-04-02 | 5 | -9/+27 |
| * | | | | | Fix app | Roeland Jago Douma | 2017-04-02 | 1 | -1/+1 |
| * | | | | | Update App Manager test | Roeland Jago Douma | 2017-04-02 | 1 | -0/+2 |
| * | | | | | App is always enabled | Roeland Jago Douma | 2017-04-02 | 2 | -1/+4 |
| * | | | | | Respect bruteforce settings in the Throttler | Roeland Jago Douma | 2017-04-02 | 2 | -1/+154 |
| * | | | | | Adds security section to the admin page | Roeland Jago Douma | 2017-04-02 | 2 | -0/+3 |
| * | | | | | Initial commit of the bruteforcesettings app | Roeland Jago Douma | 2017-04-02 | 17 | -1/+874 |
* | | | | | | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12 | Roeland Jago Douma | 2017-04-04 | 2 | -18/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use master key for public links as well | Vincent Petry | 2017-03-24 | 2 | -23/+35 |
| * | | | | | | Add tests for null user | Vincent Petry | 2017-03-24 | 1 | -1/+5 |
| * | | | | | | Fix public link for master key | Vincent Petry | 2017-03-24 | 1 | -1/+1 |
* | | | | | | | Merge pull request #4093 from nextcloud/endorse-password-protection | Roeland Jago Douma | 2017-04-04 | 6 | -7/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix unit tests | Bjoern Schiessle | 2017-04-03 | 1 | -2/+14 |
| * | | | | | | | let the user set an empty password for share link | Timo Benk | 2017-04-03 | 1 | -3/+21 |
| * | | | | | | | endorseLinkPassword changed to enableLinkPasswordByDefault | Timo Benk | 2017-04-03 | 2 | -2/+2 |
| * | | | | | | | feature endorse password for share links | Timo Benk | 2017-04-03 | 2 | -1/+2 |
| * | | | | | | | feature endorse password for share links | Bjoern Schiessle | 2017-04-03 | 3 | -1/+8 |
* | | | | | | | | Merge pull request #4147 from nextcloud/fix_3890 | Roeland Jago Douma | 2017-04-04 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't try to parse empty body if there is no body | Roeland Jago Douma | 2017-04-04 | 2 | -1/+6 |
* | | | | | | | | | Merge pull request #3896 from nextcloud/xx621998xx-newbranch | Roeland Jago Douma | 2017-04-04 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Some more hardening | Joas Schilling | 2017-04-04 | 1 | -6/+7 |
| * | | | | | | | | file-upload.js modified : Remaining upload time corrected | SarthikaDhawan | 2017-04-04 | 1 | -1/+10 |
|/ / / / / / / / | |||||
* / / / / / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-04 | 34 | -38/+962 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_... | Morris Jobke | 2017-04-03 | 5 | -15/+207 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend | Georg Ehrke | 2017-03-27 | 3 | -4/+4 |
| * | | | | | | | allow sharees to edit certain calendar properties for themselves | Georg Ehrke | 2017-03-27 | 4 | -13/+205 |
* | | | | | | | | Merge pull request #4191 from nextcloud/bump-autosize | Roeland Jago Douma | 2017-04-03 | 6 | -533/+20 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Move to autosize.min.js | Roeland Jago Douma | 2017-04-03 | 5 | -555/+15 |
| * | | | | | | | Bump autosize.js | Roeland Jago Douma | 2017-04-03 | 2 | -35/+62 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparen... | Roeland Jago Douma | 2017-04-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make sure transparency is an integer when saving a calendar | Joas Schilling | 2017-03-30 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #4189 from nextcloud/add-issue-template-app | Jos Poortvliet | 2017-04-03 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update issue_template.md | Jos Poortvliet | 2017-04-03 | 1 | -1/+1 |
| * | | | | | | | | Add reference to issue template app | Lukas Reschke | 2017-04-02 | 1 | -3/+4 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4131 from nextcloud/fix-jscombiner | Christoph Wurst | 2017-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ |