summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [stable9] Ignore certificate file if it starts with file://Lukas Reschke2016-04-212-0/+15
| | | |
* | | | Merge pull request #24153 from ↵Thomas Müller2016-04-211-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/stable9-remember-email-when-setting-expiration [stable9] remember email when setting expiration date
| * | | | remember email when setting expiration dateChristoph Wurst2016-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | fixes #22947
* | | | | Merge pull request #24163 from owncloud/fix-birthday_calendar-acl-stable9Thomas Müller2016-04-213-15/+19
|\ \ \ \ \ | |_|/ / / |/| | | | [stable9] Birthday calendar should never have write acl
| * | | | Birthday calendar should never have write acl - fixes #24154Thomas Müller2016-04-213-15/+19
| | | | |
* | | | | Merge pull request #24112 from ↵Thomas Müller2016-04-213-56/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | owncloud/backport-24111-chunking-users-in-background-jobs [9.0] Chunk the users correctly in the trashbin and versions background job
| * | | | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
| | | | |
* | | | | Merge pull request #24129 from owncloud/stable9_24098Thomas Müller2016-04-212-0/+22
|\ \ \ \ \ | | | | | | | | | | | | [stable9] When the scanner detects a file is changed clear checksum
| * | | | | When the scanner detects a file is changed clear checksumRoeland Jago Douma2016-04-202-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2119-0/+13233
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable9] Add repair step for updater issues
| * | | | | | Add repair step for updater issuesLukas Reschke2016-04-2019-0/+13233
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | Merge pull request #24136 from owncloud/backport-24135Thomas Müller2016-04-211-7/+15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [stable9] Write .htaccess also from CLI
| * | | | | 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 #24108 from owncloud/fix_24032Thomas Müller2016-04-201-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Allow setting can edit permissions on federated shares in webUI
| * | | | | Allow setting can edit permissions on federated shares in webUIRoeland Jago Douma2016-04-201-0/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24032 Since we have a slightly different UI for the federated shares our normal logic fails us. This makes sure to add the correct permissions when it is a federated share.
* | | | | Merge pull request #24099 from owncloud/fix_23632_9.0Thomas Müller2016-04-202-10/+48
|\ \ \ \ \ | | | | | | | | | | | | [stable9] init users mount point before recovery
| * | | | | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
| |/ / / / | | | | | | | | | | | | | | | access to his files
* | | | | Merge pull request #23831 from owncloud/backport-23511Thomas Müller2016-04-202-4/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | | [9.0] sidebar click modification
| * | | | sidebar click modificationErik Pellikka2016-04-072-4/+19
| | | | |
* | | | | 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
| | | | |
* | | | | Merge pull request #24119 from owncloud/fix_24095_9.0Thomas Müller2016-04-201-3/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | [stable9] preserve information if it is a rename operation or not
| * | | | 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 #23941 from owncloud/stable9-exclude-autoload-staticThomas Müller2016-04-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Exclude autoload_static.php (#23935)
| * | | | Fix the exclude pathThomas Müller2016-04-121-1/+1
| | | | |
| * | | | Exclude autoload_static.php (#23935)Lukas Reschke2016-04-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Composer 1.1 has since yesterday a new performance improvement that will be automatically used for PHP >= 5.6, however this file is incompatible with older PHP versions and thus we need to exclude it from the checks. Note that this performance improvement is only used on >= 5.6 so ownCloud will still run fine on older PHP versions as well.
* | | | 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
* | | | | Merge pull request #23840 from owncloud/backport-23839-sabre-dav-3.0.9Thomas Müller2016-04-111-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Update sabre/dav to 3.0.9 on stable9
| * | | | | Update sabre/dav to 3.0.9 onb stable9Joas Schilling2016-04-111-0/+0
| | | | | |
* | | | | | Merge pull request #23897 from owncloud/add-VCFExportPlugin-stable9Thomas Müller2016-04-111-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Adding VCFExportPlugin
| * | | | | Adding VCFExportPluginThomas Müller2016-04-101-0/+2
|/ / / / /
* | | | | Merge pull request #23801 from owncloud/fix-23496-master-stable9Thomas Müller2016-04-081-2/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable9] Avoid fatal php error dring cron execution
| * | | | | fixes #23496Thomas Müller2016-04-051-2/+4
| |/ / / /
* | | | | Merge pull request #23837 from owncloud/stable9-handle-null-in-usermanagerThomas Müller2016-04-082-10/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | [stable9] Prevent null to be passed into the closure of callForAllUsers
| * | | | Prevent null to be passed into the closure of callForAllUsersThomas Müller2016-04-072-10/+14
|/ / / /
* | | | 9.0.1v9.0.1C Montero-Luque2016-04-061-2/+2
| | | |
* | | | Merge pull request #23572 from owncloud/stabe9-release-notesThomas Müller2016-04-066-3/+261
|\ \ \ \ | | | | | | | | | | [Stable9] release notes
| * | | | Remove duplicated messageJoas Schilling2016-04-062-46/+19
| | | | |
| * | | | Make the version a stringJoas Schilling2016-04-061-1/+1
| | | | |
| * | | | Show hint in CLIVictor Dubiniuk2016-04-067-158/+179
| | | | |
| * | | | Show release notesVictor Dubiniuk2016-04-053-0/+21
| | | | |
| * | | | Show cli notice for big installationsVictor Dubiniuk2016-04-052-29/+53
| | | | |
| * | | | Add releasenotes classVictor Dubiniuk2016-04-052-0/+219
| |/ / /
* | | | Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9Thomas Müller2016-04-068-3/+229
|\ \ \ \ | | | | | | | | | | [stable9] Sabre plugin browser error page