Commit Graph

350 Commits

Author SHA1 Message Date
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +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
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
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
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
Felix Moeller 27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
Thomas Müller 8ac3849a95 Merge pull request #238 from fmms/checkstyle04
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke 8c4c74b23f Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Lukas Reschke d2e842fcc9 Remove uneeded new line 2012-11-01 22:38:21 +01:00
Lukas Reschke 822e4d5f6c Check for redirect_url for logged in users
This checks if there is a redirect_url for logged in users
2012-11-01 22:37:37 +01:00
Lukas Reschke 81f019b6c5 Make the redirect_url working again
Fixes #160
2012-10-31 22:03:55 +01:00
Lukas Reschke 7a7f12a0c1 Create only one CSRF token per session
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)

With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Bart Visscher 6d09752940 DRY for creating htaccess to protect data-directory 2012-10-30 20:57:19 +01:00
Bart Visscher 246d7ea2ea Separate control code from class definition 2012-10-30 20:56:31 +01:00
Lukas Reschke f6b6780072 Don't use OC_Setup as it will show up the installer 2012-10-29 22:44:49 +01:00
Lukas Reschke 6903475841 Generate .htaccess when upgrading from old versions
When upgrading from old ownCloud versions like 2.x the .htaccess is not
generated - which exposes the data to the internet. This fix will
generate a .htaccess when upgrading. (And no one exists)
Fixes #127
2012-10-29 22:03:18 +01:00
Bart Visscher fecfeac55d Fix introduced style errors 2012-10-27 17:45:15 +02:00
Bart Visscher 894d44e796 Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
Conflicts:
	lib/base.php
2012-10-27 16:33:10 +02:00
Bart Visscher 0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00