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
Hamish Friedlander
cbef44b8d6
FIX Make ShortcodeParser#parse passthrough not error on invalid HTML
2013-02-20 10:57:06 +13:00
Hamish Friedlander
5bbf94d2f4
FIX HTML5 parser not tracking context correctly
2013-02-20 10:57:06 +13:00
Daniel Hensby
4e36020118
BUG UnsavedRelationList aren't checked
...
When saveInto is called on ListboxField and CheckboxsetField,
UnsavedRelationList should be an acceptable relationship type. This is
leading to relations not being saved on initial creation of Member
objects
2013-02-19 14:58:31 +00:00
roed
9e7c622abe
fixed error property $ of object is not a function
...
changed $ to jQuery, because without it the system would generate the following error:
Uncaught TypeError: Property '$' of object [object Window] is not a function
2013-02-19 15:48:29 +01:00
Ingo Schommer
16d0c188ee
BUG Find Form actions in CompositeFields for access checks
...
This bug was introduced with the new nested CMS actions
around December 2012, but wasn't noticed until now
because checkAccessAction() would wrongly return TRUE
before the dataFieldByName() check was reached.
2013-02-19 15:48:29 +01:00
Daniel Hensby
1cf2259b2c
BUG Undefined var
...
Getting the curl error.
2013-02-19 12:07:22 +00:00
Ingo Schommer
876c660018
Merge pull request #1195 from chillu/pulls/deprecate-scheduled-tasks
...
API Deprecated ScheduledTask and subclasses
2013-02-19 01:01:53 -08:00
Ingo Schommer
aa0d4e6c90
Merge pull request #1202 from roed/3.1
...
fixed error property $ of object is not a function
2013-02-19 00:25:52 -08:00
roed
396af557df
fixed error property $ of object is not a function
...
changed $ to jQuery, because without it the system would generate the following error:
Uncaught TypeError: Property '$' of object [object Window] is not a function
2013-02-19 09:20:29 +01:00
Sean Harvey
29de6431fd
Merge pull request #1199 from drzax/patch-1
...
Update docs/en/installation/composer.md
2013-02-18 17:48:58 -08:00
drzax
fc0a81fef4
Update docs/en/installation/composer.md
...
No need to talk down to people in documentation.
2013-02-19 11:19:50 +10:00
Will Rossiter
813730b96e
Merge pull request #1197 from dhensby/patch-2
...
Remove redundant extraClasses from FieldActions
2013-02-18 14:47:45 -08:00
Will Rossiter
d00fa67f3e
Merge pull request #1196 from Instagraeme/patch-1
...
Correct exception message in form constructor
2013-02-18 14:44:13 -08:00
Daniel Hensby
b7e34bd54c
Removing redundant function
...
At the moment form actions (buttons) have the classes 'action action' as default. This is because the extraClass function adds 'action' and then calls the parent method. The parent then includes the $this->Type() ('action') again.
So I've remove this overloading of extraClass
2013-02-18 16:38:15 +00:00
Graeme Smith
a1114b8fcb
MINOR: Correct exception message in constructor
2013-02-18 15:01:48 +00:00
Ingo Schommer
43fb566388
Note about RestfulService SSL verification in upgrading guide
2013-02-18 15:59:15 +01:00
Ingo Schommer
0c6ac1960e
Fixed whitespace usage
2013-02-18 15:43:52 +01:00
Ingo Schommer
fe04753be2
Merge branch '3.1.0-beta2' into 3.1
2013-02-18 15:37:35 +01:00
Ingo Schommer
14dcc82e76
BUG Find Form actions in CompositeFields for access checks
...
This bug was introduced with the new nested CMS actions
around December 2012, but wasn't noticed until now
because checkAccessAction() would wrongly return TRUE
before the dataFieldByName() check was reached.
2013-02-18 15:30:36 +01:00
Ingo Schommer
92458d9f43
Fixed line lengths
2013-02-18 14:41:49 +01:00
Ingo Schommer
bb724c43b9
Merge pull request #1142 from chillu/pulls/remove-auto-controller-routing
...
API Removed auto-routing of controller name
2013-02-18 05:30:37 -08:00
Ingo Schommer
957469d770
API Removed auto-routing of controller name
...
Use custom routing rules to achieve this effect (see changelog)
2013-02-18 14:29:47 +01:00
Ingo Schommer
a841f22004
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:19:36 +01:00
Ingo Schommer
af96432c1e
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
api/RSSFeed.php
2013-02-18 14:18:54 +01:00
Ingo Schommer
a86e4ee00c
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/injector/InjectorTest.php
tests/travis/before_script
2013-02-18 14:15:42 +01:00
Ingo Schommer
6c30b80257
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:14:30 +01:00
Ingo Schommer
9e2e050f20
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:13:07 +01:00
Ingo Schommer
88867cdd23
API Deprecated ScheduledTask and subclasses
...
Base CliController or BuildTask instead, with custom cron job intervals.
2013-02-18 14:01:15 +01:00
Daniel Hensby
8d32ae954b
BUG setBody on SS_HTTPRequest is a function
...
When settingt he cached body on the RESTfulService_Response, the setBody should be a function call, not a variable assignment
2013-02-18 11:55:11 +00:00
Ingo Schommer
2b3098a3f4
Merge pull request #1194 from ARNHOE/patch-4
...
Create nl_NL.js for framework admin
2013-02-18 03:15:20 -08:00
ARNHOE
924c76ccb1
Create nl_NL.js
2013-02-18 03:13:09 -08:00
Ingo Schommer
2ee57eb715
Merge pull request #1193 from ARNHOE/patch-3
...
Update javascript/lang/nl_NL.js
2013-02-18 03:11:47 -08:00
ARNHOE
823b2acda3
Update javascript/lang/nl_NL.js
2013-02-18 12:09:38 +01:00
Ingo Schommer
89f963c468
Merge pull request #1191 from ARNHOE/patch-1
...
Create nl.js for ssbuttons
2013-02-18 02:26:33 -08:00
Ingo Schommer
32943dff1b
Merge pull request #1192 from ARNHOE/patch-2
...
Create nl.js for ssmacron
2013-02-18 02:25:58 -08:00
ARNHOE
7e88e67621
Create nl.js
2013-02-18 02:20:50 -08:00
ARNHOE
70d20ada3a
Create nl.js
2013-02-18 02:20:02 -08:00
Simon Welsh
b81386a431
Correct check for File subclass
2013-02-18 17:35:17 +13:00
Hamish Friedlander
7ec8ebbf9e
Add 3.1.0-beta2 changelog
2013-02-18 17:09:22 +13:00
Hamish Friedlander
baf894d84a
FIX CDATA sections in HTML5 are invalid so remove from test
2013-02-18 17:02:11 +13:00
Hamish Friedlander
1f4c8174e6
FIX new ShortcodeParser handling of empty strings and escapes
2013-02-18 17:00:42 +13:00
Sean Harvey
db56d17056
Merge pull request #1190 from silverstripe-rebelalliance/feature/shortcodes
...
NEW Make shortcode parser more clever about placement
2013-02-17 19:00:14 -08:00
Hamish Friedlander
9ecea763c3
Merge pull request #1186 from nyeholt/injector_configged_create
...
FIX issue with Injector::create not passing args
2013-02-17 18:38:24 -08:00