Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change strucutre of cloud/capabilities response | Tom Needham | 2013-02-09 | 1 | -1/+6 |
| | |||||
* | Merge master | Tom Needham | 2013-02-04 | 99 | -3483/+5078 |
|\ | |||||
| * | Merge pull request #1427 from TheSFReader/master | Thomas Müller | 2013-02-04 | 1 | -1/+7 |
| |\ | | | | | | | The mimetype/mimepart need to be readable, even from searchByMime | ||||
| | * | translate the mimtype/mimepart to readable in the searchByMime function | TheSFReader | 2013-02-03 | 1 | -1/+7 |
| | | | |||||
| * | | Merge pull request #1436 from owncloud/cache_check_path | Thomas Müller | 2013-02-04 | 1 | -0/+6 |
| |\ \ | | | | | | | | | Cache: check for invalid paths in getFileInfo/getDirectoryContent | ||||
| | * | | Cache: fix copy-paste errors | Robin Appelman | 2013-02-04 | 1 | -2/+2 |
| | | | | |||||
| | * | | Cache: check for invalid paths in getFileInfo/getDirectoryContent | Robin Appelman | 2013-02-03 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #1423 from owncloud/getowner | Thomas Müller | 2013-02-04 | 2 | -0/+20 |
| |\ \ \ | | | | | | | | | | | Add getOwner to Filesystem and View classes | ||||
| | * | | | Add getOwner to Filesystem and View classes | Michael Gapczynski | 2013-02-02 | 2 | -0/+20 |
| | | | | | |||||
| * | | | | Make fileblacklist configurable | Lukas Reschke | 2013-02-03 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #1416 from herbrechtsmeier/set_include_path_early | Thomas Müller | 2013-02-03 | 1 | -6/+7 |
| |\ \ \ | | | | | | | | | | | initPaths: set include path before any owncloud function is called | ||||
| | * | | | initPaths: set include path before any owncloud function is called | herbrechtsmeier | 2013-02-02 | 1 | -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/master | Thomas Müller | 2013-02-03 | 1 | -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 ↵ | TheSFReader | 2013-02-02 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | opening it | ||||
| * | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-03 | 1 | -1/+12 |
| | |/ | |/| | |||||
| * | | Dav: update etag in filecache when doing a PROPSET | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
| | | | |||||
| * | | Dav: don't overwrite etag from filecache with old etag from properties table | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 1 | -4/+4 |
| | | |||||
| * | Merge pull request #1413 from owncloud/enable_removing_search_providers | Frank Karlitschek | 2013-02-01 | 1 | -0/+16 |
| |\ | | | | | | | add function to remove a search provider | ||||
| | * | add function to remove a search provider | Jörn Friedrich Dreyer | 2013-02-01 | 1 | -0/+16 |
| | | | |||||
| * | | Merge pull request #1384 from owncloud/upgrade_fix | Bart Visscher | 2013-02-01 | 1 | -70/+53 |
| |\ \ | | | | | | | | | Check for upgrade/maintance mode before trying to load an app | ||||
| | * | | Still load js files in maintance mode | Robin Appelman | 2013-01-30 | 1 | -2/+6 |
| | | | | |||||
| | * | | Check for upgrade/maintance mode before trying to load an app | Robin Appelman | 2013-01-30 | 1 | -70/+49 |
| | |/ | |||||
| * | | Merge pull request #1171 from owncloud/move-datadirectory-checks | Thomas Müller | 2013-01-31 | 1 | -30/+28 |
| |\ \ | | | | | | | | | Move data directory permission checks after data directory existence checks | ||||
| | * \ | Merge branch 'master' into move-datadirectory-checks | Michael Gapczynski | 2013-01-18 | 56 | -934/+963 |
| | |\ \ | |||||
| | * | | | Move permissions check to new function checkDataDirectoryPermissions() | Michael Gapczynski | 2013-01-18 | 1 | -28/+27 |
| | | | | | |||||
| | * | | | Move data directory permission checks after data directory existence checks | Michael Gapczynski | 2013-01-12 | 1 | -29/+28 |
| | | | | | |||||
| * | | | | Merge pull request #1287 from owncloud/ocs_xml_attributes | Thomas Müller | 2013-01-31 | 1 | -2/+5 |
| |\ \ \ \ | | | | | | | | | | | | | API: Treat array keys starting with '@' as XML attributes | ||||
| | * | | | | Simpler method for getting the first char | Tom Needham | 2013-01-24 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Remove some whitespace | Tom Needham | 2013-01-24 | 1 | -4/+0 |
| | | | | | | |||||
| | * | | | | API: If key begins with '@' treat it as an xml attribute | Tom Needham | 2013-01-24 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxy | Thomas Müller | 2013-01-31 | 6 | -7/+120 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | add multiple domains reverse SSL proxy support | ||||
| | * | | | | | add SSL proxy support | herbrechtsmeier | 2013-01-31 | 1 | -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 support | Stefan Herbrechtsmeier | 2013-01-31 | 6 | -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 #1328 | Brice Maron | 2013-01-31 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1379 from owncloud/improved_appsmanagement | Lukas Reschke | 2013-01-31 | 3 | -20/+125 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Improved appsmanagement | ||||
| | * | | | | | just return "true" for now | Frank Karlitschek | 2013-01-31 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -21/+21 |
| | | | | | | | |||||
| | * | | | | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -10/+11 |
| | | | | | | | |||||
| | * | | | | | remove spaces | Frank Karlitschek | 2013-01-31 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | merge master | Frank Karlitschek | 2013-01-30 | 84 | -993/+1462 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php | ||||
| | * | | | | | | mark recommended apps. server part not yet fully implemented | Frank Karlitschek | 2013-01-30 | 2 | -0/+9 |
| | | | | | | | | |||||
| | * | | | | | | apps updater is now working | root | 2013-01-30 | 2 | -22/+10 |
| | | | | | | | | |||||
| | * | | | | | | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 3 | -7/+110 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | remove some left over comments | Björn Schießle | 2013-01-31 | 1 | -9/+2 |
| | | | | | | | | |||||
| * | | | | | | | add missing brackets | Björn Schießle | 2013-01-31 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | search for display name and uid (with no display name) since it is possible ↵ | Björn Schießle | 2013-01-31 | 1 | -5/+15 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | that not all users have a seperate display name | ||||
| * | | | | | | Bumb version number for displayname db upgrade | Robin Appelman | 2013-01-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | merge master into filesystem | Robin Appelman | 2013-01-30 | 16 | -8/+284 |
| |\ \ \ \ \ \ |