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
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
Ingo Schommer
efabde1416
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
2012-10-30 17:52:49 +01:00
Simon Welsh
b031188080
Updated gridfield docs
...
Fixes GridFieldConfig_RelationEditor example (was the same as RecordEditor) and fixes related links.
2012-10-27 11:30:26 +13:00
Simon Welsh
bedb579b07
Merge branch '3.0'
2012-10-23 15:21:20 +13:00
Ingo Schommer
9e34a989a8
Removed wrong datamodel docs
...
See https://groups.google.com/forum/?hl=en&fromgroups=#!topic/silverstripe-dev/Leh8fN0MjDY
2012-10-16 15:07:47 +02:00
Ingo Schommer
5be3a4c35a
NEW DataList->filterAny()
2012-10-12 15:24:25 +02:00
Sam Minnée
7023669754
Merge pull request #775 from simonwelsh/exclude-filter
...
Exclude filter
2012-10-09 15:58:19 -07:00
Simon Welsh
c49f7566c3
API Allow use of :not, :nocase and :case modifiers to SearchFilters.
...
More modifiers can be added to each class as desired.
2012-10-10 10:26:47 +13:00
Ingo Schommer
e9cf4affc7
Merge remote-tracking branch 'origin/3.0'
2012-10-09 09:32:43 +02:00
Sam Minnee
7d203a9af1
Moved all translator-targeted documentation to contributing/translation and left translation-process for advanced topics relating to module maintainers and the core team.
2012-10-09 14:53:47 +13:00
Sam Minnee
c4d2f9e6b2
Corrected a number of inbound links pointing to the documentation.
2012-10-09 14:53:47 +13:00
Simon Welsh
5768e421dc
Merge branch '3.0'
2012-10-05 14:40:32 +13:00
Hamish Friedlander
11f1c0a5c3
NEW Add documentation for the new config system in 3.0
2012-10-04 16:34:57 +13:00
Ingo Schommer
56f7ce1dcf
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
control/HTTPResponse.php
model/Database.php
model/MySQLDatabase.php
model/SQLQuery.php
view/Requirements.php
view/SSViewer.php
2012-10-03 16:16:19 +02:00
Ingo Schommer
4684601c38
Fixed markdown whitespace usage
2012-10-02 11:38:16 +02:00
Ingo Schommer
fe4f0c92e2
Markdown line endings
2012-10-02 00:02:44 +02: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
e2f073f38a
Method visibility according to coding conventions
2012-09-20 10:46:59 +02:00
Sean Harvey
9c2be0f025
Merge branch '3.0'
2012-09-17 15:16:52 +12:00
Peter Indiola
7f3f560a60
Update docs/en/topics/forms.md
...
Minor update to line 79 of the Form Fields sample code. Missing comma for the next field. throws error when using the code.
2012-09-15 09:06:37 +08:00
Ingo Schommer
1088d044c5
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
.travis.yml
2012-09-07 17:21:41 +02:00