Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -31/+22 |
|\ | |||||
| * | shorten wording on config directory errors | Jan-Christoph Borchardt | 2013-07-23 | 1 | -1/+2 |
| * | 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 | 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 |
| |\ \ | |||||
| | * | | 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 |
| | * | | 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 conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -10/+20 |
|\| | | | |||||
| * | | | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 1 | -2/+3 |
| | |/ | |/| | |||||
| * | | session_life_time -> session_lifetime | Thomas Mueller | 2013-06-28 | 1 | -2/+2 |
| * | | 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 oc_preview | Georg Ehrke | 2013-06-17 | 1 | -4/+1 |
|\| | | |||||
| * | | Merge branch 'master' into move-maint-start | Thomas Mueller | 2013-06-14 | 1 | -24/+45 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into move-maint-start | Michael Gapczynski | 2013-05-21 | 1 | -61/+18 |
| |\ \ \ | |||||
| * | | | | 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 |
* | | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-06 | 1 | -7/+16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | 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. | 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 | 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 & add jquery-migrate 1.2.1 | kondou | 2013-05-27 | 1 | -1/+2 |
| | | | |_|/ | | | |/| | | |||||
| * | | | | | 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 backgroun... | Robin Appelman | 2013-04-21 | 1 | -1/+5 |
| * | | | | | Rework background job system | Robin Appelman | 2013-04-20 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-05-29 | 1 | -17/+28 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 |
| | |/ / / | |/| | | | |||||
* | | | | | move to OC namespace | Georg Ehrke | 2013-05-29 | 1 | -2/+2 |
* | | | | | connect preview lib to filesystem hooks | Georg Ehrke | 2013-05-29 | 1 | -0/+9 |
|/ / / / | |||||
* | | | | Merge pull request #3406 from owncloud/oc_dialogs_oc_template | Morris Jobke | 2013-05-22 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Port OC.dialogs to use octemplate except for prompt() and form(). | Thomas Tanghus | 2013-05-16 | 1 | -0/+1 |
* | | | | 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 |
| |/ |/| | |||||
* | | 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 |
|\ \ | |||||
| * | | 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 |