Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | In debug mode uncaught exceptions should display a nice page | Bart Visscher | 2013-07-21 | 1 | -3/+7 |
| | |||||
* | Cleanup error generation in base.php | Bart Visscher | 2013-07-16 | 1 | -20/+8 |
| | |||||
* | Use autoloader for Patchwork/PHP/Shim/Normalizer | Bart Visscher | 2013-07-16 | 1 | -0/+1 |
| | |||||
* | Merge pull request #3962 from owncloud/move-error-handlers | Bart Visscher | 2013-07-15 | 1 | -3/+2 |
|\ | | | | | Move error handlers from OC_Log to OC\Log\ErrorHandler | ||||
| * | Move error handlers from OC_Log to OC\Log\ErrorHandler | Bart Visscher | 2013-07-05 | 1 | -3/+2 |
| | | |||||
* | | Merge pull request #3487 from owncloud/basic_auth_hack | Thomas Müller | 2013-07-14 | 1 | -7/+5 |
|\ \ | | | | | | | Basic Auth is broken - again... | ||||
| * | | Move comment and set requesttoken. | Thomas Tanghus | 2013-06-05 | 1 | -3/+2 |
| | | | |||||
| * | | Cleanup hacke v.2 | Thomas Tanghus | 2013-05-31 | 1 | -4/+2 |
| | | | |||||
| * | | Revert "Clean up hack." | Thomas Tanghus | 2013-05-31 | 1 | -2/+4 |
| | | | | | | | | | | | | This reverts commit 138c7f615bef9994629d4aa283ae7f037dc0f14d. | ||||
| * | | Clean up hack. | Thomas Tanghus | 2013-05-31 | 1 | -4/+2 |
| | | | |||||
| * | | Hack base.php to make Basic Auth work | Thomas Tanghus | 2013-05-25 | 1 | -1/+2 |
| | | | |||||
* | | | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 1 | -2/+3 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | session_life_time -> session_lifetime | Thomas Mueller | 2013-06-28 | 1 | -2/+2 |
| | | | | | | | | | | default session_lifetime is 24hrs recreation of session is triggered at 50% of the session life time | ||||
* | | session life time is now configurable and set to the same value | Thomas Mueller | 2013-06-26 | 1 | -5/+14 |
| | | |||||
* | | Init dummy session first | Victor Dubiniuk | 2013-06-17 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into move-maint-start | Thomas Mueller | 2013-06-14 | 1 | -24/+45 |
|\ \ | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| * \ | Merge pull request #3578 from owncloud/ocdialog | Thomas Tanghus | 2013-06-03 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Replacement for jquery.dialog to fit better with ownCloud design. | ||||
| | * | | Replacement for jquery.dialog to fit better with ownCloud design. | Thomas Tanghus | 2013-06-02 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #3560 from owncloud/init-order-session | Jörn Friedrich Dreyer | 2013-06-03 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | initialize the session earlier | ||||
| | * | | | initialize the session earlier | Robin Appelman | 2013-05-31 | 1 | -3/+3 |
| | |/ / | |||||
| * | | | merge master into backgroundjob | Robin Appelman | 2013-06-02 | 1 | -73/+57 |
| |\| | | |||||
| | * | | Merge pull request #3509 from owncloud/update_jquery_to_1_10 | Jörn Friedrich Dreyer | 2013-05-30 | 1 | -1/+2 |
| | |\ \ | | | | | | | | | | | Update jquery to 1.10.0 and add jquery-migrate 1.2.1 | ||||
| | | * | | Update jquery to 1.10.0 & add jquery-migrate 1.2.1 | kondou | 2013-05-27 | 1 | -1/+2 |
| | | |/ | |||||
| | * | | provide a dummy session for CLI | Robin Appelman | 2013-05-28 | 1 | -0/+2 |
| | | | | |||||
| | * | | Fix session not working error | Robin Appelman | 2013-05-28 | 1 | -1/+4 |
| | | | | |||||
| | * | | Use the new session wrapper | Robin Appelman | 2013-05-28 | 1 | -18/+24 |
| | |/ | |||||
| | * | Merge pull request #3406 from owncloud/oc_dialogs_oc_template | Morris Jobke | 2013-05-22 | 1 | -0/+1 |
| | |\ | | | | | | | | | Use js templates in OC.dialogs etc. | ||||
| | | * | Port OC.dialogs to use octemplate except for prompt() and form(). | Thomas Tanghus | 2013-05-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Also load octemplate per default. | ||||
| * | | | Don't try to use backgroundjobs before the installtion is done | Robin Appelman | 2013-04-22 | 1 | -5/+7 |
| | | | | |||||
| * | | | Try to supress pre-upgrade backgroundjob error | Robin Appelman | 2013-04-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Ensure we don't throw an exception before we can upgrade to the new ↵ | Robin Appelman | 2013-04-21 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | backgroundjob system | ||||
| * | | | Rework background job system | Robin Appelman | 2013-04-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into move-maint-start | Michael Gapczynski | 2013-05-21 | 1 | -61/+18 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | only connect share hooks if installation OC is installed | Florin Peter | 2013-05-17 | 1 | -4/+6 |
| | |/ | |/| | |||||
| * | | check for setlocale after setting up the paths to prevent autoloader confusion | Robin Appelman | 2013-05-07 | 1 | -2/+7 |
| | | | |||||
| * | | Move autoloader to it's own class | Robin Appelman | 2013-05-07 | 1 | -56/+6 |
| | | | |||||
* | | | Turn off theme before update | Michael Gapczynski | 2013-05-14 | 1 | -0/+1 |
| | | | |||||
* | | | Move start of the maintenance mode to the ajax call | Bart Visscher | 2013-05-04 | 1 | -4/+0 |
|/ / | | | | | | | Make sure the update page is shown in a browser. And not an ajax request | ||||
* | | Don't start the session when in cli mode | Robin Appelman | 2013-04-26 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #2993 from owncloud/resolve_apps_lib_path | Thomas Tanghus | 2013-04-24 | 1 | -2/+9 |
|\ \ | | | | | | | Let autoloader resolve paths under apps lib directory. | ||||
| * | | Added explanation | Thomas Tanghus | 2013-04-18 | 1 | -0/+1 |
| | | | |||||
| * | | Let autoloader resolve paths under apps lib directory. | Thomas Tanghus | 2013-04-18 | 1 | -2/+8 |
| | | | |||||
* | | | Merge pull request #3089 from guruz/fix_ugly_config_writeability_error | Morris Jobke | 2013-04-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix ugly error style on install | ||||
| * | | | Fix ugly error style on install | Markus Goetz | 2013-04-23 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | 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. | ||||
* / | | Disallow URLs containing a @ | Lukas Reschke | 2013-04-23 | 1 | -2/+7 |
|/ / | |||||
* | | Merge pull request #3010 from owncloud/fix-cookie_path | Thomas Tanghus | 2013-04-19 | 1 | -2/+3 |
|\ \ | | | | | | | Don't use empty session.cookie_path, otherwise we get multiple cookies | ||||
| * | | Don't use empty session.cookie_path, otherwise we get multiple cookies | Bart Visscher | 2013-04-18 | 1 | -2/+3 |
| |/ | |||||
* / | Warn when we do an upgrade | Brice Maron | 2013-04-17 | 1 | -1/+1 |
|/ | |||||
* | Juse send the cookies in the ownCloud directory | Lukas Reschke | 2013-04-06 | 1 | -1/+4 |
| | |||||
* | Remove space before parethesis | VicDeo | 2013-03-20 | 1 | -1/+1 |
| |