Commit Graph

365 Commits

Author SHA1 Message Date
Thomas Mueller 77369d8164 disable error handler while running phpunit 2013-02-05 16:44:02 +01:00
herbrechtsmeier 37e6ac9a2a initPaths: set include path before any owncloud function is called
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.
2013-02-02 12:07:18 +01:00
Bart Visscher 2488a495c6 Merge pull request #1384 from owncloud/upgrade_fix
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00
Stefan Herbrechtsmeier ab2b79cda6 add multiple domains reverse proxy support
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.
2013-01-31 18:42:31 +01:00
Robin Appelman 057920b165 Still load js files in maintance mode 2013-01-30 23:05:44 +01:00
Robin Appelman f452d2d0c4 Check for upgrade/maintance mode before trying to load an app 2013-01-30 22:55:33 +01:00
Robin Appelman 207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
irgsmirx 0bce22966c Update lib/base.php
Correction of typo "locate" -> "locale".
2013-01-30 14:27:08 +01:00
Robin Appelman 74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Robin Appelman 232cc3211b add oc:// streamwrapper to provide access to ownCloud's virtual filesystem 2013-01-28 15:35:30 +01:00
Robin Appelman c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
Robin Appelman 930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Thomas Mueller 2cc77759aa lookup for OCA classes in all apps folders 2013-01-26 12:45:50 +01:00
Lukas Reschke dbc13cf6ee Move update inline JS 2013-01-25 19:18:16 +01:00
Lukas Reschke 7f49d35930 Move checkMaintenance and checkUpgrade
This is needed to ensure that the routing and linkTo() function for CSP
are available.
2013-01-25 19:15:02 +01:00
Lukas Reschke 0d2a58bc5d Initialize router also if ownCloud isn't installed 2013-01-25 14:57:52 +01:00
Thomas Mueller b4c3dd84b4 update to jquery-ui 1.10.0 2013-01-23 11:37:52 +01:00
Lukas Reschke 8ca78fcf3f Move requesttoken to oc-requesttoken.js 2013-01-21 20:24:18 +01:00
Robin Appelman 83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Bernhard Posselt f1939866f3 Merge pull request #1214 from Raydiation/master
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
davidgumberg 487e401361 Typo fix (comment) /lib/base.php 2013-01-18 10:52:29 -08:00
Thomas Müller 5df57e4ada Merge pull request #1181 from owncloud/return-503-in-maintenance
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
Bernhard Posselt 2b95ae1e6d spaces to tabs 2013-01-17 21:44:40 +01:00
Bernhard Posselt a8094abac7 load classpaths of apps before routes 2013-01-17 21:42:46 +01:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Thomas Mueller 31ce320c52 in case of maintenance the error page returns http status 503.
This is necessary to enable the desktop sync client to react properly.
Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed
2013-01-14 21:39:55 +01:00
Robin Appelman 0ca5047da5 Autoload namespaced test classes 2013-01-07 00:36:01 +01:00
Michael Gapczynski a94405b4e4 Only show the version updating to instead of worrying about converting internal to a formatted version 2013-01-04 20:13:00 -05:00
Michael Gapczynski f2e6df807d Add back check if installed around background jobs 2013-01-04 14:16:59 -05:00
Michael Gapczynski 7505837079 Basic update progress of database update only 2013-01-03 21:32:33 -05:00
Michael Gapczynski a52aa69ffe Rearrange code to prepare for updater feedback 2013-01-03 14:11:00 -05:00
Michael Gapczynski ce443818d4 Check if oc_token cookie exists before trying to use it 2013-01-02 19:59:04 -05:00
Thomas Müller 7d811e57e6 setting the timezone is now part of the login process and true part of the core. 2012-12-20 11:10:45 +01:00
Frank Karlitschek 196f1c3786 add a check and a warning if setlocale is working 2012-12-19 15:10:33 +01:00
Thomas Mueller b8b64d6ffc set the session name to the instance id - which is unique
Conflicts:
	lib/base.php
2012-12-12 16:07:51 +01:00
Thomas Tanghus af12b0f5da Autoload classes with 'OC' namespace prefix. 2012-12-11 16:00:48 +01:00
Bart Visscher 1e062ea895 Merge pull request #182 from owncloud/fix-redirect
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Thomas Müller 76625e9ba5 Merge pull request #647 from owncloud/fix_app_settings_navigation
Move loading of all the apps to setting the active navigation entry.
2012-12-05 01:48:20 -08:00
Thomas Mueller e65abb8054 minified version no longer available 2012-12-04 14:49:19 +01:00
Bart Visscher 8ce3aca331 Move loading of all the apps to setting the active navigation entry.
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
2012-11-30 12:47:44 +01:00
Jörn Friedrich Dreyer eaa625c9bc Merge pull request #401 from owncloud/share_hooks
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Bart Visscher 8bed38c78d Rename install hook functions to register hook 2012-11-15 18:13:54 +01:00
Bernhard Posselt e642d18e26 When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request 2012-11-15 14:48:18 +01:00
Bart Visscher 530f3f8be9 Create functions to install standard hooks
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
Bart Visscher 7b53c9d3f0 Merge pull request #157 from owncloud/setup
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus 7f0c69eb0e Added CRUDS permissions to the OCP namespace. Implements issue #345 2012-11-11 23:09:54 +01:00
Stefan Seidel 8f669880bc Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze + mod_fcgid installs. 2012-11-09 13:30:07 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00