Commit Graph

9775 Commits

Author SHA1 Message Date
Ingo Schommer
5df519c6b5 Removed SiteTree.MetaTitle and MetaKeywords usage 2012-09-21 11:31:24 +02:00
Ingo Schommer
039b40247e Merge branch 'open/7875' of git://github.com/jbridson/sapphire into jbridson-open/7875 2012-09-21 10:49:36 +02:00
Simon Welsh
1e629f4585 Merge branch '3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
2012-09-21 14:56:56 +12:00
Ingo Schommer
e44a3558dd Merge pull request #793 from halkyon/htmlvalue_parsing_fixes
BUG HtmlEditorField doesn't save HTML fragments in HTMLValue correctly
2012-09-20 02:09:36 -07:00
Simon Welsh
fe0e357be9 Merge pull request #807 from chillu/pulls/public-function
Method visibility according to coding conventions
2012-09-20 01:55:52 -07:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Simon Welsh
d3112f7d20 Merge pull request #806 from halkyon/requirements_combined_fallback
BUG If combined files can't be written, fallback instantly to uncombined
2012-09-19 20:22:39 -07:00
Sean Harvey
954eb60983 BUG If combined files can't be written, fallback instantly to uncombined 2012-09-20 14:01:45 +12:00
Jeremy Bridson
a670e4ca40 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:25:57 +12:00
Simon Welsh
d0153f32cf Write the test before ending it, so it still exists.
Also, switches to a constant instead of hardcoding the value.
2012-09-19 21:41:34 +12:00
Ingo Schommer
069dbfa69a Merge pull request #801 from howardgrigg/patch-2
Updated Template docs to include using backslash to escape
2012-09-19 02:32:01 -07:00
Simon Welsh
4e7ed3f535 Merge pull request #804 from wilr/corecontrollertemplate
Include $Form  in basic Controller view
2012-09-19 02:22:10 -07:00
Will Rossiter
3fc928a861 Include in basic Controller view 2012-09-19 21:00:43 +12:00
Sam Minnée
a5d9e3260c Merge pull request #802 from tractorcow/3.0-unittest-error-fixes
FIXED: Issue with test reporting
2012-09-18 23:45:53 -07:00
Sam Minnée
445aabfe2e Merge pull request #803 from halkyon/temp_path_tinymce
Have tiny_mce_gzip.php use local silverstripe-cache folder if available
2012-09-18 22:47:40 -07:00
Sean Harvey
b075fa29c5 Have tiny_mce_gzip.php use local silverstripe-cache folder if available
This is a fix for ticket #7670. Some hosting situations don't
allow write access to the system temp path. tiny_mce_gzip.php is currently
using sys_get_temp_dir() by default, and not using a local silverstripe-cache
folder that may exist in the SilverStripe project.

This change moves the getTempFolder() function into a common file, and
includes that in core/Core.php, as well as thirdparty/tinymce/tiny_mce_gzip.php
so both locations share the same code to work out the temp path.
2012-09-19 16:43:17 +12:00
Sean Harvey
e0beca198b Added missing $tempPath argument (regression from last commit) 2012-09-19 13:30:05 +12:00
Sean Harvey
aa4fa75091 Consistently use the $base argument to getTempFolder() 2012-09-19 13:27:43 +12:00
Damian Mooyman
69d888b5d1 FIXED: Issue with test reporting not correctly presenting errors that prevent test execution.
In the case of errors arising during setUp or setUpOnce a unit test will fail to run any individual tests. However, this situation was incorrectly being reported as a test pass (as no tests were run, thus no tests had errors). E.g. the output of a test run that raised an error during setUp would be "0 tests run: 0 passes, 0 failures, and 0 incomplete" with a green background.

To rectify this the following fixes were made:
- Non-cleanly ended tests and test suites are now automatically ended at the end of the test run, as well as at the beginning of subsequent test/suites. This should make catching of errors a lot more robust.
- Errors raised during setup are now no longer lost to the mist of time. The test suite itself will record any error status which was generated outside the scope of any individual tests.
- An additional "errors" count is added to the output at the end of test running. For example, in the case where setup failed and no tests could be run the error would be written to the browser (along with stacktrace) with a message similar to "0 tests run: 0 passes, 0 failures, and 0 incomplete with 1 errors". The intent of this is to separate the concepts of failed/succeeded/incomplete tests from any errors which may have arisen. I.e. no tests "failed" due to the error, but the test run itself is highlighted as an error (red background on the output).

This problem has been a severe cause of issue when testing code that interacts with the database, as any database error during setup would refuse to be shown.
2012-09-19 12:25:58 +12:00
Sean Harvey
26d70d6fca BUG HtmlEditorField doesn't save HTML fragments in HTMLValue correctly
The issue was raised in #7628, where an anchor tag was being changed from
<a name="anchor"></a> to <a name="anchor"/> by SS_HTMLValue, when
HtmlEditorField::saveInto() parses the HTML fragments.

