wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22850 commits 157 branches 562 tags 714 MiB
Commit graph

749 commits

Author SHA1 Message Date
Arthur Schiwon
f26ba5846d coding style 2013-12-13 16:58:16 +01:00
Arthur Schiwon
dcfda5c2a9 coding style 2013-12-13 16:58:09 +01:00
Arthur Schiwon
91d6a6dd7c On webdav sesssions, loginname was compared to username which does not need to match necessarily 2013-12-13 16:58:03 +01:00
Vincent Petry
df1a404466 Fix webroot for update page 
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.

This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
 2013-12-13 12:56:48 +01:00
Morris Jobke
9c4bbf9ad7 Revert "Revert "Fix user's displayName being overwritten by (old) cookie"" 
This reverts commit eba35d28cd.
 2013-12-05 20:53:11 +01:00
Morris Jobke
eba35d28cd Revert "Fix user's displayName being overwritten by (old) cookie" 
This reverts commit 2a7380cc21.
 2013-12-05 16:12:46 +01:00
Nico Kaiser
2a7380cc21 Fix user's displayName being overwritten by (old) cookie 2013-12-05 14:18:32 +01:00
Robin Appelman
9fbccc83e3 merge master into single-user-mode 2013-11-25 21:25:04 +01:00
Robin Appelman
71c1327691 Add "single user mode" which restricts access to users in the admin group 
This can be enabled by setting 'singleuser' to true in config.php
 2013-11-25 15:08:24 +01:00
Robin Appelman
317d421874 provide more cli friendly error messages 2013-11-25 13:04:23 +01:00
Thomas Müller
4a2f9636cf Merge pull request #5773 from owncloud/fix-2152-master 
Make working en_US.UTF-8 locale a hard requirement
 2013-11-21 08:03:21 -08:00
Georg Ehrke
49cd5dad24 add trash bin and file versions delete hooks in OC::registerPreviewHooks 2013-11-12 14:08:55 +01:00
Bart Visscher
a6d8854d2a Make working en_US.UTF-8 locale a hard requirement 2013-11-08 14:30:08 +01:00
Thomas Müller
4f24d4ba01 display the exception instead of meaningless message 2013-11-04 21:55:55 +01:00
Thomas Mueller
eb3c5070c0 replace template function link_to_docs() with \OC_Helper::linkToDocs() 2013-11-02 19:11:46 +01:00
Bart Visscher
06b42f9788 Merge pull request #5443 from owncloud/fix-autoloader-caching 
Remove Autoloader Cache Hack. Do not use Cache on Install.
 2013-11-01 05:35:34 -07:00
Andreas Fischer
b6bb2b26dd Make "Please contact your system administrator" a full sentence. 2013-11-01 11:35:02 +01:00
Morris Jobke
c61d328ab9 Merge pull request #3889 from owncloud/apps_preload 
Don't load the apps when we need to upgrade
 2013-10-28 03:17:52 -07:00
Thomas Müller
3917d18980 Merge pull request #5528 from frisco82/changeUpadateNotification 
Changed update message to be more instructive
 2013-10-24 10:28:17 -07:00
Ramiro Aparicio
3a81c8e3af Changed update message to be more instructive, changed update style to be less aggresive 
Fix br tags

Improve english messages
 2013-10-24 19:21:40 +02:00
Thomas Müller
54e9d8c306 Merge pull request #5507 from owncloud/webdav-removeredirectfromindex 
Remove WebDAV redirect from the root path
 2013-10-24 10:05:21 -07:00
Vincent Petry
c186f33428 Remove WebDAV redirect from the root path 
This will prevent people mounting the root path.
They should use the full webdav path instead.

Fixes #4923
 2013-10-24 10:34:09 +02:00
Vincent Petry
086b82bd69 Fixed sharing dropdown placeholders in IE8/9 
Added jquery.placeholder shim to handle input field placeholders in IE8/9
 2013-10-23 18:51:25 +02:00
Andreas Fischer
f5e2b92688 Only use autoloader cache when 'instanceid' is available. 2013-10-22 11:17:15 +02:00
Andreas Fischer
eb6637682e Inject memoryCache into Autoloader. Remove recursion-prevention hack. 2013-10-22 11:17:15 +02:00
Thomas Müller
148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Arthur Schiwon
33c4747fdf Use display name from magic cookie, fixes #4884 2013-10-18 13:36:33 +02:00
Thomas Müller
fdeef5e874 Merge branch 'master' into fixing-appframework-master 
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
 2013-10-16 15:45:55 +02:00
