summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Change strucutre of cloud/capabilities responseTom Needham2013-02-091-1/+6
|
* Merge masterTom Needham2013-02-0499-3483/+5078
|\
| * Merge pull request #1427 from TheSFReader/masterThomas Müller2013-02-041-1/+7
| |\ | | | | | | The mimetype/mimepart need to be readable, even from searchByMime
| | * translate the mimtype/mimepart to readable in the searchByMime functionTheSFReader2013-02-031-1/+7
| | |
| * | Merge pull request #1436 from owncloud/cache_check_pathThomas Müller2013-02-041-0/+6
| |\ \ | | | | | | | | Cache: check for invalid paths in getFileInfo/getDirectoryContent
| | * | Cache: fix copy-paste errorsRobin Appelman2013-02-041-2/+2
| | | |
| | * | Cache: check for invalid paths in getFileInfo/getDirectoryContentRobin Appelman2013-02-031-0/+6
| | | |
| * | | Merge pull request #1423 from owncloud/getownerThomas Müller2013-02-042-0/+20
| |\ \ \ | | | | | | | | | | Add getOwner to Filesystem and View classes
| | * | | Add getOwner to Filesystem and View classesMichael Gapczynski2013-02-022-0/+20
| | | | |
| * | | | Make fileblacklist configurableLukas Reschke2013-02-031-1/+1
| | |_|/ | |/| |
| * | | Merge pull request #1416 from herbrechtsmeier/set_include_path_earlyThomas Müller2013-02-031-6/+7
| |\ \ \ | | | | | | | | | | initPaths: set include path before any owncloud function is called
| | * | | initPaths: set include path before any owncloud function is calledherbrechtsmeier2013-02-021-6/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we can find basic owncloud classes while detecting the owncloud paths in function initPaths by add OC::$SERVERROOT . '/lib' to include path before any owncloud function is called. This fix a bug with XAMPP that cannot find the class OC_Config in function OC_Request::scriptName when called from function OC_Base::initPaths.
| * | | Merge pull request #1422 from TheSFReader/masterThomas Müller2013-02-031-1/+1
| |\ \ \ | | | | | | | | | | Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
| | * | | Remove a warning by making sure the renamed file is a dir before trying and ↵TheSFReader2013-02-021-1/+1
| | |/ / | | | | | | | | | | | | opening it
| * | / [tx-robot] updated from transifexJenkins for ownCloud2013-02-031-1/+12
| | |/ | |/|
| * | Dav: update etag in filecache when doing a PROPSETRobin Appelman2013-02-021-1/+3
| | |
| * | Dav: don't overwrite etag from filecache with old etag from properties tableRobin Appelman2013-02-021-1/+3
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-021-4/+4
| |
| * Merge pull request #1413 from owncloud/enable_removing_search_providersFrank Karlitschek2013-02-011-0/+16
| |\ | | | | | | add function to remove a search provider
| | * add function to remove a search providerJörn Friedrich Dreyer2013-02-011-0/+16
| | |
| * | Merge pull request #1384 from owncloud/upgrade_fixBart Visscher2013-02-011-70/+53
| |\ \ | | | | | | | | Check for upgrade/maintance mode before trying to load an app
| | * | Still load js files in maintance modeRobin Appelman2013-01-301-2/+6
| | | |
| | * | Check for upgrade/maintance mode before trying to load an appRobin Appelman2013-01-301-70/+49
| | |/
| * | Merge pull request #1171 from owncloud/move-datadirectory-checksThomas Müller2013-01-311-30/+28
| |\ \ | | | | | | | | Move data directory permission checks after data directory existence checks
| | * \ Merge branch 'master' into move-datadirectory-checksMichael Gapczynski2013-01-1856-934/+963
| | |\ \
| | * | | Move permissions check to new function checkDataDirectoryPermissions()Michael Gapczynski2013-01-181-28/+27
| | | | |
| | * | | Move data directory permission checks after data directory existence checksMichael Gapczynski2013-01-121-29/+28
| | | | |
| * | | | Merge pull request #1287 from owncloud/ocs_xml_attributesThomas Müller2013-01-311-2/+5
| |\ \ \ \ | | | | | | | | | | | | API: Treat array keys starting with '@' as XML attributes
| | * | | | Simpler method for getting the first charTom Needham2013-01-241-1/+1
| | | | | |
| | * | | | Remove some whitespaceTom Needham2013-01-241-4/+0
| | | | | |
| | * | | | API: If key begins with '@' treat it as an xml attributeTom Needham2013-01-241-2/+9
| | | | | |
| * | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxyThomas Müller2013-01-316-7/+120
| |\ \ \ \ \ | | | | | | | | | | | | | | add multiple domains reverse SSL proxy support
| | * | | | | add SSL proxy supportherbrechtsmeier2013-01-311-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that only forwards SSL connections unencrypted to the web server. This patch allows to detect the reverse proxy via regular expression for the remote IP address and conditional overwrite the host name, protocol and web root.
| | * | | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-316-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions.
| * | | | | | Case insensitive Lang Detection fix #1328Brice Maron2013-01-311-1/+1
| |/ / / / /
| * | | | | Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-313-20/+125
| |\ \ \ \ \ | | | | | | | | | | | | | | Improved appsmanagement
| | * | | | | just return "true" for nowFrank Karlitschek2013-01-311-0/+1
| | | | | | |
| | * | | | | style fixesThomas Mueller2013-01-311-21/+21
| | | | | | |
| | * | | | | style fixesThomas Mueller2013-01-311-10/+11
| | | | | | |
| | * | | | | remove spacesFrank Karlitschek2013-01-311-1/+1
| | | | | | |
| | * | | | | merge masterFrank Karlitschek2013-01-3084-993/+1462
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| | * | | | | | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-302-0/+9
| | | | | | | |
| | * | | | | | apps updater is now workingroot2013-01-302-22/+10
| | | | | | | |
| | * | | | | | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-213-7/+110
| | | | | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-311-0/+1
| | | | | | | |
| * | | | | | | remove some left over commentsBjörn Schießle2013-01-311-9/+2
| | | | | | | |
| * | | | | | | add missing bracketsBjörn Schießle2013-01-311-2/+3
| | | | | | | |
| * | | | | | | search for display name and uid (with no display name) since it is possible ↵Björn Schießle2013-01-311-5/+15
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | that not all users have a seperate display name
| * | | | | | Bumb version number for displayname db upgradeRobin Appelman2013-01-301-1/+1
| | | | | | |
| * | | | | | merge master into filesystemRobin Appelman2013-01-3016-8/+284
| |\ \ \ \ \ \