aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23388 from ↵Thomas Müller2016-03-214-33/+68
|\ | | | | | | | | owncloud/issue-22887-infinite-background-job-loop-for-old-versions Do not create a new job when federation failed to connect but use existing job
| * Do not create a new job when it failed to connect atmJoas Schilling2016-03-214-33/+68
| |
* | Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issueThomas Müller2016-03-211-1/+1
|\ \ | | | | | | Fix doc issue of cache wrapper
| * | Fix doc issue of cache wrapperJoas Schilling2016-03-211-1/+1
| | |
* | | Merge pull request #23323 from owncloud/gdrive-chunkuploadThomas Müller2016-03-211-5/+52
|\ \ \ | | | | | | | | Chunk upload for GDrive
| * | | Only use GDrive chunks when neededVincent Petry2016-03-171-29/+43
| | | |
| * | | Chunk upload for GDriveVincent Petry2016-03-161-6/+39
| | | | | | | | | | | | | | | | | | | | Instead of storing the WHOLE file in memory in a PHP variable, use the library's chunk upload support.
* | | | Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonceThomas Müller2016-03-213-45/+76
|\ \ \ \ | | | | | | | | | | Do not fire pre/post hooks twice on chunk upload
| * | | | Do not fire pre/post hooks twice on chunk uploadVincent Petry2016-03-213-45/+76
| | | | |
* | | | | Merge pull request #23083 from owncloud/generate-birthdays-on-upgradeThomas Müller2016-03-214-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Birthday events are generated on upgrade
| * | | | | Generate birthdays on upgrade from 8.2 as wellThomas Müller2016-03-101-0/+1
| | | | | |
| * | | | | Birthday events are generated on upgradeThomas Müller2016-03-103-1/+17
| | | | | |
* | | | | | Merge pull request #23351 from owncloud/streams-0.4Vincent Petry2016-03-2135-488/+784
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update icewind/streams and icewind/smb
| * | | | | update icewind/smb to 1.0.8Robin Appelman2016-03-217-25/+38
| | | | | |
| * | | | | update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_externalRobin Appelman2016-03-2132-478/+761
| | | | | |
| * | | | | update icewind/streams to 0.4.0Robin Appelman2016-03-211-0/+0
|/ / / / /
* | | | | Merge pull request #22065 from owncloud/systemtags-create-same-prefixThomas Müller2016-03-212-1/+12
|\ \ \ \ \ | | | | | | | | | | | | Allow creating tags where another one with same prefix exists
| * | | | | Allow creating tags where another one with same prefix existsVincent Petry2016-02-022-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new entry, compare the full tag name and not only the prefix.
* | | | | | Merge pull request #22789 from owncloud/dav-sharespropertyThomas Müller2016-03-2113-61/+818
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Add webdav property for share info in PROPFIND response
| * | | | | Remove duplicated copyrightRoeland Jago Douma2016-03-172-27/+0
| | | | | |
| * | | | | Add intergration testsRoeland Jago Douma2016-03-172-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intergration tests to ensure the share-types property is set correctly. * Unshared item * Shared with user * Shared with group * Shared by link * Shared with user & group & link
| * | | | | Display share status info in favorite listVincent Petry2016-03-174-15/+112
| | | | | | | | | | | | | | | | | | | | | | | | Returns the shareTypes share status info to the favorites file list.
| * | | | | Add webdav property for share info in PROPFIND responseVincent Petry2016-03-177-45/+608
| | | | | |
* | | | | | Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browserThomas Müller2016-03-215-10/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | In debugging mode we enable Sabre's browser plugin since it helps a l…
| * | | | | | Necessary code changes to make browser plugin properly workThomas Müller2016-03-172-1/+5
| | | | | | |
| * | | | | | In debugging mode we enable Sabre's browser plugin since it helps a lot when ↵Thomas Müller2016-03-173-9/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | debugging
* | | | | | Merge pull request #22792 from ↵Thomas Müller2016-03-212-49/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/no-recovery-key-if-the-master-key-is-enabled disable the recovery key if the master key is enabled
| * | | | | | disable the recovery key if the master key is enabledBjoern Schiessle2016-03-032-49/+52
| | | | | | |
* | | | | | | Merge pull request #23329 from owncloud/fix-21555Thomas Müller2016-03-212-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Avatar must be saved after login is done and external storages set up…
| * | | | | | | Avatar must be saved after login is done and external storages set up ↵Arthur Schiwon2016-03-162-1/+17
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | properly, fixes #21555
* | | | | | | Merge pull request #23349 from owncloud/hardeningsThomas Müller2016-03-212-29/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Hardenings
| * | | | | | | Remove unused codeLukas Reschke2016-03-171-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is not used anymore.
| * | | | | | | Escape App IDLukas Reschke2016-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While all callers do this as well this prevents a misuse of the API by mistake.
* | | | | | | | Merge pull request #23369 from owncloud/use-raw-pathThomas Müller2016-03-212-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use raw PATH_INFO
| * | | | | | | | Use raw PATH_INFOLukas Reschke2016-03-172-3/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PATH_INFO will be empty at this point and thus the logic in base.php did not catch this. Changing this to "getRawPathInfo" will ensure that the path info is properly read. Fixes https://github.com/owncloud/core/issues/23199
* | | | | | | | Merge pull request #23374 from owncloud/fix-htaccess-issuesThomas Müller2016-03-211-20/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Write .htaccess update only if not already written
| * | | | | | | | Write .htaccess update only if not already writtenLukas Reschke2016-03-171-20/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour. With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal. Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2114-4/+88
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2020-12/+62
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1914-4/+64
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1812-8/+56
| | | | | | |
* | | | | | | Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemoryThomas Müller2016-03-172-7/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix dropbox storage to not store the whole file in memory
| * | | | | | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-152-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the library can only store the full response in memory on download, we use an alternate client lib and set the correct headers to be able to stream the content to a temp file.
* | | | | | | | Merge pull request #23282 from owncloud/fix-caching-unavailable-ldapThomas Müller2016-03-172-3/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix writing to cache when fallback server should be used immediately
| * | | | | | | | fix writing to cache when fallback server should be used immediatelyArthur Schiwon2016-03-162-3/+89
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #23346 from owncloud/fix_23325Thomas Müller2016-03-171-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Set proper public webdav permissions when public upload disabled
| * | | | | | | | Set proper public webdav permissions when public upload disabledRoeland Jago Douma2016-03-171-0/+5
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23325 It can happen that a user shares a folder with public upload. And some time later the admin disables public upload on the server. To make sure this is handled correctly we need to check the config value and reduce the permissions. Fix is kept small to be easy backportable.
* | | | | | | | Merge pull request #23370 from owncloud/fix-username-changeThomas Müller2016-03-171-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update avatar on username change if avatar is set
| * | | | | | | | Update avatar on username change if avatar is setMorris Jobke2016-03-171-1/+4
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * fixes #20455
* | | | | | | | Merge pull request #23371 from owncloud/paurisa-Fixed_21588Thomas Müller2016-03-1723-1/+1487
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Rating icons changed to .svg
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 22:09:11 +0000