Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-07 | 46 | -68/+244 |
* | Merge pull request #4153 from nextcloud/fix-upload | Joas Schilling | 2017-04-06 | 1 | -1/+2 |
|\ | |||||
| * | Fix upload of folders in Chrome | Morris Jobke | 2017-04-06 | 1 | -1/+2 |
* | | Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint | Morris Jobke | 2017-04-05 | 4 | -17/+61 |
|\ \ | |||||
| * | | Don't list on public calendar endpoints | Lukas Reschke | 2017-04-05 | 4 | -17/+61 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-06 | 208 | -430/+678 |
* | | | Merge pull request #3526 from nextcloud/token-save-scope | Roeland Jago Douma | 2017-04-05 | 7 | -92/+276 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add integration tests for token auth | Lukas Reschke | 2017-04-05 | 2 | -36/+158 |
| * | | Save the scope of an auth token in the session | Robin Appelman | 2017-04-05 | 5 | -56/+118 |
* | | | Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages | Roeland Jago Douma | 2017-04-05 | 1 | -5/+13 |
|\ \ \ | |||||
| * | | | Also add the root of external storages to the file id list | Joas Schilling | 2017-03-30 | 1 | -5/+13 |
* | | | | Merge pull request #4215 from nextcloud/issue-template | Jos Poortvliet | 2017-04-05 | 1 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Rename config section | Joas Schilling | 2017-04-05 | 1 | -1/+2 |
* | | | | Merge pull request #4123 from nextcloud/allow-password-reset-with-email | Roeland Jago Douma | 2017-04-05 | 2 | -23/+101 |
|\ \ \ \ | |||||
| * | | | | Allow to reset the password with the email as an input | Joas Schilling | 2017-03-28 | 2 | -23/+101 |
* | | | | | Merge pull request #3741 from nextcloud/user-settings-design | Roeland Jago Douma | 2017-04-05 | 2 | -14/+29 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | proper padding for checkboxes in app-settings | Jan-Christoph Borchardt | 2017-04-04 | 1 | -1/+16 |
| * | | | | correct sorting of user management settings, wording | Jan-Christoph Borchardt | 2017-04-04 | 1 | -13/+13 |
* | | | | | [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 |