summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #7688 from ↵Morris Jobke2018-01-052-12/+32
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable12-fix-scss-webroot-and-url-rewrite [Stable12] fix scss webroot and url rewrite
| * | | Revert rebaseurl function editJohn Molakvoæ (skjnldsv)2018-01-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Rollback caching fixJohn Molakvoæ (skjnldsv)2018-01-051-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixup! Proberly detect variable changesJohn Molakvoæ (skjnldsv)2018-01-041-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Proberly detect variable changesJohn Molakvoæ (skjnldsv)2018-01-041-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixed url rebase with themingJohn Molakvoæ (skjnldsv)2018-01-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixed testsJohn Molakvoæ (skjnldsv)2018-01-031-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Added tests for various installations typesJohn Molakvoæ (skjnldsv)2018-01-031-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - With root installation - Core css - App inside server root - Secondary apps directory outside server root - With an installation in a sub directory - Core css - App inside server root - Secondary apps directory outside server root Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixup! getWebdir returnJohn Molakvoæ (skjnldsv)2018-01-031-6/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Use OC_Util function for app web pathJohn Molakvoæ (skjnldsv)2018-01-031-11/+14
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | getWebDir functionJohn Molakvoæ (skjnldsv)2018-01-031-15/+19
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixed webroot for scss filesJohn Molakvoæ (skjnldsv)2018-01-032-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | Fixed tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixed scss url rewritingJohn Molakvoæ (skjnldsv)2018-01-031-6/+9
| | |/ | |/| | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-052-8/+72
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-01-0494-110/+640
|/
* Added additional methods for removal of sensitive infoJohannes Schlichenmaier2018-01-031-0/+6
| | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* Fix duplicate session token after remembered loginChristoph Wurst2017-12-191-0/+1
| | | | | | | | | On a remembered login session, we create a new session token in the database with the values of the old one. As we actually don't need the old session token anymore, we can delete it right away. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #7558 from nextcloud/12-7427Morris Jobke2017-12-183-4/+24
|\ | | | | [stable12] Fix email buttons for white theme
| * Fix email buttons for white themeMorris Jobke2017-12-183-4/+24
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12Morris Jobke2017-12-136-3/+111
|\ \ | | | | | | [12] Allow getting the filepath when getting cached mounts by fileid
| * | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-12-126-3/+111
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-121-1/+1
|/ | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Remove wrong entry in admin_settings that causes 500Morris Jobke2017-12-111-0/+5
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-12-112-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2017-12-102-0/+418
|
* Merge pull request #7409 from nextcloud/swift-retry-12Roeland Jago Douma2017-12-081-1/+2
|\ | | | | [12]add retry wrapper when reading files from swift
| * add retry wrapper when reading files from swiftRobin Appelman2017-12-061-1/+2
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7323 from nextcloud/shared-jailed-source-root-12Morris Jobke2017-12-082-9/+25
|\ \ | |/ |/| [12]Use the correct root for shared jail when the source storage is also a jail
| * delay calculating the shared cache root until it's usedRobin Appelman2017-12-041-9/+14
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Use the correct root for shared jail when the source storage is also a jailRobin Appelman2017-11-281-0/+11
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7144 from nextcloud/rename-locks-stable12Morris Jobke2017-12-041-83/+86
|\ \ | | | | | | Unlock files even if an exception occurs (stable12)
| * | Unlock files even if an exception occurskorelstar2017-11-111-83/+86
| | | | | | | | | | | | Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
* | | Allow to skip data dir permission checks by configArthur Schiwon2017-12-011-1/+4
| | | | | | | | | | | | | | | | | | | | | Enables installation on services that don't allow/support permission changes. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7328 from ↵Morris Jobke2017-11-281-1/+7
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/backport/7327/access-list-regression-for-not-current-accesss [stable12] Only in case of $currentAccess the array uses the id as index
| * | Only in case of $currentAccess the array uses the id as indexJoas Schilling2017-11-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise its a normal string[] with the user ids, in that case the array_merge did it's job just fine, apart from it not being deduplicated. The array+array is only needed when the user id is the key, so integer only user ids are kept as they are instead of being reindexed. Regression from 3820d6883dffcaa49deb1054ae0f32ab3d3e39b1 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webrootRoeland Jago Douma2017-11-272-69/+74
|\ \ \ | |/ / |/| | [stable12] CSSResourceLocator: handle SCSS in apps outside root
| * | CSSResourceLocator: handle SCSS in apps outside rootKyle Fazzari2017-11-222-69/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently static CSS files work fine in apps outside of the root. However, as soon as an app uses SCSS, Nextcloud starts being unable to find the web root. Fix this problem by backporting select snippets from master specifically targeting this issue, and add a test to ensure it doesn't regress. Fix #5289 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | | Merge pull request #7262 from ↵Morris Jobke2017-11-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/7168/files-access-list-with-integer-userid [stable12] Fix accesslist when a user has an ID only containting 0-9
| * | | Fix accesslist when a user has an ID only containting 0-9Joas Schilling2017-11-231-1/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / Allow migration from upcoming 10.0.4 ownCloud releaseJoas Schilling2017-11-221-2/+5
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #7170 from kyrofa/backport/6028/app_path_realpathRoeland Jago Douma2017-11-202-0/+12
|\ \ | | | | | | [stable12] {J,CS}SResourceLocator: account for symlinks in app path
| * | {J,CS}SResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-142-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if the app path includes a symlink, the calculated webDir will be incorrect when generating CSS and URLs will be pointing to the wrong place, breaking CSS. Use realpath when retrieving app path, and these issues go away. Fix #6028 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-202-2/+2
| | |
* | | only create the file cache entry after the empty file was created ↵Bjoern Schiessle2017-11-171-14/+13
| | | | | | | | | | | | | | | | | | successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #7186 from nextcloud/s3-download-stream-fix-12Björn Schießle2017-11-172-3/+9
|\ \ \ | | | | | | | | [12] Fix s3 download and touch
| * | | Use non empty files for object store touchRobin Appelman2017-11-151-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Fix contructing headers for s3 downloadRobin Appelman2017-11-151-1/+7
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / / [tx-robot] updated from transifexNextcloud bot2017-11-162-2/+2
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-11-122-8/+8
|/
* [tx-robot] updated from transifexNextcloud bot2017-11-1112-36/+2606
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-17 07:13:01 +0000