summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-152-16/+58
|
* Fix webroot throwJohn Molakvoæ (skjnldsv)2017-09-141-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-09-144-2/+460
|
* Merge pull request #6458 from nextcloud/rethrow-correct-exceptionMorris Jobke2017-09-141-3/+10
|\ | | | | Rethrow the correct exception when there was an error in an app conta…
| * Rethrow the correct exception when there was an error in an app containerJoas Schilling2017-09-121-3/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6452 from ↵Lukas Reschke2017-09-131-5/+5
|\ \ | | | | | | | | | | | | lukanetconsult/hotfix/issue-6415-undefined-variable Fix undefined variable $tmpRoot
| * | Fix undefined variable $tmpRootAxel Helmert2017-09-121-5/+5
| | | | | | | | | | | | | | | | | | Refactoring of webroot detection left an unused variable. Fixes: #6415 Signed-off-by: Axel Helmert <info@luka.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-09-132-0/+400
| | |
* | | Fix AppPassword 2FA authRoeland Jago Douma2017-09-121-1/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Use IAppManager instead of private APIJulius Härtl2017-09-121-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Move theming related imagePath logic to ThemingDefaultsJulius Härtl2017-09-121-8/+7
|/ / | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | Merge pull request #6435 from nextcloud/add-exception-to-phpdocLukas Reschke2017-09-111-0/+3
|\ \ | | | | | | Add exceptions to PHPDoc of interface
| * | Add exceptions to PHPDoc of interfaceLukas Reschke2017-09-101-0/+3
| |/ | | | | | | | | | | Improves static code analysis here and also keeps expectations proper. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / Fix uninitialized variable $this->paramsWilliam Pain2017-09-111-2/+2
|/ | | | Signed-off-by: William Pain <pain.william@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-09-102-0/+2
|
* Merge pull request #6414 from nextcloud/share-notification-wrong-languageMorris Jobke2017-09-082-12/+20
|\ | | | | Use the language of the recipient for the share notification
| * Use the language of the recipient for the share notificationJoas Schilling2017-09-082-12/+20
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6416 from nextcloud/make-sure-sqlite-works-without-contentMorris Jobke2017-09-081-13/+6
|\ \ | | | | | | Ask the schema whether the table and column exist
| * | Ask the schema whether the table and column existJoas Schilling2017-09-081-13/+6
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6417 from nextcloud/proper-english-nowhaveMorris Jobke2017-09-081-1/+1
|\ \ | |/ |/| Improve text: 'you have now' -> 'you now have'
| * Improve text: 'you have now' -> 'you now have'Leon Klingele2017-09-081-1/+1
| | | | | | | | Signed-off-by: Leon Klingele <leon@struktur.de>
* | [tx-robot] updated from transifexNextcloud bot2017-09-0856-216/+216
| |
* | Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-tokenLukas Reschke2017-09-071-5/+8
|\ \ | | | | | | Fix failing csp/nonce check due to timed out session
| * | Fix failing csp/nonce check due to timed out sessionChristoph Wurst2017-09-041-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSP nonce is based on the CSRF token. This token does not change, unless you log in (or out). In case of the session data being lost, e.g. because php gets rid of old sessions, a new CSRF token is gen- erated. While this is fine in theory, it actually caused some annoying problems where the browser restored a tab and Nextcloud js was blocked due to an outdated nonce. The main problem here is that, while processing the request, we write out security headers relatively early. At that point the CSRF token is known/generated and transformed into a CSP nonce. During this request, however, we also log the user in because the session information was lost. At that point we also refresh the CSRF token, which eventually causes the browser to block any scripts as the nonce in the header does not match the one which is used to include scripts. This patch adds a flag to indicate whether the CSRF token should be refreshed or not. It is assumed that refreshing is only necessary if we want to re-generate the session id too. To my knowledge, this case only happens on fresh logins, not when we recover from a deleted session file. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #6380 from nextcloud/cleanup-oci-setupLukas Reschke2017-09-071-173/+22
|\ \ \ | |_|/ |/| | cleanup oci setup code
| * | cleanup oci setup codeRobin Appelman2017-09-061-173/+22
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #6329 from nextcloud/ldap-passwordMorris Jobke2017-09-071-3/+9
|\ \ \ | | | | | | | | Don't log LDAP password when server is not available
| * | | Don't log LDAP password when server is not availableJoas Schilling2017-09-061-3/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Refactor webroot detection in resource locatortux-rampage2017-09-062-64/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation breaks installations with symlinks to directories inside the webroot (i.E. apps). With this change both variants, directory and symlinks, will be detected correctly. Fixes: #6028 Signed-off-by: Axel Helmert <axel.helmert@luka.de>
* | | | Merge pull request #5571 from Luzifer/5570_backend_adminMorris Jobke2017-09-063-0/+10
|\ \ \ \ | | | | | | | | | | Allow group backend to declare users as admins
| * | | | Add @since tag to constantKnut Ahlers2017-09-051-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Knut Ahlers <knut@ahlers.me>
| * | | | Allow group backend to declare users as adminsKnut Ahlers2017-06-303-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Knut Ahlers <knut@ahlers.me>
* | | | | Merge pull request #6364 from nextcloud/fix_login_loopMorris Jobke2017-09-061-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Fix login with basic auth
| * | | | Fix login with basic authRoeland Jago Douma2017-09-051-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-09-062-0/+2
| | | | |
* | | | | Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-055-24/+26
|\ \ \ \ \ | |/ / / / |/| | | | Set the meta data before everything
| * | | | Merge setMetaData into constructorJoas Schilling2017-09-045-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the meta data is set in the beginning Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Update autoloaderMorris Jobke2017-09-042-0/+2
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6254 from nextcloud/async-bus-splitMorris Jobke2017-09-043-77/+126
|\ \ \ \ | |_|_|/ |/| | | Allow configuring different command bus backends
| * | | Add proper EOLMorris Jobke2017-09-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | allow configuring the command busRobin Appelman2017-08-241-30/+41
| | | |
| * | | split async test bus for easier subclassingRobin Appelman2017-08-243-48/+86
| | | |
* | | | Merge pull request #6064 from ↵Morris Jobke2017-09-041-6/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-5219-absolute-path-must-be-relative-to-files-on-theming-update Still throw a locked exception when the path is not relative to $user/files/
| * | | | Don't lock in the appdata_ directoryJoas Schilling2017-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Still throw a locked exception when the path is not relative to $user/files/Joas Schilling2017-08-101-5/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6326 from nextcloud/fix_4654_3375Roeland Jago Douma2017-09-041-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Pass new value to triggerChange
| * | | | | Pass new value to triggerChangeRoeland Jago Douma2017-08-311-3/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | it is not used. but pass in the empty string (on delete) and the new file (on create) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #6331 from nextcloud/update-repair-stepMorris Jobke2017-09-044-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Generate system wide key pair (update repair step after backport)
| * | | | | update autoloaderBjoern Schiessle2017-09-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | move repair step to stable12Bjoern Schiessle2017-09-012-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because we decided to backport it the repair step needs to be executed already on stable12 Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 21:11:05 +0000