Commit Graph

10815 Commits

Author SHA1 Message Date
Wernervanrun
fade5cce51 Update javascript/HtmlEditorField.js
we only want this .ss-uploadfield-files - else we get all ss-uploadfield-files wich include the ones not related to #tinymce insertmedia
2013-03-07 20:33:02 +01:00
Ingo Schommer
b8e5ebb9e3 Merge pull request #1242 from dhensby/request-patch
API Adding setURL to HTTPRequest object
2013-03-07 11:18:04 -08:00
Ingo Schommer
709f0f5d19 Merge pull request #1248 from kinglozzer/leftandmain_menu_preview_fix
FIX: Prevent opening preview when clicking the link for current page again
2013-03-07 09:46:48 -08:00
Ingo Schommer
634ba76353 Merge pull request #1249 from ryanwachtl/patch-1
Update rich-text-editing.md
2013-03-07 09:45:39 -08:00
miiihi
5af35a89ce ENHANCEMENT Allow multiline comments in SS3 templates 2013-03-07 18:45:07 +01:00
Ingo Schommer
d83950bc2b Merge pull request #1256 from g4b0/xhtml-xml-schema-not-required-31
BUGFIX: Removed XHTML XML declaration requirement
2013-03-07 09:43:20 -08:00
g4b0
13b7386a2f BUGFIX: Removed XHTML XML declaration requirement 2013-03-07 11:35:24 +01:00
Ingo Schommer
d57caa6477 Merge pull request #1247 from ajshort/mml-remove-filtered
BUG: Fix ManyManyList->removeAll() when filters are applied to the query
2013-03-04 00:55:45 -08:00
Ryan Wachtl
3d602998b1 Update rich-text-editing.md
`HtmlEditorField::add_extension('MyToolbarExtension');` was not working for me. I had to use `HtmlEditorField_Toolbar`.
2013-03-02 14:37:09 -06:00
ajshort
b537ee28a2 BUG: Fix ManyManyList->removeAll() when filters are applied to the query
In order to be cross-database compatible and support filters, the IDs to
delete must be retrieved in a sub-query.
2013-03-02 17:23:15 +11:00
Loz Calver
9a1ccd8a67 FIX: Prevent opening preview when clicking the link for current page again 2013-03-01 11:42:34 +00:00
Will Rossiter
1fef42681a Merge pull request #1246 from g4b0/dataobject-hack-removing
Removed code "ad personam"
2013-02-28 11:54:12 -08:00
g4b0
4bd235be8b Removed code "ad personam" 2013-02-28 16:50:53 +01:00
Daniel Hensby
9258485aeb API Adding setURL to HTTPRequest object
The current RootURLController needs to be able to change the url of a
request, so I've added it.
2013-02-28 08:50:53 +00:00
Ingo Schommer
365e8021ba Merge pull request #1239 from ajshort/travis-composer-3.1
Travis Composer Integration (3.1.x)
2013-02-27 02:02:58 -08:00
ajshort
9920e5bc45 Update the Travis build versions to 3.1. 2013-02-27 20:36:18 +11:00
Ingo Schommer
39789529d7 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/control/HTTPResponseTest.php
	tests/travis/before_script
2013-02-27 10:27:22 +01:00
Ingo Schommer
64b465f0cb Merge pull request #1143 from svandragt/3.1
ENHANCEMENT Sort menu items according to priority descending, then title ascending
2013-02-27 01:25:49 -08:00
Ingo Schommer
af52de97e9 Merge pull request #1161 from chillu/pulls/uploadfield-replacefile
NEW Upload->replaceFile setting
2013-02-27 01:24:27 -08:00
Ingo Schommer
e6fffb9ef9 API Remove content-length setting in HTTPResponse
It's not reliable. Started in c69381c33, but only partially reverted.
2013-02-27 10:07:54 +01:00
Ingo Schommer
7c0240cec1 Merge pull request #1238 from ajshort/travis-composer-3.0
Travis Composer Integration (3.0.x)

Conflicts:
	tests/travis/before_script
