summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Make ownCloud work again in php 7.0.6Roeland Jago Douma2016-05-011-0/+3
| | | | | | See https://bugs.php.net/bug.php?id=72117 Basically a bugfix in php caused this issue. So isset is not called more often. We have to catch this.
* Check for hash instead of file existenceLukas Reschke2016-04-271-3/+4
| | | | | | The previous logic did not necessarily trigger in every case. This logic is more error-resistant, the autoload_classmap.php file has a guaranteed different hash on 9.0.0, 9.0.1 and 9.0.2 Fixes https://github.com/owncloud/updater/issues/342
* Merge branch 'stable9' into local-invalid-9C. Montero Luque2016-04-263-1/+19
|\
| * Merge pull request #24292 from owncloud/stable9-work-around-more-updater-issuesC. Montero Luque2016-04-261-0/+1
| |\ | | | | | | [stable9] Also exclude __apps
| | * Also exclude __appsLukas Reschke2016-04-261-0/+1
| | | | | | | | | Workaround for https://github.com/owncloud/updater/issues/331 for 9.0.2
| * | Merge pull request #24261 from owncloud/scanner-propagate-9C. Montero Luque2016-04-261-0/+16
| |\ \ | | | | | | | | [9.0] triger the propagator from the command line scanner
| | * | triger the propagator from the command line scannerRobin Appelman2016-04-251-0/+16
| | | |
| * | | Merge pull request #24282 from owncloud/backport-24262-stable9C. Montero Luque2016-04-261-1/+2
| |\ \ \ | | | | | | | | | | [stable9] check whether index is set before using it
| | * | | check whether index is set before using itArthur Schiwon2016-04-261-1/+2
| | | |/ | | |/|
* | / | error out if a local storage isn't setup correctlyRobin Appelman2016-04-261-0/+3
|/ / /
* / / Don't write empty RewriteBaseLukas Reschke2016-04-261-1/+9
|/ / | | | | | | | | | | ownCloud may be configured to live at the root folder without a trailing slash being specified. In this case manually set the rewrite base to `/`
* | Merge pull request #24202 from owncloud/backport-stable9-23972Thomas Müller2016-04-255-10/+34
|\ \ | | | | | | [9.0] Call private cache methods only for `OC\Files\Cache\Cache`
| * | [9.0] Call private cache methods only for `OC\Files\Cache\Cache`Daniel Jagszent2016-04-255-10/+34
| |/
* / add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
|/
* Merge pull request #24196 from ↵Thomas Müller2016-04-221-3/+3
|\ | | | | | | | | owncloud/backport-24183-change-background-job-sort-order [9.0] Change the sort order of background jobs to be DESC instead of ASC
| * Change the sort order of background jobs to be DESC instead of ASCJoas Schilling2016-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | In theory, if your instance ever creates more jobs then your system cron can handle, the default background jobs get never executed anymore. Because everytime when the joblist returns the next job it looks for the next ID, however there is always a new next ID, so it will never wrap back to execute the low IDs. But when we change the sort order to be DESC, we make sure that these low IDs are always executed, before the system jumps back up to execute the new IDs.
* | Merge pull request #24195 from owncloud/stable9-fs-initmountpoint-nulluserThomas Müller2016-04-221-0/+3
|\ \ | | | | | | [stable9] Throw NoUserException when attempting to init mount point for null user
| * | Throw NoUserException when attempting to init mount point for null userVincent Petry2016-04-221-0/+3
| |/ | | | | | | | | | | | | In some scenarios initMountPoints is called with an empty user, and also there is no user in the session. In such cases, it is unsafe to let the code move on with an empty user.
* | Merge pull request #24158 from owncloud/encryped-size-progation-9Thomas Müller2016-04-222-1/+11
|\ \ | |/ |/| [9.0] dont do optimized size propagation for encrypted files
| * dont do optimized size propagation for encrypted filesRobin Appelman2016-04-212-1/+11
| |
* | Merge pull request #24131 from ↵Thomas Müller2016-04-222-0/+31
|\ \ | | | | | | | | | | | | owncloud/dont-transfer-files-to-not-ready-user-stable9 [9.0] Introduce isReadyForUser and verify in file transfer ownership
| * | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-202-0/+31
| | |
* | | [stable9] Ignore certificate file if it starts with file://Lukas Reschke2016-04-211-0/+7
| |/ |/|
* | Merge pull request #24129 from owncloud/stable9_24098Thomas Müller2016-04-211-0/+2
|\ \ | | | | | | [stable9] When the scanner detects a file is changed clear checksum
| * | When the scanner detects a file is changed clear checksumRoeland Jago Douma2016-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23782 and #23783 If the file scanner detects a changed file we clear the checksum while we update the cache. * Unit test added
* | | Merge pull request #24134 from owncloud/fix-problems-caused-by-updaterThomas Müller2016-04-214-0/+129
|\ \ \ | | | | | | | | [stable9] Add repair step for updater issues
| * | | Add repair step for updater issuesLukas Reschke2016-04-204-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updater as shipped with ownCloud =< 9.0.1 has several bugs leading to a not properly executed update. For example the third-party changes are not copied. This pull request: 1. Ships the third-party files changed since ownCloud 9.0.1 in the resources folder. On update the files are replaced. (https://github.com/owncloud/updater/issues/316) 2. Adds updater/* and _oc_upgrade/* as an exemption to the code integrity checker since the updater is updating in the wrong order. (https://github.com/owncloud/updater/issues/318)
* | | | Write .htaccess also from CLILukas Reschke2016-04-201-7/+15
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new updater as shipped with ownCloud 9.0.x invokes `occ` via `shell_exec`. This means that the `\OC::$CLI` code is used when updating. This removes the manual `.htaccess` modifications, effectively leading to the fact that URLs without index.php in it stop working. This also affects share URLs which could be considered a rather serious regression. - User installs 9.0.0 via web - User shares /s/1234 - User updates to 9.0.1 via ownCloud updater - Link to /s/1234 is broken, /index.php/s/1234 works
* | | Merge pull request #23576 from owncloud/background-scan-unscanned-9Thomas Müller2016-04-201-19/+31
|\ \ \ | |_|/ |/| | [9.0] handle completely unscanned storages in the background scanner
| * | handle completely unscanned storages in the background scannerRobin Appelman2016-03-241-19/+31
| | |
* | | preserve information if it is a rename operation or notBjörn Schießle2016-04-201-3/+4
| |/ |/|
* | Merge pull request #23924 from josh4trunks/stable9Thomas Müller2016-04-131-1/+1
|\ \ | | | | | | Backport #23752 to stable9
| * | Backport #23752 to stable9Joshua Ruehlig2016-04-111-1/+1
| | | | | | | | | Fixes orientation of thumbnails and gallery view of JPG's with exif rotation.
* | | Merge pull request #23930 from owncloud/stable9-backport-23901Thomas Müller2016-04-121-2/+9
|\ \ \ | | | | | | | | [stable9] Catch the AutoloadNotAllowedException also for legacy jobs
| * | | Catch the AutoloadNotAllowedException also for legacy jobsMorris Jobke2016-04-121-2/+9
| | | | | | | | | | | | | | | | | | | | * same as #18839 for legacy jobs * avoids spamming the log with useless entries
* | | | Merge pull request #23784 from owncloud/stable9-backport-23304Thomas Müller2016-04-122-2/+15
|\ \ \ \ | |/ / / |/| | | [stable9] Fix PHP memory leak in file_get_contents()
| * | | Correctly return an empty string for empty filesJoas Schilling2016-04-081-3/+9
| | | |
| * | | Fix PHP memory leak in file_get_contents()Morris Jobke2016-04-042-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ref https://bugs.php.net/bug.php?id=61961 * ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256 * code is based on the proposal of @chriseqipe * fixes #20261
* | | | Prevent null to be passed into the closure of callForAllUsersThomas Müller2016-04-072-10/+14
| | | |
* | | | Merge pull request #23572 from owncloud/stabe9-release-notesThomas Müller2016-04-062-0/+112
|\ \ \ \ | | | | | | | | | | [Stable9] release notes
| * | | | Remove duplicated messageJoas Schilling2016-04-061-16/+5
| | | | |
| * | | | Show hint in CLIVictor Dubiniuk2016-04-063-26/+19
| | | | |
| * | | | Show release notesVictor Dubiniuk2016-04-052-0/+16
| | | | |
| * | | | Show cli notice for big installationsVictor Dubiniuk2016-04-051-10/+19
| | | | |
| * | | | Add releasenotes classVictor Dubiniuk2016-04-051-0/+105
| |/ / /
* | | | Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9Thomas Müller2016-04-062-1/+12
|\ \ \ \ | | | | | | | | | | [stable9] Sabre plugin browser error page
| * | | | Add magical regex to catch browsersLukas Reschke2016-03-241-0/+8
| | | | |
| * | | | In case of exception we return an html page in case the client is a browserThomas Müller2016-03-241-1/+4
| | |_|/ | |/| |
* | | | Merge branch 'stable9' into dont-collide-with-php-internalsC. Montero Luque2016-04-061-1/+1
|\ \ \ \
| * | | | [stable9] Fix conditional check in MySQL setupDaniel Hansson2016-04-051-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Backport of #23760 Fix conditional check in MySQL setup.