Thomas Müller
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
kondou
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
kondou
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
Thomas Müller
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
Robin Appelman
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
Jan-Christoph Borchardt
93b227d803
shorten wording on config directory errors
2013-07-23 18:41:00 +02:00
Bart Visscher
aa22194a09
In debug mode uncaught exceptions should display a nice page
2013-07-21 22:40:35 +02:00
Bart Visscher
49fca86f3c
Cleanup error generation in base.php
2013-07-16 22:36:39 +02:00
Bart Visscher
7d86e262e1
Use autoloader for Patchwork/PHP/Shim/Normalizer
2013-07-16 22:32:04 +02:00
Bart Visscher
1a2db491af
Merge pull request #3962 from owncloud/move-error-handlers
...
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-15 09:23:37 -07:00
Thomas Müller
6f5b0af67f
Merge pull request #3487 from owncloud/basic_auth_hack
...
Basic Auth is broken - again...
2013-07-14 14:56:45 -07:00
Georg Ehrke
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
Björn Schießle
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308fcb5811b7b0e3e6#3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Bart Visscher
2db839c4d3
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-05 19:28:10 +02:00
Bart Visscher
57370353ad
Check if the app is enabled and the app path is found before trying to load the script file
2013-06-28 20:34:28 +02:00
Bart Visscher
9a50a8f0cc
Don't load the apps when we need to upgrade
...
The loading can call functions that require new tables, like oc_jobs
2013-06-28 17:23:40 +02:00
Thomas Mueller
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
Thomas Mueller
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
Victor Dubiniuk
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
Georg Ehrke
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
Thomas Mueller
c8564c0795
Merge branch 'master' into move-maint-start
...
Conflicts:
lib/util.php
2013-06-14 10:06:13 +02:00
Georg Ehrke
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
Thomas Tanghus
9cd6645037
Move comment and set requesttoken.
2013-06-05 00:38:08 +02:00
Thomas Tanghus
2572c9a6b7
Merge pull request #3578 from owncloud/ocdialog
...
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-03 06:37:27 -07:00
Jörn Friedrich Dreyer
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
Thomas Tanghus
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Robin Appelman
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
Thomas Tanghus
ad5c4bf771
Cleanup hacke v.2
2013-05-31 00:53:57 +02:00
Thomas Tanghus
e21649ccff
Revert "Clean up hack."
...
This reverts commit 138c7f615b
2013-05-31 00:53:15 +02:00
Thomas Tanghus
138c7f615b
Clean up hack.
2013-05-31 00:28:03 +02:00
Jörn Friedrich Dreyer
476747ee89
Merge pull request #3509 from owncloud/update_jquery_to_1_10
...
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
Georg Ehrke
d8008ae421
Merge branch 'master' into oc_preview
2013-05-29 13:24:14 +02:00
Georg Ehrke
fa6b96090a
move to OC namespace
2013-05-29 12:46:54 +02:00
Georg Ehrke
eebc15dce0
connect preview lib to filesystem hooks
2013-05-29 12:01:43 +02:00
Robin Appelman
040045cc2e
provide a dummy session for CLI
2013-05-28 01:15:38 +02:00
Robin Appelman
e73c04501e
Fix session not working error
2013-05-28 01:10:18 +02:00
Robin Appelman
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
kondou
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
Thomas Tanghus
e66f609a64
Hack base.php to make Basic Auth work
2013-05-25 05:51:51 +03:00
Morris Jobke
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Michael Gapczynski
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04:00
Florin Peter
a92dead754
only connect share hooks if installation OC is installed
2013-05-17 01:20:02 +02:00
Thomas Tanghus
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Michael Gapczynski
f8336c1e2c
Turn off theme before update
2013-05-14 09:34:01 -04:00
Robin Appelman
0d25c0001c
check for setlocale after setting up the paths to prevent autoloader confusion
2013-05-07 22:53:07 +02:00
Robin Appelman
0b5f6b9c13
Move autoloader to it's own class
2013-05-07 22:16:17 +02:00
Bart Visscher
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Robin Appelman
172499d5f3
Don't start the session when in cli mode
2013-04-26 14:53:59 +02:00
Thomas Tanghus
c84281990c
Merge pull request #2993 from owncloud/resolve_apps_lib_path
...
Let autoloader resolve paths under apps lib directory.
2013-04-24 13:33:05 -07:00
Morris Jobke
b1c9b296e8
Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
...
Fix ugly error style on install
2013-04-24 02:24:23 -07:00
Markus Goetz
f1a63254fb
Fix ugly error style on install
...
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-04-23 11:06:28 +02:00
Lukas Reschke
6e78c4fcc0
Disallow URLs containing a @
2013-04-23 00:26:40 +03:00
Robin Appelman
e63633b5f3
Don't try to use backgroundjobs before the installtion is done
2013-04-22 20:23:23 +02:00
Robin Appelman
40de36a8f3
Try to supress pre-upgrade backgroundjob error
2013-04-21 00:58:15 +02:00
Robin Appelman
07f510692c
Ensure we don't throw an exception before we can upgrade to the new backgroundjob system
2013-04-21 00:08:55 +02:00
Robin Appelman
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
Thomas Tanghus
4ccc9d896a
Merge pull request #3010 from owncloud/fix-cookie_path
...
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-19 01:17:35 -07:00
Thomas Tanghus
e09c17de5b
Added explanation
2013-04-18 22:29:50 +02:00
Bart Visscher
e4876c9117
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-18 21:11:58 +02:00
Thomas Tanghus
9facb67fab
Let autoloader resolve paths under apps lib directory.
2013-04-18 08:30:09 +02:00
Brice Maron
43d0f1fabf
Warn when we do an upgrade
2013-04-17 21:29:14 +02:00
Lukas Reschke
fbffbe0170
Juse send the cookies in the ownCloud directory
2013-04-06 00:16:52 +02:00
VicDeo
3e9ea6d13b
Remove space before parethesis
2013-03-20 16:54:06 +04:00
VicDeo
c3a64012d8
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-19 16:40:52 +03:00
Frank Karlitschek
63336f2acb
remove deprecated call
2013-03-17 22:05:45 +01:00
Michael Gapczynski
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
Bart Visscher
d800f35bf4
Disable loading of backgroundjobs js when upgrade is needed
2013-03-03 23:15:22 +01:00
Bart Visscher
a2d6b27170
Check maintenance mode before loading apps in route matcher
2013-03-03 23:15:18 +01:00
Bernhard Posselt
2f036bcc54
Merge pull request #1972 from owncloud/raw-pathinfo
...
Use the plain urlencoded path info for the routing matching
2013-02-27 13:43:47 -08:00
Bart Visscher
56f3917f36
Use the plain urlencoded path info for the routing matching
2013-02-27 21:38:58 +01:00
Bernhard Posselt
888e4f21d2
timeout after a longer time
2013-02-27 15:44:00 +01:00
Bart Visscher
3a7322342e
Merge pull request #1956 from owncloud/session-error-format
...
add styles before session init
2013-02-27 05:21:17 -08:00
Bernhard Posselt
a1afc2e34f
only add style.css to initsession
2013-02-27 11:36:05 +01:00
Bernhard Posselt
18b7a2bf21
add css and scripts before session init
2013-02-27 11:17:14 +01:00
Bart Visscher
4a26d63867
Fix using wrong quotes for breaking long lines
...
Fixes #1925
2013-02-26 20:48:01 +01:00
Bernhard Posselt
7f7b8bc07a
use error template
2013-02-25 19:17:29 +01:00
Bernhard Posselt
aba60dba28
added simple error message for the browser
2013-02-25 18:47:34 +01:00
Bernhard Posselt
bc2fefed59
write an error log when session could not be initialized
2013-02-25 18:42:09 +01:00
Bernhard Posselt
55c72617c6
set http 500 when session could not be started to prevent serving of empty files see #1049
2013-02-25 18:37:05 +01:00
Robin Appelman
0395715348
set DEBUG from xdebug session before we first use it
2013-02-15 03:15:09 +01:00
Robin Appelman
bcabdd7dd5
Don't cache errors/exceptions when debug is enabled
2013-02-15 03:14:41 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Lukas Reschke
be194c5b5b
Invalidate existing HSTS headers
2013-02-14 19:23:29 +01:00
Thomas Mueller
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
Bart Visscher
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
Bart Visscher
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
Thomas Müller
0222c589ac
Merge pull request #1546 from owncloud/fix-loading-hooks
...
Fix loading hooks when going though the routing system
2013-02-09 09:59:41 -08:00
Thomas Müller
e68cf72458
Merge pull request #1543 from owncloud/utf8-locale-master
...
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
Bart Visscher
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
Thomas Müller
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Bart Visscher
fba9739448
Always load the apps before trying to match a route
2013-02-08 19:06:59 +01:00
Thomas Müller
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
Robin Appelman
afa1a6d2b3
Don't try to use routes when called from cli
2013-02-07 17:53:38 +01:00
Thomas Mueller
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Bart Visscher
3582f7bd09
Execute the post setup check after finishing the setup
2013-02-06 17:56:45 +01:00
Thomas Mueller
1adcc5fd23
basic WebDAV test in place now
2013-02-05 23:33:44 +01:00
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
