Commit Graph

9798 Commits

Author SHA1 Message Date
Sean Harvey
e4ab02e1c3 Merge branch '3.0' 2012-09-27 10:39:31 +12:00
Ingo Schommer
61148834f2 Merge pull request #824 from nyeholt/tab_null_pointer
BUG Fixed possible reference to null string
2012-09-26 02:31:13 -07:00
Ingo Schommer
33f67e1ad8 Fixed FulltextSearchable regression from 21a6390d 2012-09-26 11:28:25 +02:00
Howard Grigg
aa6f345d1d API FormField::name_to_label() for unlabelled fields
Will convert camel case to spaces, e.g. "TotalAmount"
to "Total Amount".
2012-09-26 11:20:34 +02:00
Ingo Schommer
21a6390d7f Merge pull request #817 from tractorcow/3.0-file-index-update
FIXED: Minor adjustment to order of file fulltext search fields.
2012-09-26 02:15:05 -07:00
Marcus Nyeholt
da70dc469c BUG Fixed possible reference to null string
Hashlink for tabs in the backend didn't check the existence of
the href value before trying to .replace it.
2012-09-26 16:27:50 +10:00
Ingo Schommer
93c00ec80a Merge pull request #819 from howardgrigg/patch-3
Correct brush name in template docs to avoid js popup
2012-09-25 05:33:04 -07:00
Howard Grigg
69e9876059 Correct brush name in template docs to avoid js popup 2012-09-25 22:27:30 +10:00
Sean Harvey
92e62ebb91 Merge pull request #812 from chillu/pull/sitetree-meta-removal
Removed SiteTree.MetaTitle and MetaKeywords usage
2012-09-24 21:15:20 -07:00
Sean Harvey
2654290848 Merge pull request #811 from wilr/removestatic
API: Remove static main and dev/buildcache
2012-09-24 19:12:35 -07:00
Sam Minnée
95005818c3 Merge pull request #818 from tractorcow/3.0-duplicate-field-description-fix
FIXED: Issue with duplicate help tips appearing on select fields in CMS
2012-09-24 18:42:25 -07:00
Damian Mooyman
495ffb033c FIXED: Issue with duplicate help tips appearing on select fields in CMS. See Security / Groups / Edit Group form field for example. 2012-09-25 13:37:17 +12:00
Damian Mooyman
cd7ea01bd1 FIXED: Minor adjustment to order of file fulltext search fields. By matching the order of these index columns to the same as the fields on the table itself, this will prevent the unnecessary regeneration of fulltext indexes on some database connectors each dev/build, notably MS SQL Server. 2012-09-25 12:31:50 +12:00
Simon Welsh
2b172aa891 Merge branch 'patch-2' of https://github.com/anselmdk/sapphire into 3.0 2012-09-24 18:22:49 +12:00
Sean Harvey
8806fd18c5 MINOR Upgrading TinyMCE dependency from 3.5.6 to 3.5.7 2012-09-24 15:05:50 +12:00
Simon Welsh
0470219cb1 FIX Output the title of the task instead of Array when listing in the CLI 2012-09-24 13:37:48 +12:00
Sam Minnée
200f184933 Merge pull request #808 from simonwelsh/stack-sqlquery
API Allow subgroups in the WHERE clause of a Data/SQLQuery
2012-09-23 18:08:23 -07:00
Anselm Christophersen
0df9b1c8a0 added CroppedImage 2012-09-23 19:46:06 +03:00
Sean Harvey
0b17e0036a BUG Fixing percent encoding issues with saveHTML 2012-09-23 22:28:42 +12:00
Ingo Schommer
cc702df8bb Merge pull request #814 from Zauberfisch/master
HTTPRequest and HTTPResponse now return $this on all setters
2012-09-22 02:10:43 -07:00
Zauberfisch
7f1b6cfe26 MINOR: HTTPRequest and HTTPResponse now return $this on all setters
MINOR: also added some docs
2012-09-21 22:20:12 +00:00
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
Will Rossiter
e72114dad7 API: Remove static main and dev/buildcache
Files moved to a separate module (silverstripe-static).
2012-09-21 19:56:56 +12:00
Simon Welsh
6d696d506f API Allow subgroups in the WHERE clause of a Data/SQLQuery
Adds three extra methods to Data/SQLQuery query that allow for starting
a disjunctive subgroup, a conjunctive subgroup and for ending a subgroup.

Database::sqlWhereToString() now builds up the WHERE clause one by one
instead of with a straight implode. Uses a stack to know which conenctive
to use.
2012-09-21 14:59:47 +12: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