This is because SS_HTMLValue uses DOMDocument::saveXML(), which is fine
for saving an XML document, but not suitable for HTML. This fix changes
that to use DOMDocument::saveHTML() instead.
Note that we can't use the parameter to saveHTML() for selecting a single
node only, as that's only supported in PHP 5.3.6+, SilverStripe 3.0 supports
PHP 5.3.2 as a minimum. The workaround for this shortcoming is to replace
unncessary output by DOMDocument with a regular expression.
2012-09-19 11:39:01 +12:00
Howard Grigg
7381cb46a3 Updated Template docs to include using backslash to escape 2012-09-18 22:35:46 +10:00
Will Rossiter
e509fb501d Tidy up RSSFeed docs based on community feedback. (Thanks Matt Howlett) 2012-09-18 19:42:21 +12:00
Simon Welsh
4e3c684b62 Merge branch 'bugfix/apishortcodes' of https://github.com/elliot-sawyer/sapphire into 3.0 2012-09-18 16:36:11 +12:00
Sam Minnée
95dbad6195 Merge pull request #796 from stozze/3.0-bugfix
BUGFIX Fix to prevent unintended results from getComponentsQuery(...)
2012-09-17 18:26:44 -07:00
Ingo Schommer
51ea94a50c Merge pull request #792 from halkyon/tiny_mce_upgrade_356
Upgrading TinyMCE dependency to 3.5.6, and updating language packs.
2012-09-17 16:30:53 -07:00
Ingo Schommer
c1064ccd0f Merge pull request #783 from halkyon/iis_install_simplify
Simplify IIS installation instructions, refer to stable download
2012-09-17 16:06:58 -07:00
Sean Harvey
6ab04a6a55 Refer to setColumns in deprecation message instead of non-existent setCols 2012-09-18 09:39:08 +12:00
Ingo Schommer
8171b68292 Merge pull request #790 from patbolo/bugfix/7862
FIX 7862
2012-09-17 00:47:58 -07:00
Sam Minnée
651f45e0e4 Merge pull request #782 from tractorcow/3.0-index-generation-fixes
FIXED: Generation of table indexes
2012-09-16 23:43:17 -07:00
Elliot Sawyer
71758c782f ISSUE 7833: Invoke ShortcodeParser on RestfulServer output 2012-09-17 17:53:51 +12:00
Sean Harvey
9c2be0f025 Merge branch '3.0' 2012-09-17 15:16:52 +12:00
Sean Harvey
40c3af37c2 Merge tag '3.0.2' into 3.0 2012-09-17 14:27:42 +12:00
Sean Harvey
ea35b08634 Added 3.0.2 changelog (and added missing 3.0.1 changelog to the list) 2012-09-17 13:25:31 +12:00
Sean Harvey
b6c1a64b7d Fixed link to RC3 changelog 2012-09-17 12:31:24 +12:00
Sean Harvey
a6f5b99a5c Formatted warnings correctly 2012-09-17 12:24:45 +12:00
Will Rossiter
2613739079 Merge pull request #799 from chocnut/3.0
Updated default controller and template link to documentation
2012-09-14 22:37:52 -07:00
Peter Indiola
581da54d54 Updated default controller and template link to documentation 2012-09-15 13:09:51 +08:00
Will Rossiter
70ef6bd64f Merge pull request #798 from chocnut/patch-1
Update docs/en/topics/forms.md
2012-09-14 21:12:00 -07:00
Peter Indiola
7f3f560a60 Update docs/en/topics/forms.md
Minor update to line 79 of the Form Fields sample code. Missing comma for the next field. throws error when using the code.
2012-09-15 09:06:37 +08:00
Will Rossiter
86dc36ca21 Merge pull request #795 from theorytank/3.0
FIX: collateFamilyIDs() nested groups throws error
2012-09-14 14:20:26 -07:00
Will Rossiter
15f40af4eb Merge pull request #794 from creamarketing/ListboxField_Inconsistency
FIX: ListBoxField and DropdownField should respect getSource()
2012-09-14 14:11:01 -07:00
stozze
499b7c9ff9 BUGFIX Fix to prevent unintended results from getComponentsQuery(...)
Wrapped $filter inside parentheses to prevent unintended results if $filter contains "OR".
2012-09-14 18:31:37 +03:00
Josh
399b2a23da FIXED: collateFamilyIDs() nested groups throws error
http://open.silverstripe.org/ticket/7835
2012-09-14 12:12:37 -03:00
Tom
54d8abcdc7 Bug:ListBoxField and DropdownField does not respect getSource in all Places
In some places source is referenced directly and assumed to be array, while in some places the getSource() method is used instead.
By changing this you have more freedom when extending these classes
2012-09-14 16:08:34 +03:00
Sean Harvey
758b4fd173 Upgrading TinyMCE dependency to 3.5.6, and updating language packs. 2012-09-14 15:26:17 +12:00
Damian Mooyman
0e997d0285 FIXED: Cleaned up test case, made sure it initialised consistently and correctly
ADDED: Extra assertions to test case to ensure that different expressions of the same index definition were treated as non-changes.
2012-09-14 14:55:07 +12:00
Sean Harvey
7a8c35f4e3 Merge pull request #789 from anselmdk/patch-1
Removed some line breaks for code blocks to render properly in the doc m...
2012-09-12 16:18:30 -07:00
Ingo Schommer
0670a15923 Merge branch '3.0.2' into 3.0 2012-09-13 00:55:00 +02:00
Sean Harvey
1aed488762 Simplify IIS installation instructions, refer to stable download
The documentation was quite verbose, and most of this can be replaced
with instructions on using PHP Manager for IIS which sets up most of
the PHP configuration for us, with small tweaks done afterwards.

In addition, there were references to SVN version control locations
which are long since used, we now refer to stable download locations
on silverstripe.org instead, for SilverStripe as well as the mssql
module.
2012-09-13 10:08:38 +12:00
jean
d1a3c80a9d FIX 7862 Strict equality check on previously selected item in the TreeDropdownField 2012-09-13 09:27:09 +12:00