Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 1 | -15/+51 |
|\ | |||||
| * | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 1 | -9/+17 |
| |\ | |||||
| | * | Merge pull request #4661 from owncloud/separate-app-styles | Jan-Christoph Borchardt | 2013-08-30 | 1 | -1/+3 |
| | |\ | |||||
| | | * | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 1 | -0/+1 |
| | | * | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 1 | -1/+2 |
| | * | | Merge pull request #4578 from houbaastef/master | Stephane Martin | 2013-08-30 | 1 | -5/+10 |
| | |\ \ | |||||
| | | * | | fixes #4574 | Stephane Martin | 2013-08-26 | 1 | -5/+10 |
| | * | | | Use the real username in preferences and magic cookie instead of case-insensi... | Arthur Schiwon | 2013-08-30 | 1 | -3/+4 |
| | | |/ | | |/| | |||||
| * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 1 | -6/+25 |
| |\| | | |||||
| | * | | Only enable logrotate when configured. Also rotate size is settable. | Bart Visscher | 2013-08-28 | 1 | -1/+2 |
| | * | | Check for installed state before registering the logrotate background job | Bart Visscher | 2013-08-28 | 1 | -1/+15 |
| | * | | Very simple log rotation | Bart Visscher | 2013-08-28 | 1 | -0/+1 |
| | * | | Merge pull request #3891 from owncloud/fix_loadAppScriptFile | Bart Visscher | 2013-08-28 | 1 | -5/+8 |
| | |\ \ | |||||
| | | * | | Check if the app is enabled and the app path is found before trying to load t... | Bart Visscher | 2013-06-28 | 1 | -5/+8 |
| | * | | | Merge pull request #4434 from owncloud/fix_octemplate_escaping | Thomas Tanghus | 2013-08-28 | 1 | -1/+1 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fix octemplate string escaping. | Thomas Tanghus | 2013-08-14 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 1 | -16/+19 |
| |\| | | | |||||
| * | | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -31/+22 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -10/+20 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-17 | 1 | -4/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-06 | 1 | -7/+16 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-05-29 | 1 | -17/+28 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 branch 'master' into clean_up_util | kondou | 2013-08-20 | 1 | -16/+19 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | add quota streamwrapper that limits the amount of data that can be written to... | Robin Appelman | 2013-07-25 | 1 | -16/+19 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Fix some naming and spacing in lib/util.php | kondou | 2013-08-18 | 1 | -2/+2 |
* | | | | | | | | Clean up \OC\Util | kondou | 2013-08-15 | 1 | -4/+4 |
|/ / / / / / / | |||||
* | | | | | | | 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 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 move-maint-start | Thomas Mueller | 2013-06-14 | 1 | -24/+45 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 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 |
| |\| | | |