summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 5.0.16 RC1v5.0.16RC1Frank Karlitschek2014-04-231-2/+2
|
* Merge pull request #8298 from owncloud/backport_6290_to_stable5Thomas Müller2014-04-237-19/+100
|\ | | | | Backport #6290 to stable5
| * restore trashbin download.phpJörn Friedrich Dreyer2014-04-221-0/+46
| |
| * backport #6290 to stable5Jörn Friedrich Dreyer2014-04-227-64/+99
| |
* | Check whether the user has permissions to add personal storage backendsLukas Reschke2014-04-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quick’n dirty back port of #8182 - master has a better fix but that should be good enough… missing return - OCP\JSON::success does not terminate the PHP process - which is good ;-) Use error instead of success Revert "Use error instead of success" This reverts commit e2d5535a5aa436c3896e46f0b9e8ff1bd5640d4d. Use error instead of success
* | Merge pull request #8323 from owncloud/stable5-backport-8183-and-coLukas Reschke2014-04-236-123/+185
|\ \ | | | | | | Backport of #8183 and #8197
| * | Backport of #8197 to stable6Robin Appelman2014-04-233-99/+156
| | |
| * | Backport of #8183 to stable6Robin Appelman2014-04-233-24/+29
|/ /
* | Merge pull request #8299 from owncloud/fix_group_restore_stable5Björn Schießle2014-04-220-0/+0
|\ \ | | | | | | fix variable name
| * | fix variable nameBjoern Schiessle2014-04-221-1/+1
| | |
* | | Backport of #7682 to stable5Lukas Reschke2014-04-181-1/+2
| | |
* | | Merge pull request #8115 from owncloud/stable5-fixselectallanddownloadMorris Jobke2014-04-171-1/+2
|\ \ \ | | | | | | | | [stable5] Added missing var that messes up IE8
| * | | Added missing var that messes up IE8Vincent Petry2014-04-081-1/+2
| | | |
* | | | Verify that a file exists before we share itRobin Appelman2014-04-171-0/+11
| |_|/ |/| |
* | | Merge pull request #8234 from owncloud/backport-fileids-stable5Thomas Müller2014-04-163-0/+120
|\ \ \ | | | | | | | | backport of the FilesPlugin to stable5
| * | | adding the plugin to the server objectThomas Müller2014-04-161-0/+1
| | | |
| * | | backport of the FilesPlugin to stable5Thomas Müller2014-04-162-0/+119
|/ / /
* | | Fixed Sabre Node implementation to correctly return timestamps as intVincent Petry2014-04-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined. Backport of 4f11786 from master
* | | Merge pull request #8005 from owncloud/files-fixie8uploadVincent Petry2014-04-101-0/+1
|\ \ \ | | | | | | | | [stable5] Added requesttoken back for IE8
| * | | Added requesttoken back for IE8Vincent Petry2014-04-021-0/+1
| | |/ | |/|
* | | Merge pull request #8030 from owncloud/getpath-shared-stable5Thomas Müller2014-04-104-5/+113
|\ \ \ | |_|/ |/| | [stable5] Make getPath work for shared files
| * | Improve phpdocRobin Appelman2014-04-032-1/+10
| | |
| * | Implement getPath for shared filesRobin Appelman2014-04-032-0/+76
| | |
| * | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-04-032-5/+28
|/ /
* | Revert "remove Sabre_DAV_Browser_Plugin"Thomas Müller2014-04-011-0/+1
| | | | | | | | This reverts commit 997a9ce0b127bbfdc7ea4319cc20a276a6f542b1.
* | Merge pull request #7610 from owncloud/stable5-fix-updaterVincent Petry2014-03-281-1/+1
|\ \ | | | | | | Backport of https://github.com/owncloud/core/pull/7609
| * | Use $installedVersion instead of $currentVersionLukas Reschke2014-03-061-1/+1
| | |
* | | Merge pull request #7229 from owncloud/stable5-fix-5828-backportblizzz2014-03-281-2/+13
|\ \ \ | | | | | | | | Backport fix-5828 manually to stable5. Implements 17e45e2 on stable5
| * | | Backport fix-5828 manually to stable5. Implements 17e45e2 on stable5tomneedham2014-02-171-2/+13
| | | |
* | | | Merge pull request #7900 from owncloud/close_session_early_on_download_stable5Morris Jobke2014-03-281-0/+3
|\ \ \ \ | | | | | | | | | | Close session early on download stable5
| * | | | don't block php session while download is in progressJörn Friedrich Dreyer2014-03-261-0/+3
|/ / / /
* | | | Merge pull request #7763 from owncloud/stable5-fixrestoreallVincent Petry2014-03-191-1/+1
|\ \ \ \ | | | | | | | | | | [stable5] Fix "restore all selected files"
| * | | | Fix "restore all selected files"Vincent Petry2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that a typo sneaked in during a backport. This fixes the case when selecting files in the trashbin and clicking "Restore" on the tool bar to restore them all.
* | | | | Merge pull request #7762 from owncloud/stable5-fixtrashandversionrootsizecalcVincent Petry2014-03-172-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | [stable5] [backport] When reading the size of "files" mountpoints need to be excluded
| * | | | When reading the size of "files" mountpoints need to be excludedVincent Petry2014-03-172-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versions and trashbin app are now passing "includeMountPoints=false" to "getFileInfo()" to make sure that the calculated total size doesn't include mount points like Shared or external storage. This is because the default call (legacy) used to return the size of mount points as well. Fixes #6731
* | | | fix left-over from merge conflictBjoern Schiessle2014-03-131-4/+0
| | | |
* | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-133-4/+135
| | | |
* | | | Merge pull request #7700 from owncloud/backport-7681-stable5Thomas Müller2014-03-131-1/+0
|\ \ \ \ | | | | | | | | | | remove Sabre_DAV_Browser_Plugin
| * | | | remove Sabre_DAV_Browser_PluginThomas Müller2014-03-121-1/+0
|/ / / / | | | | | | | | | | | | | | | | Conflicts: apps/files/appinfo/remote.php
* | | | Merge pull request #7691 from owncloud/backport-7683-stable5Vincent Petry2014-03-122-3/+32
|\ \ \ \ | | | | | | | | | | Backport 7683 stable5
| * | | | fixing method namesThomas Müller2014-03-122-2/+1
| | | | |
| * | | | set content-type on ocs exceptionsThomas Müller2014-03-122-3/+33
|/ / / / | | | | | | | | | | | | | | | | Conflicts: lib/api.php
* | | | add 'received_from' info to the share, so that every share can have a ↵Bjoern Schiessle2014-03-111-2/+4
| | | | | | | | | | | | | | | | different value
* | | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-112-4/+279
| | | |
* | | | Disable XML entities when parsing XMLVincent Petry2014-03-102-4/+14
| | | |
* | | | Merge pull request #7654 from owncloud/backport-7646-stable5Thomas Müller2014-03-102-7/+42
|\ \ \ \ | | | | | | | | | | we need the file_source to delete a share successfully
| * | | | we need the file_source to delete a share successfullyBjoern Schiessle2014-03-102-7/+42
|/ / / / | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/tests/api.php
* | | | Merge pull request #7584 from owncloud/stable5-trusteddomainerrorpageVincent Petry2014-03-073-19/+215
|\ \ \ \ | |_|/ / |/| | | [stable5] Show warning page when accessing server from an untrusted domain
| * | | Fixed X-Forwarded-Host parsingVincent Petry2014-03-061-1/+2
| | | | | | | | | | | | | | | | Backport of d7163c9 from stable6
| * | | Added unit tests for serverHost and other related functionsVincent Petry2014-03-061-0/+136
| | | | | | | | | | | | | | | | Backport of 98ff74a from stable6
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-10 20:01:30 +0000