Andrew Short
94f209eb74
Merge branch '3.1'
2013-03-19 22:36:47 +11:00
Andrew Short
b8a51c3792
Merge branch '3.0' into 3.1
2013-03-19 22:27:09 +11:00
Stephen Shkardoon
2ead2ba60f
Removed invalid characters
...
No idea what those characters were meant to be, so I removed them.
2013-03-16 23:17:02 +13:00
Andrew Short
bc941c18b6
Merge branch '3.1'
2013-03-15 21:58:37 +11:00
Andrew Short
6ae931df24
Merge branch '3.0' into 3.1
2013-03-15 21:47:23 +11:00
Dan
4a12d6db3c
Minor: Two modules are listed as three.
...
...for example "framework" and "cms". These three modules... Should be two modules, or perhaps there is a third missing from the list.
2013-03-08 10:10:04 -05:00
Ingo Schommer
64888c07b7
Partially revert docs commit 7710cf59
...
i18n.js doesn't support named parameters (yet)
2013-03-04 08:48:16 +01: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
Ingo Schommer
ce66bc1eaf
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/travis/before_script
2013-02-27 13:34:03 +01: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
567e39cd19
Updated composer docs
2013-02-25 11:47:11 +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
Hamish Friedlander
5fd55a50f2
API Tighten up allowed_actions
...
allowed_actions is now only allowed to reference public methods defined
on the same Controller as the allowed_actions static, and
the wildcard "*" has been deprecated
2013-02-18 14:53:33 +13:00
Hamish Friedlander
7efae6b95f
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-02-18 14:31:57 +13:00
Ingo Schommer
d51e0bc2ec
Improved docs on $allowed_actions
...
Added section to "Controllers" and "Form" topics,
added $allowed_actions definitions to all controller examples
2013-02-17 23:30:40 +01:00
Daniel Hensby
77476de917
Change to how environment file is found
...
The _ss_environment.php file can now be in any parent folder of the framework (according to realpath())
Removing the description of '3 levels deep' and replaced with explanation of infinite depth.
2013-01-30 15:19:53 +00:00
Ingo Schommer
634c91c6ff
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
email/Mailer.php
2013-01-30 12:46:24 +01:00
Hamish Friedlander
acfc0be471
Document that yaml files shouldnt be served directly
2013-01-29 14:11:52 +13:00
Sean Harvey
1f1b115ef9
Fixing code formatting
2013-01-24 13:44:23 +13:00
Sean Harvey
3aa2cdccba
Fixing code formatting in rich-text-editing docs
2013-01-24 12:50:55 +13:00
Ingo Schommer
6b4d1a7570
Merge pull request #1127 from mateusz/tinymce-docs
...
Add docs on how to customise the TinyMCE editor.
2013-01-23 14:54:09 -08:00
Mateusz U
141538f678
Add docs on how to customise the TinyMCE editor.
...
Fix whitespace problems.
2013-01-24 10:54:14 +13:00
Ingo Schommer
4892c11aaa
Clarified docs on isDev usage in dev/build
2013-01-22 14:29:58 +01:00
Ingo Schommer
c11b3918fc
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
core/PaginatedList.php
email/Mailer.php
2013-01-21 11:14:57 +01:00
Ingo Schommer
2e6e0de44d
Clarified DataList->limit() docs
2013-01-15 10:14:55 +01:00
Ingo Schommer
f3c0669fec
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
_config/uploadfield.yml
css/UploadField.css
forms/UploadField.php
scss/UploadField.scss
templates/UploadField.ss
tests/forms/uploadfield/UploadFieldTest.php
2013-01-11 10:02:39 +01:00
drzax
f6ab5a4020
Update docs/en/topics/i18n.md
...
Make the documentation more clear and 3.x specific. Especially around template translations.
2013-01-09 12:46:09 +10:00
Ingo Schommer
d13c53fda6
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/model/DataQueryTest.php
2012-12-14 10:57:28 +01:00
Stig Lindqvist
681a0241e7
DOC Removed link to missing 'extending-the-cms.md'
2012-12-14 16:15:22 +13:00
Ingo Schommer
6571c17992
Merge remote-tracking branch 'origin/3.0'
2012-12-11 17:16:19 +01:00
Ingo Schommer
e8fbfc0bd1
NEW FixtureFactory separated out from YamlFixture
...
Enables more generic use of the fixture facilities
without dependency on the YAML format, for example
when creating fixtures from Behat step definitions.
Note: The YamlFixture class needs to be created via
Injector::inst()->create('YamlFixture') now,
direct instantiation is no longer supported.
2012-12-11 17:06:27 +01:00
Ingo Schommer
fa84c2d705
Merge remote-tracking branch 'origin/3.0'
2012-12-10 17:50:43 +01:00
Simon Welsh
5ca000d0a5
Correct routing rule block indentation
2012-12-07 08:15:53 +13:00
Ingo Schommer
a108f67476
Merge pull request #922 from simonwelsh/rellist-presave
...
NEW: Allows setting of has_many and many_many relations before writing
2012-12-04 01:25:15 -08:00
Will Rossiter
100ad658db
Email doc formatting
...
Workaround markdown parser throwing a fit with code straight after list.
2012-12-04 20:00:09 +13:00
Will Rossiter
bf67679155
Fix typo in email docs.
2012-12-04 19:56:36 +13:00
Ingo Schommer
0dba1485a5
Merge remote-tracking branch 'origin/3.0'
2012-11-28 16:36:21 +01:00
Simon Welsh
bbc4443af7
NEW: Allows setting of has_many and many_many relations before writing
...
Adds a new wrapper list, UnsavedRelationList, that maintains the relations until
writing, where it is converted into the correct RelationList.
2012-11-28 09:37:08 +13:00
Adam Judd
2d8b7daaf9
Add limit() details to datamodel.md
2012-11-26 23:59:31 -08:00
Ingo Schommer
c55c7c33f8
Merge branch '3.0'
...
Conflicts:
admin/code/CMSProfileController.php
composer.json
tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Ingo Schommer
32f829d094
NEW Support for Behat tests, and initial set of tests
2012-11-16 15:31:55 +13:00
Ingo Schommer
4fcdfe8d64
Testing docs recommend "phpunit" over "sake"
...
- Moved some docs around to reflect this change
- Described how to symlink from vendor/bin/phpunit
- Added note about browser-runs not being recommended
- Added more examples on how to run through "sake",
to complement the existing descriptions for "phpunit"
2012-11-15 14:15:46 +01:00
Ingo Schommer
0a580deb3f
Documenting PHPUnit install through composer
2012-11-15 13:40:07 +01:00
Andrew O'Neil
fdea5321c7
APICHANGE: add_extension() is now called directly on the class, instead of on Object
2012-11-07 11:07:55 +13:00
Sean Harvey
fbc6e3366b
Merge branch '3.0'
2012-11-05 15:11:48 +13:00
Simon Welsh
8a0f234acf
Merge pull request #870 from chillu/pulls/datalist-filterany
...
NEW DataList->filterAny()
2012-11-02 16:17:48 -07:00
Ingo Schommer
80f40c6070
Merge pull request #907 from stojg/docs-forms-7727
...
MINOR: Fixes to the topics/forms.md
2012-10-31 15:19:29 -07:00
stojg
5ca1d5b228
BUG Fixes to the topics/forms.md documentation
...
- Added an example on how to setup a controller with a form
- Notice about adding form methods to $allowed_actions
- Using the FormField::create() in all examples
- Corrected some errors in the examples that did not work
- Aligned docs to use 120 chars lines
2012-11-01 11:14:06 +13:00
Ingo Schommer
a7753dfa5b
Moved GridField docs to reference
2012-10-30 18:59:26 +01:00