| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Improve 2FA | Roeland Jago Douma | 2017-08-29 | 3 | -21/+266 |
| | | | | | | | | | * Store the auth state in the session so we don't have to query it every time. * Added some tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Merge pull request #6250 from nextcloud/twofactor/provider-custom-csp | Roeland Jago Douma | 2017-08-26 | 4 | -1/+47 |
| |\ | | | | | Allow 2FA providers to specify their custom CSP | ||||
| | * | Bump autoloader | Roeland Jago Douma | 2017-08-26 | 2 | -0/+2 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | Allow 2FA providers to specify their custom CSP | Christoph Wurst | 2017-08-26 | 2 | -1/+45 |
| |/ | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Merge pull request #6252 from nextcloud/only_show1_error | Morris Jobke | 2017-08-26 | 3 | -0/+6 |
| |\ | | | | | Don't try the actual file upload if the checks already error out | ||||
| | * | Don't try the actual file upload if the checks already error out | Roeland Jago Douma | 2017-08-26 | 3 | -0/+6 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #6157 from nextcloud/smb-2.0.2 | Morris Jobke | 2017-08-26 | 13 | -52/+265 |
| |\ \ | | | | | | | update icewind/smb to 2.0.2 | ||||
| | * | | update icewind/smb to 2.0.2 | Robin Appelman | 2017-08-16 | 13 | -52/+265 |
| | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | Merge pull request #6262 from nextcloud/navigation-entries-sort | Morris Jobke | 2017-08-26 | 2 | -6/+6 |
| |\ \ \ | |_|/ |/| | | Fix sorting of entries in Files sidebar | ||||
| | * | | Fix sorting of entries in Files sidebar | Jan-Christoph Borchardt | 2017-08-25 | 2 | -6/+6 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-26 | 6 | -4/+12 |
| | | | | |||||
| * | | | Merge pull request #6260 from nextcloud/popover-border-radius | Roeland Jago Douma | 2017-08-25 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | Add standard border-radius to datepicker | ||||
| | * | | | Add standard border-radius to datepicker | Jan-Christoph Borchardt | 2017-08-25 | 1 | -0/+2 |
| | |/ / | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #6261 from nextcloud/fix-favorites-permanent | Roeland Jago Douma | 2017-08-25 | 1 | -0/+6 |
| |\ \ \ | |/ / |/| | | Fix permanent display of favorite icon | ||||
| | * | | Fix permanent display of favorite icon | Jan-Christoph Borchardt | 2017-08-25 | 1 | -0/+6 |
| |/ / | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-25 | 60 | -108/+414 |
| | | | |||||
| * | | Merge pull request #6244 from nextcloud/redis_cluster | Morris Jobke | 2017-08-25 | 1 | -1/+2 |
| |\ \ | | | | | | | [drone] Give redis a change to fireup | ||||
| | * | | Use a new phpredis | Roeland Jago Douma | 2017-08-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | Give redis a change to fireup | Roeland Jago Douma | 2017-08-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #6249 from nextcloud/ignore-vscode | Roeland Jago Douma | 2017-08-24 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | Add Visual Studio Code to .gitignore | ||||
| | * | | | Add Visual Studio Code to .gitignore | Jakob Sack | 2017-08-24 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge pull request #6251 from nextcloud/get_right_translation | Roeland Jago Douma | 2017-08-24 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Don't fetch the translation from core but from files | ||||
| | * | | | | Don't fetch the translation from core but from files | Roeland Jago Douma | 2017-08-24 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pair | Björn Schießle | 2017-08-24 | 7 | -28/+229 |
| |\ \ \ \ | | | | | | | | | | | extend the identity proof manager to allow system wide key pairs | ||||
| | * | | | | Update autoloader | Roeland Jago Douma | 2017-08-10 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | Bump version | Roeland Jago Douma | 2017-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | add prefix to user and system keys to avoid name collisions | Bjoern Schiessle | 2017-08-10 | 4 | -8/+122 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | extend the identity proof manager to allow system wide key pairs | Bjoern Schiessle | 2017-08-10 | 3 | -23/+108 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | | Merge pull request #6241 from nextcloud/integration_ram | Morris Jobke | 2017-08-24 | 1 | -25/+25 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | [drone] Install intergration tests in RAM | ||||
| | * | | | | [drone] Install intergration tests in RAM | Roeland Jago Douma | 2017-08-24 | 1 | -25/+25 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-24 | 100 | -364/+562 |
| | | | | | | |||||
| * | | | | | Merge pull request #6239 from nextcloud/fix-uploading-message | Roeland Jago Douma | 2017-08-23 | 2 | -3/+7 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Show "Uploading..." in web UI for long uploads | ||||
| | * | | | | Replace ... with … | Morris Jobke | 2017-08-23 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | | Show "Uploading..." in web UI for long uploads | Morris Jobke | 2017-08-23 | 1 | -0/+4 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the estimated upload time is bigger than 4 hours it shows the text "Uploading..." because the time then doesn't give any good hint to the user anyways. Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failed | Roeland Jago Douma | 2017-08-23 | 3 | -3/+29 |
| |\ \ \ \ | | | | | | | | | | | Prevent SQL error message in case of error | ||||
| | * | | | | Prevent SQL error message in case of error | Lukas Reschke | 2017-08-17 | 3 | -3/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\OC\User\Database::createUser` can throw a PHP exception in case the UID is longer than permitted in the database. This is against it's PHPDocs and we should cast this to `false`, so that the regular error handling triggers in. The easiest way to reproduce is on MySQL: 1. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel 2. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel again 3. See SQL exception as error message Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | | Merge pull request #6165 from nextcloud/bump-dompurify | Morris Jobke | 2017-08-23 | 3 | -10/+12 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Bump DOMPurify | ||||
| | * | | | | Bump merged JS | Lukas Reschke | 2017-08-17 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | | Bump DOMPurify to 1.0.0 | Lukas Reschke | 2017-08-17 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | | Merge pull request #6236 from nextcloud/drone-ci-images | Morris Jobke | 2017-08-23 | 1 | -1/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix phan test | ||||
| | * | | | | | Fix phan test | Morris Jobke | 2017-08-23 | 1 | -1/+0 |
| |/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | Merge pull request #6229 from nextcloud/drone-ci-images | Morris Jobke | 2017-08-23 | 1 | -71/+76 |
| |\ \ \ \ \ | | | | | | | | | | | | | Use docker images without XDebug and with Opcache | ||||
| | * | | | | | Use docker images without XDebug and with Opcache | Morris Jobke | 2017-08-23 | 1 | -71/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | Merge pull request #6218 from nextcloud/sabre-xml-fix | Morris Jobke | 2017-08-23 | 1 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | [3rdparty] Fix sabre/xml empty prop parsing | ||||
| | * | | | | | [3rdparty] Fix sabre/xml empty prop parsing | Roeland Jago Douma | 2017-08-22 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-23 | 6 | -0/+14 |
| |/ / / / / | |||||
| * | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-22 | 94 | -346/+464 |
| | | | | | | |||||
| * | | | | | Merge pull request #6149 from nextcloud/downstream-26539 | Morris Jobke | 2017-08-21 | 147 | -244502/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Downstream 26539 & 28074 - proper handling of invalid config | ||||
| | * | | | | | Move GDrive external storage to a separate repo | Vincent Petry | 2017-08-21 | 147 | -244502/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | Merge pull request #6179 from nextcloud/no-password-reset-for-disabled-users | Morris Jobke | 2017-08-21 | 2 | -3/+41 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | No password reset for disabled users | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |