Commit Graph

447 Commits

Author SHA1 Message Date
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
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
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
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start
Conflicts:
	lib/util.php
2013-06-14 10:06:13 +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
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