aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-14541-1100/+1140
|
* Removed the preview warning. This is only a simple text changeFrank Karlitschek2013-07-131-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-13539-2047/+2064
|
* Merge pull request #4037 from owncloud/add_new_file_above_summaryKondou2013-07-121-0/+2
|\ | | | | add new file above summary if it is the first file in the list
| * add new file above summary if it is the first file in the listBjörn Schießle2013-07-121-0/+2
| |
* | fix array access and change variable names according to the coding styleBjörn Schießle2013-07-121-11/+13
| |
* | continue cleaning-up old versions if availableSpace=0. It's not necessary ↵Björn Schießle2013-07-121-1/+1
| | | | | | | | but gives us some additional free space, especially in the case of a hard quota
* | fix some var names according to our style guideBjörn Schießle2013-07-121-7/+7
| |
* | 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 ↵Björn Schießle2013-07-121-63/+96
|/ | | | enough free space
* Merge pull request #3270 from owncloud/convert-oc_configicewind19912013-07-116-105/+328
|\ | | | | Convert OC_Config to object so it can be used for DI
| * 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
| |\ | | | | | | | | | | | | Conflicts: lib/config.php
| * | 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
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/config.php
| * \ \ Merge branch 'master' into convert-oc_configThomas Mueller2013-07-03696-4011/+4294
| |\ \ \
| * | | | on unit test use @expectedExceptionThomas Müller2013-07-022-6/+12
| | | | | | | | | | | | | | | | | | | | some phpdoc added
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 969e43c87b7afb6184846fe27849167c9c6f5eab.
| * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/config.php lib/setup.php
| * | | | | | 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 and update fixes [master]
| * | | | | | | | | - eventsource.php: in case of potential CSRF attack we send an error message ↵Thomas Müller2013-07-113-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-11558-1386/+1760
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3978 from owncloud/forwarding-emittericewind19912013-07-103-1/+125
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add forwarding emitter for agregating multiple emitters
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | apply @LukasReschke's cookie changes, hopefully finally fix #854
| * | | | | | | | | | 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 #3987
| * | | | | | | | | | | add MB indicator to size heading, fix #3987Jan-Christoph Borchardt2013-07-101-1/+1
| | | | | | | | | | | |