Hamish Friedlander
93cd339ff0
Merge pull request #3060 from tractorcow/pulls/tinymce-blockquote
...
API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
2014-05-06 11:40:44 +12:00
Damian Mooyman
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +12:00
Michael Parkhill
bd5abb62ff
FIX: parent::init is not called first
...
In the controller's init function, parent::init() should be called before any other method calls.
2014-05-01 15:35:45 +12:00
James Pluck
4fd3015ea4
FIX: corrected link to CMS Alternating Button Page
2014-05-01 10:45:12 +12:00
Damian Mooyman
2e73dcb891
API Remove swf,html,htm,xhtml,xml as default allowed upload able file types
2014-04-29 11:09:30 +12:00
Damian Mooyman
a46f5f133a
Merge pull request #3068 from kinglozzer/patch-1
...
DOCS: Minor fixes to RestfulService documentation
2014-04-29 09:04:29 +12:00
Martin D.
6b3a21653b
Fixed config setting link
2014-04-28 10:31:54 -04:00
Ingo Schommer
280ab2dcd3
Merge pull request #3026 from tractorcow/pulls/3.1-gridfield-paging
...
API Make default gridfield paging configurable
2014-04-28 23:06:23 +12:00
Loz Calver
61f6f2e814
DOCS: Minor fixes to RestfulService documentation
2014-04-28 09:14:27 +01:00
Damian Mooyman
892b440115
API Make default gridfield paging configurable
...
Documentation improved
2014-04-28 15:13:01 +12:00
Damian Mooyman
7188eab905
Merge pull request #3067 from sanjaymundhra/patch-7
...
update 3-forms.md
2014-04-28 10:31:36 +12:00
sanjay
044b68f973
update 3-forms.md
...
adds the missing "/" in the url
2014-04-23 17:19:41 +05:30
Jim Tittsler
8acb28ffc5
remove leading tab
...
fix rendering
2014-04-23 14:50:34 +09:00
Damian Mooyman
d16db2d4f4
API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
...
This is legacy behaviour which does not often reflect the expected behaviour of the current editor. indent and outdent can (in some situations) prefer to use margin instead of padding. sapphiremce_cleanup faultily assumes that such indented text should be block quoted, and replaces this with a block quote element. This is not necessary, since the blockquote element can be placed explicitly by the user when necessary.
To replicate the incorrect indentation behaviour, configure tinymce to use the 'lists' plugin (via admin/_config.php) and attempt to indent some text. Indented text will be unexpectedly replaced with blockquotes.
2014-04-23 12:01:50 +12:00
Damian Mooyman
982ad569b9
Merge remote-tracking branch 'origin/3.1'
2014-04-22 12:09:51 +12:00
muskie9
04f834c317
Update remove extra ); from relation callback function
2014-04-18 14:36:03 -05:00
Simon Welsh
fc9864eed3
Wording fix to forms.md
...
Closes #3032
2014-04-17 17:44:54 +12:00
Martin D.
4535448bce
Fixed small typo
...
ration changed to ratio
2014-04-16 13:26:47 -04:00
Mateusz U
36d925543b
Merge pull request #3020 from tractorcow/pulls/3.1-autocomplete-username
...
API Security.remember_username to disable login form autocompletion
2014-04-11 09:17:27 +12:00
Damian Mooyman
997077ae83
API Security.remember_username to disable login form autocompletion
2014-04-11 09:05:25 +12:00
camfindlay
86aef8a42b
Fixed reference to the templates documentation
2014-04-09 18:27:43 +12:00
Damian Mooyman
ee487e28f1
Merge remote-tracking branch 'origin/3.1.4' into 3.1
2014-04-08 17:10:28 +12:00
Damian Mooyman
d8836fd488
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-08 17:10:07 +12:00
Damian Mooyman
81b14b4352
Update upgrading docs 3.1.4
2014-04-08 16:19:19 +12:00
Damian Mooyman
b22aaaab1f
3.1.4 upgrading docs
2014-04-08 15:58:17 +12:00
Damian Mooyman
e33e869731
Merge remote-tracking branch 'composer/3.0.10' into 3.1.4
2014-04-08 15:57:57 +12:00
camfindlay
a0607845e4
FIX - missing link url for composer
...
My bad, have amended this.
2014-04-08 13:21:05 +12:00
Damian Mooyman
c87373d095
Add 3.0.10 upgrade docs
2014-04-08 12:30:24 +12:00
camfindlay
026e4be429
Info about getting set up using composer and MAMP
...
Added by request of Gábor Novoszádi from community feedback and thanks to the gist from @kkirsche. I have supplied a link to the gist as it is well written, with permission we may look to rework for direct inclusion at some point :)
2014-04-07 21:59:43 +12:00
Scott McMurray
36763abcec
Update dataobject.md
...
This page is grid-field not gridfield.
2014-04-06 18:35:42 +01:00
Chris Turner
32760555f7
Update datefield.md
...
Removed ; at the end of ->setConfig('dmyfields', true) in the three chain example. Is confusing for new users/developers who are not aware of how to chain methods.
Closes #3006
2014-04-04 09:49:01 +13:00
Damian Mooyman
4c69d42bd2
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:23:39 +13:00
OliBridgman
49232151af
Update index.md
...
topics/templates doesn't exist.
2014-04-02 10:19:47 +13:00
Damian Mooyman
93ca3f7f23
Documentation link fixes
2014-04-01 17:46:08 +13:00
Damian Mooyman
2f91826b28
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-01 17:43:38 +13:00
Damian Mooyman
9230d41186
Include announcement links for security fixes
2014-04-01 17:40:39 +13:00
Damian Mooyman
f2725523ae
3.1.4-rc1 release docs
2014-04-01 11:28:44 +13:00
Damian Mooyman
6ae7d43a5d
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-01 07:56:01 +13:00
Damian Mooyman
cf2a314a50
Added change log to upgrade docs
2014-03-31 16:31:25 +13:00
Damian Mooyman
21f50f44e5
3.0.10-rc1 upgrading docs
2014-03-31 16:07:53 +13:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Simon Welsh
f9c44e4ceb
Merge branch '3.0' into 3.1
...
Conflicts:
model/Versioned.php
view/SSTemplateParser.php
view/SSViewer.php
2014-03-30 18:15:12 +13:00
Martin D
3e05ccb9b7
Fix link to the HtmlEditorField API page
...
Closes #2990
2014-03-30 18:04:17 +13:00
Damian Mooyman
4415a75d93
BUG Fix issue with versioned dataobjects being cached between stages
2014-03-27 13:17:29 +13:00
Sean Harvey
7ecc563783
Merge pull request #2969 from mrsmuneton/3.1
...
Issue 1603, rewrote first sentence - uses the php curl lib
2014-03-20 16:13:22 +13:00
Ray
0b7d617875
Issue 1603, rewrote first sentence - uses the php curl lib
...
Issue 1603, rewrote first sentence - uses the php curl library, enabling connections to remote web services
2014-03-19 20:00:13 -07:00
Damian Mooyman
7c60c73dbb
API Polymorphic has_one behaviour
2014-03-18 09:18:04 +13:00
Zauberfisch
62537c5886
more docs for GridField & ModelAdmin customization
2014-03-16 08:40:50 +00:00
Simon Welsh
26f805fbb3
Merge remote-tracking branch 'origin/3.1'
2014-03-16 13:51:34 +13:00
Ingo Schommer
78f74737b6
Improved SS_Cache docs, moved to /docs
...
We keep having trouble with extended PHPDoc formatting,
and have similar topics covered in Markdown already.
Moved docs, added some details about timeouts and
the theory of caching backends.
2014-03-16 11:55:55 +13:00
