summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 9.0.2 RC2v9.0.2RC2C Montero-Luque2016-05-021-2/+2
|
* Merge pull request #24343 from owncloud/stable9_24326C. Montero Luque2016-05-021-0/+3
|\ | | | | [Stable 9] Make ownCloud work again in php 7.0.6
| * 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.
* Merge pull request #24311 from owncloud/more-intelligent-update-detectionThomas Müller2016-04-281-3/+4
|\ | | | | [stable9] Check for hash instead of file existence
| * 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
* 9.0.2 RC1v9.0.2RC1C Montero-Luque2016-04-261-2/+2
|
* Merge pull request #24294 from owncloud/stable9-remove-pcntl-warningC. Montero Luque2016-04-261-4/+0
|\ | | | | Remove pcntl warning for 9.0.2
| * Merge branch 'stable9' into stable9-remove-pcntl-warningC. Montero Luque2016-04-268-2/+55
| |\
| * | Remove pcntl warning for nowVictor Dubiniuk2016-04-261-4/+0
| | |
* | | Merge pull request #24289 from owncloud/local-invalid-9C. Montero Luque2016-04-262-0/+17
|\ \ \ | |_|/ |/| | [9.0] error out if a local storage isn't setup correctly
| * | Merge branch 'stable9' into local-invalid-9C. Montero Luque2016-04-267-1/+46
| |\ \ | |/ / |/| |
* | | 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-262-0/+40
|\ \ \ | | | | | | | | [9.0] triger the propagator from the command line scanner
| * | | triger the propagator from the command line scannerRobin Appelman2016-04-252-0/+40
| | | |
* | | | 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
| | |/ / | |/| |
* | | | Merge pull request #24281 from owncloud/backport-disable-paste-zoneC. Montero Luque2016-04-263-0/+3
|\ \ \ \ | | | | | | | | | | [stable9] Disable pastezone for jquery.fileupload
| * | | | Disable pastezone for jquery.fileuploadLukas Reschke2016-04-263-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS. This implementation triggers some problems: 1. The pastezone is defined globally by default (:see_no_evil:). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads. 2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>. 3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created. Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled. Lesson learned: Third-party JS libraries can have some weird details.
| | | * add testsRobin Appelman2016-04-261-0/+14
| | | |
| | | * error out if a local storage isn't setup correctlyRobin Appelman2016-04-261-0/+3
| |_|/ |/| |
* | | Merge pull request #24278 from owncloud/stable9-more-sanityLukas Reschke2016-04-261-1/+9
|\ \ \ | |/ / |/| | [stable9] Don't write empty RewriteBase
| * | 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 #24259 from owncloud/stable9-mount-uniqueThomas Müller2016-04-262-2/+22
|\ \ | | | | | | [stable9] don't get the config for the same mount multiple times
| * | add testRobin Appelman2016-04-251-0/+11
| | |
| * | don't get the config for the same mount multiple timesRobin Appelman2016-04-251-2/+11
| |/
* | Merge pull request #24242 from owncloud/stable9-backport-24052Thomas Müller2016-04-266-48/+32
|\ \ | | | | | | [stable9] Fix LDAP race conditions
| * | Fix LDAP race conditionsMorris Jobke2016-04-256-48/+32
| | | | | | | | | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values
* | | 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
| | |/ | |/|
* | | Merge pull request #24250 from owncloud/scanner-locking-9Thomas Müller2016-04-251-0/+2
|\ \ \ | | | | | | | | [9.0] add locks in the scanner to prevent multiple scanners running on the …
| * | | add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
| |/ /
* | | Merge pull request #24236 from owncloud/backport-24214-stable9Thomas Müller2016-04-252-11/+3
|\ \ \ | |/ / |/| | [stable9] on clone Connection, do not take over the existing LDAP resource
| * | on clone Connection, do not take over the existing LDAP resourceArthur Schiwon2016-04-252-11/+3
| |/ | | | | | | | | | | | | For one, it solves potential conflicts when using the resource. For the other, one on the login check (the only place where a clone happens currently) we do not need to rebind after confirming the user's login was successful.
* | Merge pull request #24241 from owncloud/backport-24240-add-missing-use-statementThomas Müller2016-04-251-0/+1
|\ \ | |/ |/| Add missing use statement
| * Add missing use statementJoas Schilling2016-04-251-0/+1
|/
* Merge pull request #24196 from ↵Thomas Müller2016-04-222-7/+16
|\ | | | | | | | | 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-222-7/+16
| | | | | | | | | | | | | | | | | | | | 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-222-0/+25
|\ \ | | | | | | [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-222-0/+25
| |/ | | | | | | | | | | | | 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 #24180 from ↵Thomas Müller2016-04-221-0/+8
|\ \ | | | | | | | | | | | | owncloud/backport-24145-limit-background-job-runtime-9.0 [9.0] Make sure that CLI cron doesn't run for ever, but makes use of the ne…
| * | Make sure that CLI cron doesn't run for ever, but makes use of the next spawnJoas Schilling2016-04-221-0/+8
| | |
* | | Merge pull request #24158 from owncloud/encryped-size-progation-9Thomas Müller2016-04-224-15/+79
|\ \ \ | | | | | | | | [9.0] dont do optimized size propagation for encrypted files
| * | | dont do optimized size propagation for encrypted filesRobin Appelman2016-04-212-1/+11
| | | |
| * | | Add unit tests for shared size propagation with encryptionRobin Appelman2016-04-212-14/+68
| | | |
* | | | Merge pull request #24192 from owncloud/create-personal-calendar-stable9Thomas Müller2016-04-222-16/+169
|\ \ \ \ | |_|_|/ |/| | | Personal calendar should be generated even if the birthday calendar a…
| * | | Personal calendar should be generated even if the birthday calendar already ↵Thomas Müller2016-04-222-16/+169
|/ / / | | | | | | | | | exists - fixes #24082
* | | Merge pull request #24131 from ↵Thomas Müller2016-04-227-5/+57
|\ \ \ | |_|/ |/| | | | | | | | 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-207-5/+57
| | |
* | | Merge pull request #24172 from owncloud/stable9-certificateThomas Müller2016-04-222-0/+15
|\ \ \ | | | | | | | | [stable9] Ignore certificate file if it starts with file://
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-13 08:03:46 +0000