mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,163 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

47 Commits

Author SHA1 Message Date
Bart Visscher 52553c64ed Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
 2013-07-08 17:59:50 +02:00
Björn Schießle 9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827 
Squashed commit of the following:

commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:03:23 2013 +0200

    initialize OC_Defaults only once

commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:02:48 2013 +0200

    link to doc in error messages

commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #3791

commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:10:21 2013 +0200

    link to docs in error messages, fix #3819
 2013-07-08 10:07:57 +02:00
Robin Appelman c1cf829b9d OC_Config: handle failure of glob('*.config.php') 2013-07-05 15:07:15 +02:00
kondou aa7d8edd14 Suppress warning in setup if config doesn't exist 2013-07-03 16:00:23 +02:00
Bart Visscher 12976fb2e1 Set debugMode after reading the config file 2013-06-27 22:50:28 +02:00
Bart Visscher 194b61b4c5 Revert "Can't determine if debug mode is defined until we read the config" 
This reverts commit 969e43c87b.
 2013-06-27 22:24:17 +02:00
Bart Visscher ae2b3732de Use file_exists to fix the unittests 2013-06-27 22:23:53 +02:00
Bart Visscher 64f16f1db1 Fix stupid namespace separator 2013-06-27 21:57:59 +02:00
Bart Visscher c6bbccc776 Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
	lib/setup.php
 2013-06-27 17:54:17 +02:00
Michael Gapczynski 969e43c87b Can't determine if debug mode is defined until we read the config 2013-06-10 12:07:25 -04:00
Michael Gapczynski b7b6075d55 Fix potential glob error 2013-06-10 11:42:20 -04:00
Michael Gapczynski e0359b0b24 One more style fix 2013-06-03 18:17:32 -04:00
Michael Gapczynski d50d663928 Style and comment fixes 2013-06-03 18:05:38 -04:00
Michael Gapczynski 0a29d2029a Clear opcode caches after writing to the config file, fixes #3372 2013-05-25 11:25:43 -04:00
Bart Visscher 83444d9c64 camelCase class properties 2013-05-08 18:20:44 +02:00
Bart Visscher 9f5b7657fb Remove include for loading legacy class 2013-05-08 18:17:26 +02:00
Bart Visscher 07df94def6 Convert OC_Config to object interface 2013-05-07 19:59:46 +02:00
eMerzh 8db76ef7d2 Merge pull request #2147 from eMerzh/split_config 
[OC6] Allow to load splited config files
 2013-04-09 09:56:16 -07:00
Brice Maron d5da94acbc Small perf improvement : filter before sort 2013-03-09 21:41:59 +01:00
Brice Maron 4994eaace1 Allow to load splited config files ref #946 2013-03-06 23:30:16 +01:00
Brice Maron a68cbb00e0 Preserve Debug flag accross config writes 2013-03-06 21:05:13 +01:00
Bart Visscher 4a26d63867 Fix using wrong quotes for breaking long lines 
Fixes #1925
 2013-02-26 20:48:01 +01:00
Bart Visscher ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Robin Appelman 4131b205d4 fix some more phpdoc 2012-09-23 02:40:03 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Thomas Müller e5cb638c09 Respect coding style 2012-09-05 15:42:06 +03:00
Brice Maron 33165e3915 Do not close php tag on config file 2012-06-22 21:01:12 +00:00
Brice Maron 72fe463f7f Correct OC_Config writer. Use var_export (has support for array,...) 2012-06-22 12:46:21 +02:00
Thomas Mueller 521294d0bf fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987 2012-06-12 23:16:26 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Bart Visscher bd7227bb93 Spelling fix hint text 2012-02-17 22:10:02 +01:00
Tom Needham dd7a411f9a Disable save button while saving. Streamlined code. 2011-11-29 22:11:42 +00:00
Frank Karlitschek 3acea2f574 change the error hint from suggesting to change the owner of a directory to changing the permissions. changing the owner of a director is not possible via ftp. 2011-10-22 19:39:05 +02:00
Thomas Schmidt 182333a781 use central method for checking webserver user 2011-09-29 15:54:41 +02:00
Bart Visscher 82c7598861 Remove global vars and use the OC static version. 
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
 2011-09-18 19:37:54 +02:00
Frank Karlitschek c2a5b49834 better error reporting during installation 2011-08-12 19:22:29 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack 2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +02:00
Robin Appelman 00858efbe2 store numbers as strings to prevent errors with numeric passwords 2011-06-14 01:20:41 +02:00
Robin Appelman 1e0fe05bef fix error with empty config file 2011-06-14 01:20:41 +02:00
Jakob Sack d70dfbdebb Renamed a few columns in order t ohave both sqlite and mysql up and running 2011-05-15 15:03:12 +02:00
Jakob Sack 8465f76e7e Use OC_CONFIG where possible 2011-04-16 12:18:42 +02:00
Jakob Sack 177fd27382 Make OC_CONFIG working again 2011-04-16 11:25:21 +02:00
Jakob Sack f66d3ab208 Implementation of OC_APPCONFIG, OC_CONFIG and OC_PREFERENCES 2011-04-08 16:54:12 +02:00
Jakob Sack a3070405d9 OC_HELPER, OC_LOG and OC_TEMPLATE prepared for refactoring 2011-03-13 17:25:34 +01:00
Jakob Sack 59847bb901 OC_CONFIG prepared for refactoring 2011-03-12 18:19:11 +01:00
Jakob Sack 132695ceb1 Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry. 2011-03-01 23:20:16 +01:00