summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5919 from nextcloud/add-brackets-on-concat-methodLukas Reschke2017-07-282-2/+2
|\ | | | | Add brackets around concat statements so comparing the result works a…
| * Add brackets around concat statements so comparing the result works as intendedJoas Schilling2017-07-282-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Use the existing array of OC versionsJoas Schilling2017-07-271-3/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-07-272-0/+62
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Add new bundleLukas Reschke2017-07-262-0/+51
| | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Remove unneeded stylesMorris Jobke2017-07-241-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Adjust to height=120Lukas Reschke2017-07-241-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix for mb strlenArtem Kochnev2017-07-221-1/+1
| | | Error with moving files with long names in UTF-8
* Merge pull request #5826 from nextcloud/12-backport-5821Morris Jobke2017-07-211-1/+1
|\ | | | | [stable12] Fix error message on untrusted domain error page
| * Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
| | | | | | | | | | | | Fixes #5347 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5757 from nextcloud/mount-rename-12Morris Jobke2017-07-211-8/+12
|\ \ | | | | | | [12] Fix renaming of non-renamble mounts
| * | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #5786 from nextcloud/path-repair-steps-storage-12Morris Jobke2017-07-212-5/+7
|\ \ \ | |_|/ |/| | [12] Also repair storage id's when repairing invalid entries
| * | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-192-5/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Allow to overwrite the email template againJoas Schilling2017-07-191-0/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Fix emitting of legacy hook post_unsharePauli Järvinen2017-07-191-1/+1
|/ / | | | | | | | | | | - When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error. Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
* / Fix invalid path repair step not getting all invalid entriesRobin Appelman2017-07-181-1/+1
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #5711 from nextcloud/null-user-exist-12blizzz2017-07-141-0/+3
|\ | | | | [12] null users dont exist
| * null users dont existRobin Appelman2017-07-131-0/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5710 from nextcloud/nested-permissions-mask-12Morris Jobke2017-07-131-1/+1
|\ \ | | | | | | [12] Fix scan permissions with nested permissions masks
| * | Fix scan permissions with nested permissions masksRobin Appelman2017-07-131-1/+1
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12Morris Jobke2017-07-133-3/+185
|\ \ | | | | | | [12] fix moving folders out of a cache jail
| * | chunk getting invalid paths and reuse queriesRobin Appelman2017-07-131-27/+61
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | use a generator instead of fetching all rows at onceRobin Appelman2017-07-131-2/+9
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | adjust to moved repair stepRobin Appelman2017-07-132-2/+6
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Run repair step only onceMorris Jobke2017-07-132-4/+8
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add repair step for invalid pathsRobin Appelman2017-07-132-2/+125
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | fix moving folders out of a cache jailRobin Appelman2017-07-131-1/+11
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5697 from nextcloud/stable12-4984Morris Jobke2017-07-132-5/+30
|\ \ | |/ |/| Write cert bundle to tmp file first
| * Write cert bundle to tmp file firstRoeland Jago Douma2017-07-122-5/+30
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #5687 from nextcloud/jail-propagator-12Roeland Jago Douma2017-07-122-0/+57
|\ \ | | | | | | [12] Fix propagating changes within jail wrapper
| * | Fix propagating changes within jail wrapperRobin Appelman2017-07-112-0/+57
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | verify that circles is installedMaxence Lange2017-07-111-5/+11
|/ / | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | Add a flag to allow checking if SVGs are okayJoas Schilling2017-07-071-0/+17
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5617 from ↵Morris Jobke2017-07-071-1/+12
|\ \ | | | | | | | | | | | | nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps [stable12] Don't load navigation entries of restricted apps
| * | Don't load navigation entries of restricted appsJoas Schilling2017-07-051-1/+12
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Don't log passwords on dav exceptionsJoas Schilling2017-07-051-5/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5584 from nextcloud/stable12-5429Joas Schilling2017-07-053-19/+46
|\ \ \ | | | | | | | | [stable12] Use base url for cache prefix and SCSS caching
| * | | Fix theming app to also use the prefixJulius Härtl2017-07-021-5/+10
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add tests and inject IRequestJulius Härtl2017-07-022-5/+15
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Do not open version file againJulius Härtl2017-07-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Make cache and scss caching depend on the baseUrlJulius Härtl2017-07-023-15/+27
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / / improved logging of objectore errorsRobin Appelman2017-07-041-5/+21
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5507 from derkostka/stable12Morris Jobke2017-06-232-2/+2
|\ \ | | | | | | [stable12] Use realpath to obtain the webroot
| * | [stable12] Use realpath to obtain the webrootSebastian Kostka2017-06-222-2/+2
| | | | | | | | | | | | | | | Use realpath to obtain the webroot - backport Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
* | | Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-languageblizzz2017-06-231-1/+7
|\ \ \ | | | | | | | | [stable12] Allow to force a language and set it via the ocs api
| * | | Allow to force a language and set it via the ocs apiJoas Schilling2017-06-221-1/+7
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / Create users in non default backends firstJoas Schilling2017-06-221-0/+13
|/ / | | | | | | | | | | | | | | | | Most of the time, when people have multiple backends or add a custom backend, they want to create the users there and not in the default backend. But since that is registered first, users were always created there. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Forward port of #5190 to stable12Arthur Schiwon2017-06-151-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat PHP Errors on User session regenerate Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> remove unnecessary lines… Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> change PHP errors to ErrorException in the session (PHP >=7) Otherwise it might be that authentication apps are being disabled on during operation while in fact the session handler has hiccup. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #5397 from nextcloud/stable12-5072Morris Jobke2017-06-141-1/+1
|\ \ | | | | | | [stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…