Tom Needham
6f8dd54788 Include exception message in log entry when session fails to start 2013-10-12 09:15:08 +01:00
Tom Needham
cf7ea4bec5 Handle ownCloud logging when data dir not created 2013-10-11 17:16:37 +01:00
Tom Needham
cb110c0679 Log the session exception when ownCloud is not installed 2013-10-11 16:45:58 +01:00
Morris Jobke
0641365a10 Merge pull request #4780 from AxelRb/master 
On an auth failure the uid and the IP address should be logged to the st...
 2013-10-10 07:21:36 -07:00
Axel Roenn
9b0454380c changed the argument to false for getValue , reformated else statement 2013-10-10 14:15:13 +02:00
Thomas Müller
053b55721d Merge branch 'master' into fixing-appframework-master 2013-10-08 12:13:24 +02:00
Thomas Müller
fda37ea09c PHPDoc added 2013-10-07 00:32:08 +02:00
Bart Visscher
a90ea2c069 Merge remote-tracking branch 'origin/master' into setup 2013-10-02 18:23:59 +02:00
Thomas Müller
621ab1c7ee fixing various PHPDoc comments 2013-10-02 15:04:42 +02:00
Thomas Müller
8c77cd1901 remove obsolete function login() 2013-10-02 14:49:14 +02:00
Thomas Müller
4cecede13d code cleanup - remove special case for webdav in handleApacheAuth() 2013-10-02 00:55:35 +02:00
Thomas Müller
7e9e23f210 Merge branch 'master' into apache-auth-master 2013-10-02 00:21:11 +02:00
Thomas Müller
d8ada370d7 Squashed commit of the following: 
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Thu Aug 22 11:45:27 2013 +0200

    fixing undefined variable

commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Wed Aug 7 12:00:14 2013 +0200

    adding login.php as alternative for index.php/login

commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Wed Aug 7 11:36:12 2013 +0200

    adding a route for web login

commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date:   Tue Aug 6 17:00:28 2013 +0200

    Login attempt returns true instead of exiting immediately

commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Aug 5 15:31:30 2013 +0200

    Further abstraction.

    This change introduces the ApacheBackend interface for backends that
    depend on Apache authentication and session management. There are no
    longer references to specific backends in OC_User.

commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date:   Thu Aug 1 15:46:36 2013 +0200

    Make login attempt function protected.

commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date:   Wed Jul 31 16:00:22 2013 +0200

    Amends the login link

    When using a Shibboleth login, clicking logout displays a message to the
    user instead of ending the session.

commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date:   Tue Jul 30 13:15:59 2013 +0200

    Abstract Shibboleth authentication into an Apache authentication method

commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date:   Tue Jul 30 11:22:26 2013 +0200

    Convert spaces -> tabs

commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Jul 29 17:40:48 2013 +0200

    Separate the authentication methods

    SABRE authentication and base authentication have slightly different
    workings right now. They should be refactored into a common method
    later, but time pressure requires us to reinvent the wheel slightly.

commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Jul 29 17:07:07 2013 +0200

    Authenicate calls to WebDAV against Shibboleth.

    When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
    normally called without trying the Shibboleth authentication... thus the
    session is not established.

    The method now tries Shib authentication, setting up a session if the
    user has already authenticated.

commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Jul 29 14:04:54 2013 +0200

    Sets up the Shibboleth login attempt.

commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Jul 29 12:36:44 2013 +0200

    Add a method for attempting shibboleth login.

    If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
    Shibboleth (passwordless) login.

commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Jul 29 11:38:04 2013 +0200

    Revert "Adds the apps2 folder with user_shibboleth backend."

    This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.

commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date:   Mon Jul 29 11:28:06 2013 +0200

    Adds the apps2 folder with user_shibboleth backend.

Conflicts:
	core/templates/layout.user.php
	lib/base.php
 2013-10-01 14:29:01 +02:00
Thomas Müller
02d6976263 Merge branch 'master' into lib-private-master-2 2013-09-30 21:29:58 +02:00
Thomas Müller
b58a464b86 Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled 
don't remember login if the encrypion app is enabled
 2013-09-30 10:53:41 -07:00
Thomas Müller
9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public 
Conflicts:
	lib/private/vcategories.php
 2013-09-30 16:36:59 +02:00
Thomas Müller
db39fede97 Merge branch 'master' into appframework-master 
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
 2013-09-25 09:52:12 +02:00
Bjoern Schiessle
c486fc7608 introduce OC_Util::rememberLoginAllowed() 2013-09-24 18:01:34 +02:00
Bjoern Schiessle
b693b5085c don't remember login if the encrypion app is enabled because the user 
needs to log-in again in order to decrypt his private key with his password
 2013-09-24 13:08:55 +02:00
Bart Visscher
8e26f291a7 Merge pull request #4684 from owncloud/improved-console 
Use more object oriented way for console commands
 2013-09-19 14:22:32 -07:00
Thomas Tanghus
09d043729a Note to self 2: Do as you preach. Test! 2013-09-18 15:02:25 +02:00
Thomas Tanghus
79cd655920 Note to self: Test before pushing!!! 2013-09-18 14:50:21 +02:00
Thomas Tanghus
534933ee9b Use new emitter system 2013-09-18 13:15:38 +02:00
Thomas Tanghus
fe86182dac OC_Cache namespace changes and add UserCache to server container. 
Refs #4863
 2013-09-17 17:46:33 +02:00
Thomas Müller
5d4e9e0d25 /OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized 
This fixes unit test execution
 2013-09-15 23:07:18 +02:00
Thomas Müller
ad82a56f79 Merge branch 'master' into appframework-master 2013-09-15 21:18:59 +02:00
Thomas Müller
5b3388c7c4 Merge branch 'master' into appframework-master 2013-09-13 20:56:49 +02:00
kondou
c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Bart Visscher
8ae612f693 Move core setup code to controller class 2013-09-10 20:19:42 +02:00
Axel Roenn
7810e27dad Changed default behaviour to not log IP address in case of an auth failure. Can be configured in OC conf now. 
Log level changed to warning .
 2013-09-10 11:07:26 +02:00
Axel Roenn
0cd6473909 On an auth failure the uid and the IP address should be logged to the standard log file. 
This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header
  instead of the remote address.
 2013-09-09 15:35:39 +02:00
Thomas Müller
e9849270e3 Revert "fixes #4574" 
This reverts commit 81a45cfcf1.
 2013-09-06 00:28:13 +02:00
kondou
820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
kondou
e5fc7b9dbe Merge branch 'master' into clean_up_util 
Conflicts:
	lib/base.php
 2013-09-02 07:58:06 +02:00
kondou
76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
Bart Visscher
0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
kondou
5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Thomas Müller
a9d6b59307 Merge branch 'master' into appframework-master 2013-08-31 01:38:44 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Jan-Christoph Borchardt
0f5df181a3 Merge pull request #4661 from owncloud/separate-app-styles 
Move CSS for apps and browser-specific fixes out of main styles.css
 2013-08-30 09:08:25 -07:00
Stephane Martin
95f42d6544 Merge pull request #4578 from houbaastef/master 
fixes #4574
 2013-08-30 06:20:07 -07:00
Arthur Schiwon
7d398ba622 Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616. 2013-08-30 11:45:16 +02:00
Jan-Christoph Borchardt
9c23ed580a move CSS for browser-specific fixes out of styles.css into new fixes.css 2013-08-30 11:42:32 +02:00
Jan-Christoph Borchardt
cc8e19ad11 move CSS for apps out of styles.css into new apps.css 2013-08-30 11:38:49 +02:00
kondou
0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Bart Visscher
3fd2df4088 Only enable logrotate when configured. Also rotate size is settable. 2013-08-28 17:41:27 +02:00
Bart Visscher
42f3ecb60f Check for installed state before registering the logrotate background job 2013-08-28 17:11:43 +02:00
Bart Visscher
b5e2842e00 Very simple log rotation 2013-08-28 17:11:43 +02:00
Bart Visscher
45076edf4f Merge pull request #3891 from owncloud/fix_loadAppScriptFile 
Check if the app is enabled and the app path is found before trying to l...
 2013-08-28 06:10:06 -07:00
Thomas Tanghus
9843c8e838 Merge pull request #4434 from owncloud/fix_octemplate_escaping 
Fix octemplate string escaping.
 2013-08-28 03:59:43 -07:00
Thomas Müller
a995e81686 Merge branch 'master' into appframework-master 2013-08-26 21:31:15 +02:00
Stephane Martin
81a45cfcf1 fixes #4574 2013-08-26 15:16:41 +02:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
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 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #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
Florian Scholz
b1fd9b3907 - add slash if webroot is an empty string 
- added comment
 2013-06-25 10:45:37 +02:00
Victor Dubiniuk
fbbb6ef8ef Init dummy session first 2013-06-17 23:41:07 +03:00
Florian Scholz
efea868704 - removed slash-adding for logout-header-redirect 2013-06-17 14:21:53 +02: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
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
Bart Visscher
43e8293d9c Change Symfony/Component/Routing from submodule to composer fetching 2012-10-27 11:32:16 +02:00