Marijn Kampf
3fc371b24a
Removed trailing : from yml example causing error
...
[Warning] Illegal offset type
Line 597 in \framework\view\Requirements.php
2014-07-15 09:59:43 +01:00
Ingo Schommer
bb03f6ba2f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
sanjay
b5a7be6082
Update simple-contact-form.md
...
corrects the description about the order of the arguments passed while creating Form object.
2014-05-26 14:27:44 +05:30
Damian Mooyman
ec578e5c8a
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:32:22 +12:00
Phill Price
adf478b4e9
Update pagination.md
...
Eror in Limit example
2014-05-08 21:46:30 +01:00
Damian Mooyman
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +12:00
James Pluck
4fd3015ea4
FIX: corrected link to CMS Alternating Button Page
2014-05-01 10:45:12 +12:00
muskie9
04f834c317
Update remove extra ); from relation callback function
2014-04-18 14:36:03 -05:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Zauberfisch
62537c5886
more docs for GridField & ModelAdmin customization
2014-03-16 08:40:50 +00:00
Simon Welsh
d431e98ecf
Merge branch '3.1'
...
Conflicts:
forms/Form.php
forms/FormField.php
security/Member.php
security/MemberLoginForm.php
2014-03-10 22:58:49 +13:00
Damian Mooyman
0cbad41d3b
Rewrote usages of error suppression operator
2014-03-05 15:48:55 +13:00
Ingo Schommer
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Ryan Potter
75de6a2848
Add a reference for setting the Limit of items.
2014-01-31 11:20:17 +13:00
Ingo Schommer
b367dd6237
API Removed Member.LastVisited and Member.NumVisits
2013-10-10 12:35:07 +02:00
Ingo Schommer
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
Ingo Schommer
e7953f3b41
Merge pull request #2474 from wilr/externalcmslink
...
API: Add attributes argument for CMSMenuItem for external links
2013-10-02 02:38:56 -07:00
Will Rossiter
2d0a354405
API: Add attributes argument for CMSMenuItem.
...
Currently help menu item is the only external link in the CMS and the ability for it to work is hardcoded in the template. This request makes the target attribute definable by CMSMenu::add_link().
Adds documentation for how to add a basic external link to the CMS.
2013-10-02 19:06:54 +13:00
Ingo Schommer
455e550d9a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/topics/testing/create-silverstripe-test.md
forms/Form.php
i18n/i18n.php
model/Image.php
2013-09-27 19:22:14 +02:00
Ingo Schommer
12a4a8c9dc
Merge pull request #2430 from wilr/gridfieldactions
...
Add how to for custom GridField row actions.
2013-09-25 12:47:27 -07:00
bhongong
9fa8945f2a
Fix "cms-description-tooltip" reference in code
...
The instruction said to put "cms-description-tooltip" in the addExtraClass but in the sample code it is using "cms-help-tooltip"
2013-09-20 21:12:59 +08:00
Will Rossiter
7a9ef16a0c
Add how to for custom GridField row actions.
2013-09-19 23:38:35 +12:00
Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Kirk Mayo
6bb9386159
BUG: Updating old reference of sapphire to framework
2013-08-14 12:18:55 +12:00
Andrew Short
8a62593754
Merge branch '3.1'
2013-07-10 18:27:19 +10:00
Ingo Schommer
e6011f3aae
Rewritten "extend cms" docs ( #1671 )
...
Hopefully this commit can be reverted once we fix the
layout manager to work with all four directions (north, south, east, west).
A "bookmark bar" makes more sense as an example than having the links
in the menu, and it allows us to illustrate the CMS layout techniques.
2013-07-09 22:15:43 +02:00
Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Ingo Schommer
474dde8012
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
docs/en/reference/grid-field.md
2013-06-24 14:39:09 +02:00
Will Rossiter
d1756a5a58
Update simple-contact-form.md
2013-06-20 18:35:12 +12:00
Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Will Rossiter
e1b1fce31f
Doc cleanup (spelling, line length, grammar)
2013-06-02 13:38:10 +12:00
Will Rossiter
db85f3ca16
FIX extra_requirements to accept non associative arrays.
...
Added unit tests for extra_requirements_js and extra_requirements_css.
Fixed YAML documentation to indicate list syntax.
2013-06-02 13:37:34 +12:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Ingo Schommer
3b02d22989
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02:00
Ingo Schommer
5f91c3724d
Consistently used dollar notation in template docs (see #1794 )
2013-04-26 11:48:59 +02:00
Ingo Schommer
0343a77d30
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:42:04 +02:00
Ingo Schommer
1dda9ae45f
Fixed extra_requirements docs
2013-04-05 15:35:30 +02:00
Ingo Schommer
ef3d974821
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
2013-04-02 02:05:58 +02:00
Ingo Schommer
c08ab18c03
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
admin/javascript/LeftAndMain.AddForm.js
docs/en/reference/requirements.md
2013-04-02 02:00:50 +02:00
Ingo Schommer
f5754c11aa
Contribution guidelines, new bugtracker links
2013-04-02 01:51:40 +02:00
Ingo Schommer
538bf01860
Merge remote-tracking branch 'origin/3.1'
2013-03-27 12:12:16 +01:00
Ingo Schommer
315c03872a
Fixed _config.php references and usage in docs
2013-03-27 12:06:57 +01:00
Ingo Schommer
b0d3f7f3a2
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
api/RSSFeed.php
dev/SapphireTest.php
tests/control/RequestHandlingTest.php
2013-03-26 10:46:41 +01:00
Ingo Schommer
3334eafcb1
API Marked statics private, use Config API instead ( #8317 )
...
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Andrew Short
94f209eb74
Merge branch '3.1'
2013-03-19 22:36:47 +11:00
Ingo Schommer
c7d2d51c6a
Docs - Howto: Customize the Pages List in the CMS
2013-03-18 13:55:15 +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
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