summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3487 from owncloud/basic_auth_hackThomas Müller2013-07-141-7/+5
|\
| * Move comment and set requesttoken.Thomas Tanghus2013-06-051-3/+2
| * Cleanup hacke v.2Thomas Tanghus2013-05-311-4/+2
| * Revert "Clean up hack."Thomas Tanghus2013-05-311-2/+4
| * Clean up hack.Thomas Tanghus2013-05-311-4/+2
| * Hack base.php to make Basic Auth workThomas Tanghus2013-05-251-1/+2
* | Merge pull request #3270 from owncloud/convert-oc_configicewind19912013-07-115-105/+223
|\ \
| * | stupid namespaceBart Visscher2013-07-081-1/+1
| * | Add constructor documentationBart Visscher2013-07-081-0/+3
| * | Merge branch 'master' into convert-oc_configBart Visscher2013-07-0867-27/+146
| |\ \
| * \ \ Merge branch 'master' into convert-oc_configBart Visscher2013-07-044-48/+178
| |\ \ \
| * \ \ \ Merge branch 'master' into convert-oc_configThomas Mueller2013-07-033-11/+36
| |\ \ \ \
| * | | | | on unit test use @expectedExceptionThomas Müller2013-07-021-0/+3
| * | | | | Merge branch 'master' into convert-oc_configThomas Müller2013-07-0163-1212/+1979
| |\ \ \ \ \
| * | | | | | Set debugMode after reading the config fileBart Visscher2013-06-272-3/+8
| * | | | | | Revert "Can't determine if debug mode is defined until we read the config"Bart Visscher2013-06-272-4/+7
| * | | | | | Use file_exists to fix the unittestsBart Visscher2013-06-271-1/+1
| * | | | | | Fix stupid namespace separatorBart Visscher2013-06-271-1/+1
| * | | | | | Merge branch 'master' into convert-oc_configBart Visscher2013-06-2744-312/+609
| |\ \ \ \ \ \
| * | | | | | | Can't determine if debug mode is defined until we read the configMichael Gapczynski2013-06-102-7/+4
| * | | | | | | Fix potential glob errorMichael Gapczynski2013-06-101-14/+10
| * | | | | | | One more style fixMichael Gapczynski2013-06-031-1/+1
| * | | | | | | Merge branch 'master' into convert-oc_configMichael Gapczynski2013-06-0383-933/+2279
| |\ \ \ \ \ \ \
| * | | | | | | | Style and comment fixesMichael Gapczynski2013-06-033-35/+37
| * | | | | | | | Merge branch 'master' into convert-oc_configThomas Mueller2013-05-1518-86/+396
| |\ \ \ \ \ \ \ \
| * | | | | | | | | camelCase class propertiesBart Visscher2013-05-081-16/+15
| * | | | | | | | | Remove include for loading legacy classBart Visscher2013-05-081-2/+0
| * | | | | | | | | Fix returns of values in OCP\ConfigBart Visscher2013-05-071-6/+21
| * | | | | | | | | Convert OC_Config to object interfaceBart Visscher2013-05-074-77/+175
* | | | | | | | | | - eventsource.php: in case of potential CSRF attack we send an error message ...Thomas Müller2013-07-111-4/+5
* | | | | | | | | | Merge pull request #3978 from owncloud/forwarding-emittericewind19912013-07-102-1/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | forward previously registerd hooksRobin Appelman2013-07-082-1/+9
| * | | | | | | | | | add forwarding emitter for agregating multiple emittersRobin Appelman2013-07-081-0/+42
* | | | | | | | | | | Merge pull request #3985 from owncloud/cookie-past2Morris Jobke2013-07-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set path in cookie.Thomas Tanghus2013-07-091-3/+3
| * | | | | | | | | | | apply @LukasReschke's cookie changes, hopefully finally fix #854Jan-Christoph Borchardt2013-07-091-3/+3
* | | | | | | | | | | | Merge pull request #3994 from owncloud/fix_oracle_setupJörn Friedrich Dreyer2013-07-101-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | General fixesVictor Dubiniuk2013-07-101-4/+4
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-101-0/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3787 from mvn23/patch-1mvn232013-07-091-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reviewed code for X-Sendfile2mvn232013-06-201-12/+12
| * | | | | | | | | | | | Revert most changes for testingmvn232013-06-201-11/+13
| * | | | | | | | | | | | Update files.phpmvn232013-06-191-2/+4
| * | | | | | | | | | | | Implement X-Sendfile2 for resume support in LigHTTPdmvn232013-06-191-1/+13
* | | | | | | | | | | | | Implement encodePathVictor Dubiniuk2013-07-092-1/+30
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Only emit permissions hook for files and and include pathMichael Gapczynski2013-07-081-9/+11
* | | | | | | | | | | | Merge pull request #3963 from owncloud/update-logic-spliticewind19912013-07-082-40/+133
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix typoRobin Appelman2013-07-081-2/+2
| * | | | | | | | | | | | Updater: pass update url as argument to update checkRobin Appelman2013-07-062-6/+6
| * | | | | | | | | | | | split upgrade logic from ajax fileRobin Appelman2013-07-062-39/+132