| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3962 from owncloud/move-error-handlers | Bart Visscher | 2013-07-15 | 3 | -30/+56 |
| |\ | | | | | Move error handlers from OC_Log to OC\Log\ErrorHandler | ||||
| | * | Check if logger is set, also no need to return true | Bart Visscher | 2013-07-08 | 1 | -3/+1 |
| | | | |||||
| | * | Move error handlers from OC_Log to OC\Log\ErrorHandler | Bart Visscher | 2013-07-05 | 3 | -30/+58 |
| | | | |||||
| * | | 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 pull request #3270 from owncloud/convert-oc_config | icewind1991 | 2013-07-11 | 5 | -105/+223 |
| |\ \ \ | | | | | | | | | Convert OC_Config to object so it can be used for DI | ||||
| | * | | | stupid namespace | Bart Visscher | 2013-07-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add constructor documentation | Bart Visscher | 2013-07-08 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Merge branch 'master' into convert-oc_config | Bart Visscher | 2013-07-08 | 67 | -27/+146 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/config.php | ||||
| | * \ \ \ | Merge branch 'master' into convert-oc_config | Bart Visscher | 2013-07-04 | 4 | -48/+178 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/config.php | ||||
| | * \ \ \ \ | Merge branch 'master' into convert-oc_config | Thomas Mueller | 2013-07-03 | 3 | -11/+36 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | on unit test use @expectedException | Thomas Müller | 2013-07-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some phpdoc added | ||||
| | * | | | | | | Merge branch 'master' into convert-oc_config | Thomas Müller | 2013-07-01 | 63 | -1212/+1979 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Set debugMode after reading the config file | Bart Visscher | 2013-06-27 | 2 | -3/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Revert "Can't determine if debug mode is defined until we read the config" | Bart Visscher | 2013-06-27 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 969e43c87b7afb6184846fe27849167c9c6f5eab. | ||||
| | * | | | | | | | Use file_exists to fix the unittests | Bart Visscher | 2013-06-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix stupid namespace separator | Bart Visscher | 2013-06-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into convert-oc_config | Bart Visscher | 2013-06-27 | 44 | -312/+609 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/config.php lib/setup.php | ||||
| | * | | | | | | | | Can't determine if debug mode is defined until we read the config | Michael Gapczynski | 2013-06-10 | 2 | -7/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix potential glob error | Michael Gapczynski | 2013-06-10 | 1 | -14/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | One more style fix | Michael Gapczynski | 2013-06-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into convert-oc_config | Michael Gapczynski | 2013-06-03 | 83 | -933/+2279 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Style and comment fixes | Michael Gapczynski | 2013-06-03 | 3 | -35/+37 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into convert-oc_config | Thomas Mueller | 2013-05-15 | 18 | -86/+396 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | camelCase class properties | Bart Visscher | 2013-05-08 | 1 | -16/+15 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Remove include for loading legacy class | Bart Visscher | 2013-05-08 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix returns of values in OCP\Config | Bart Visscher | 2013-05-07 | 1 | -6/+21 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Convert OC_Config to object interface | Bart Visscher | 2013-05-07 | 4 | -77/+175 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | - eventsource.php: in case of potential CSRF attack we send an error message ↵ | Thomas Müller | 2013-07-11 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the EventSource to the browser - eventsource.js: handle undefined data on event - update.js: in case of error we close the event source - advise the user to reload the page - update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack | ||||
| * | | | | | | | | | | | Merge pull request #3978 from owncloud/forwarding-emitter | icewind1991 | 2013-07-10 | 2 | -1/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | add forwarding emitter for agregating multiple emitters | ||||
| | * | | | | | | | | | | | forward previously registerd hooks | Robin Appelman | 2013-07-08 | 2 | -1/+9 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | add forwarding emitter for agregating multiple emitters | Robin Appelman | 2013-07-08 | 1 | -0/+42 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #3985 from owncloud/cookie-past2 | Morris Jobke | 2013-07-10 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | apply @LukasReschke's cookie changes, hopefully finally fix #854 | ||||
| | * | | | | | | | | | | | | Set path in cookie. | Thomas Tanghus | 2013-07-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | apply @LukasReschke's cookie changes, hopefully finally fix #854 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #3994 from owncloud/fix_oracle_setup | Jörn Friedrich Dreyer | 2013-07-10 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | General setup fixes for Oracle | ||||
| | * | | | | | | | | | | | | | General fixes | Victor Dubiniuk | 2013-07-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-10 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #3787 from mvn23/patch-1 | mvn23 | 2013-07-09 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @bartv2 and @bantu, merged and closed. | ||||
| | * | | | | | | | | | | | | | Reviewed code for X-Sendfile2 | mvn23 | 2013-06-20 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made some small changes which might have caused a segfault on ci.tmit.eu earlier. | ||||
| | * | | | | | | | | | | | | | Revert most changes for testing | mvn23 | 2013-06-20 | 1 | -11/+13 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Update files.php | mvn23 | 2013-06-19 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Implement X-Sendfile2 for resume support in LigHTTPd | mvn23 | 2013-06-19 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files. To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect. | ||||
| * | | | | | | | | | | | | | | Implement encodePath | Victor Dubiniuk | 2013-07-09 | 2 | -1/+30 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Only emit permissions hook for files and and include path | Michael Gapczynski | 2013-07-08 | 1 | -9/+11 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #3963 from owncloud/update-logic-split | icewind1991 | 2013-07-08 | 2 | -40/+133 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the upgrade logic to \OC\Updater | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |