aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | adjust commentsBjörn Schießle2013-07-121-1/+1
* | | | | fix typo in commentBjörn Schießle2013-07-121-1/+1
* | | | | also expire versions on rename, to update the history more regularlyBjörn Schießle2013-07-121-0/+2
* | | | | it is enough to call the expire function onceBjörn Schießle2013-07-121-6/+1
* | | | | call expire function before writing the new version to make sure to have enou...Björn Schießle2013-07-121-63/+96
|/ / / /
* | | | Merge pull request #3270 from owncloud/convert-oc_configicewind19912013-07-116-105/+328
|\ \ \ \
| * | | | stupid namespaceBart Visscher2013-07-081-1/+1
| * | | | Add constructor documentationBart Visscher2013-07-081-0/+3
| * | | | Merge branch 'master' into convert-oc_configBart Visscher2013-07-08903-9739/+13308
| |\ \ \ \
| * | | | | fix \OC\Config test cases when debug mode is enabledRobin Appelman2013-07-051-0/+2
| * | | | | fix test case whitespaceRobin Appelman2013-07-051-21/+14
| * | | | | Merge branch 'master' into convert-oc_configBart Visscher2013-07-04261-620/+2059
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into convert-oc_configThomas Mueller2013-07-03696-4011/+4294
| |\ \ \ \ \ \
| * | | | | | | on unit test use @expectedExceptionThomas Müller2013-07-022-6/+12
| * | | | | | | Merge branch 'master' into convert-oc_configThomas Müller2013-07-01820-15995/+19116
| |\ \ \ \ \ \ \
| * | | | | | | | Set debugMode after reading the config fileBart Visscher2013-06-273-31/+30
| * | | | | | | | Revert "Can't determine if debug mode is defined until we read the config"Bart Visscher2013-06-273-13/+16
| * | | | | | | | 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-271148-14088/+24997
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Can't determine if debug mode is defined until we read the configMichael Gapczynski2013-06-103-16/+13
| * | | | | | | | | 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-031407-50198/+42057
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Style and comment fixesMichael Gapczynski2013-06-033-35/+37
| * | | | | | | | | | Merge branch 'master' into convert-oc_configThomas Mueller2013-05-15280-3935/+5198
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-075-77/+288
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-12555-1285/+1369
* | | | | | | | | | | | Merge pull request #4015 from owncloud/fixing-4005-masterJörn Friedrich Dreyer2013-07-113-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | - eventsource.php: in case of potential CSRF attack we send an error message ...Thomas Müller2013-07-113-6/+14
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-11558-1386/+1760
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3978 from owncloud/forwarding-emittericewind19912013-07-103-1/+125
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | forward previously registerd hooksRobin Appelman2013-07-083-1/+21
| * | | | | | | | | | | | add forwarding emitter for agregating multiple emittersRobin Appelman2013-07-082-0/+104
* | | | | | | | | | | | | 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 #3990 from owncloud/size-mbJan-Christoph Borchardt2013-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add MB indicator to size heading, fix #3987Jan-Christoph Borchardt2013-07-101-1/+1
* | | | | | | | | | | | | | | Merge pull request #4002 from owncloud/use_OC_in_settings_jsMorris Jobke2013-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use OC instead of oc to show alert at an error.kondou2013-07-101-1/+1
* | | | | | | | | | | | | | | | Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_fo...Morris Jobke2013-07-102-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Close.png instead of delete.png for close dialogskondou2013-07-102-2/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | LDAP: even better check for emptiness, fixes #3815Arthur Schiwon2013-07-101-8/+19
* | | | | | | | | | | | | | | | 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-10540-2546/+2571
|/ / / / / / / / / / / / / /