2013-02-27 10:02:07 +01:00
ajshort
65b463607e Update versions used in the Travis build. 2013-02-27 00:40:32 +11:00
ajshort
34d524c09f Integrate composer in the Travis build process
Creates a package definition from the framework version being built,
and uses composer to install it into an installer project, as well
as the required modules for testing.
2013-02-27 00:38:40 +11:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/HTTP.php
2013-02-26 13:28:35 +01:00
Ingo Schommer
d888ea5e67 Updated translations 2013-02-26 13:15:00 +01:00
Sam Minnee
fc3239e2d6 Updated translations 2013-02-26 13:58:28 +13:00
Ingo Schommer
8423149819 Merge pull request #1233 from drzax/add-datepicker-chinese-locales
Add zh-CN and zh-TW locale files for jQuery UI datepicker.
2013-02-25 04:16:55 -08:00
Ingo Schommer
a61f5c1244 Fixed composer docs 2013-02-25 12:23:56 +01:00
Ingo Schommer
44cc467fc7 Note about vendor prefixes 2013-02-25 11:58:12 +01:00
Ingo Schommer
567e39cd19 Updated composer docs 2013-02-25 11:47:11 +01:00
Simon Elvery
384f173a7f Add zh-CN and zh-TW locale files for jQuery UI datepicker. 2013-02-25 16:54:27 +10:00
Sam Minnee
efb4760244 Fixed invalid classname in test 2013-02-25 16:44:54 +13:00
Sam Minnee
88b3901a69 Check for object type before calling method, prevent fatal error in failing test. 2013-02-25 16:33:55 +13:00
Sam Minnee
b2dfa77056 FIX: Ensure that Director::test() doesn't return a string 2013-02-25 16:27:44 +13:00
Sam Minnee
57952977c7 Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex
Conflicts:
	docs/en/reference/index.md
2013-02-25 15:05:15 +13:00
Sam Minnee
5734c2b3de Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex
Conflicts:
	docs/en/reference/index.md
2013-02-25 15:03:46 +13:00
Sam Minnée
b90e0c0955 Merge pull request #1230 from oddnoc/3.1-restfulservice-error-check
BUG: Fetch curl_error in RestfulService
2013-02-24 17:59:32 -08:00
Sam Minnée
da109a07c1 Merge pull request #1231 from oddnoc/3.1-restfulservice-option-merge-fix
BUG: Correct semantic error regarding cURL options in RestfulService
2013-02-24 17:59:08 -08:00
Sam Minnée
351f079a7e Merge pull request #1224 from silverstripe-rebelalliance/feature/shortcodes
Two more small fixes for new Shortcode Parser
2013-02-24 17:54:22 -08:00
Fred Condo
d3b3ab806d BUG: Fetch curl_error in RestfulService
$curlError was used only once and never defined. Replace $curlError with
a call to curl_error($ch).
2013-02-22 17:41:55 -08:00
Fred Condo
bd73142bcf BUG: Correct semantic error regarding cURL options in RestfulService
cURL options are numeric, and array_merge is destructive of numeric
keys. Replace array_merge calls with array union operator, with defaults
on right-hand side so that passed options override defaults.
2013-02-22 17:39:01 -08:00
Jeremy Bridson
de641dd544 ENHANCEMENT: updated the reference index on doc.silverstripe.com 3.0 - There were lots of broken and missing links 2013-02-22 12:58:29 +13:00
Hamish Friedlander
7afcd64418 FIX Make ShortcodeParser obey error_behavior in attribute scope 2013-02-22 11:34:15 +13:00
Hamish Friedlander
1ee01c39d4 FIX ShortcodeParser producing bad output after escaped tag
Also tightens up matching of shortcodes so we dont match on invalid shortcodes
2013-02-22 10:30:51 +13:00
Ingo Schommer
67b2d3faa0 Added note on module translations 2013-02-20 13:32:27 +01:00
Ingo Schommer
094db0f4ab Fixed composer install instructions
We've switched the installer to use @stable flags by default,
so those need to be explicitly removed when checking out a dev version.
2013-02-20 13:25:44 +01:00
Ingo Schommer
25af4adce2 Merge tag '3.0.5' into 3.0 2013-02-20 02:21:41 +01:00
Ingo Schommer
9ceef6be07 Added changelog 2013-02-20 00:39:00 +01:00
Sean Harvey
8a70019e78 Merge pull request #1213 from silverstripe-rebelalliance/feature/shortcodes
FIX issues with new shortcode parser
2013-02-19 14:12:28 -08:00
Hamish Friedlander
76fdb2a2d6 FIX ShortcodeParser#parse in < PHP 5.3.6 where saveHTML doesnt take arg 2013-02-20 10:57:06 +13:00