summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3962 from owncloud/move-error-handlersBart Visscher2013-07-153-30/+56
|\ | | | | Move error handlers from OC_Log to OC\Log\ErrorHandler
| * Check if logger is set, also no need to return trueBart Visscher2013-07-081-3/+1
| |
| * Move error handlers from OC_Log to OC\Log\ErrorHandlerBart Visscher2013-07-053-30/+58
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-15534-1055/+1055
| |
* | Merge pull request #3487 from owncloud/basic_auth_hackThomas Müller2013-07-141-7/+5
|\ \ | | | | | | Basic Auth is broken - again...
| * | 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-312-3/+4
| | | | | | | | | | | | This reverts commit 138c7f615bef9994629d4aa283ae7f037dc0f14d.
| * | Clean up hack.Thomas Tanghus2013-05-312-4/+3
| | |
| * | Hack base.php to make Basic Auth workThomas Tanghus2013-05-251-1/+2
| | |
* | | Merge pull request #4061 from rolandgeider/masterJan-Christoph Borchardt2013-07-141-1/+1
|\ \ \ | | | | | | | | Use transifex.com on link to translations
| * | | Use transifex.com on link to translationsrolandgeider2013-07-141-1/+1
|/ / /
* | | [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
| | | | | | | | | | |