tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-01 23:37:43 +02:00
Code Issues Projects Releases Wiki Activity
13,001 Commits 29 Branches 525 Tags 150 MiB
a73c3574e2
Commit Graph

967 Commits

Author SHA1 Message Date
Loz Calver
a73c3574e2 FieldList->insertBefore/After now accept arguments in either order (fixes #2737) 2014-03-15 11:32:51 +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
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1 
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
 2014-03-10 22:56:27 +13:00
Simon Welsh
21f462a77b Update nginx.md 
Provides a nginx.conf that follows nginx good practices and duplicates the functionality of
the .htaccess files in framework, cms and installer.
 2014-03-10 22:48:22 +13:00
Tim Snadden
07ca70fce4 Update composer.md 2014-03-10 11:13:19 +13:00
Damian Mooyman
0cbad41d3b Rewrote usages of error suppression operator 2014-03-05 15:48:55 +13:00
Damian Mooyman
6d5d3d8cb7 Rewrote usages of error suppression operator 2014-03-05 14:22:19 +13:00
Simon Welsh
ccb791995e Merge pull request #2894 from wilr/3.1-manymanyyaml 
Add support for many_many_extraField in YAML
 2014-03-04 11:35:58 +13:00
torleif
c3994f4ce7 Update preview.md 
The JavaScript entwine example contains an extra jQuery wrapper
 2014-03-04 11:32:45 +13:00
sanjay
fb0fe3e689 Update 1-building-site 
Possessive pronoun "your" was misspelled as "you"...so the required change performed.
 2014-03-03 15:24:10 +05:30
mullerivan
a7d1991f70 Update css.md 2014-03-03 02:40:33 -02:00
Ingo Schommer
ae31362e21 Merge pull request #2867 from oddnoc/form-docs-consolidation 
Combine form validation topic with forms topic
 2014-03-03 10:32:04 +13:00
Ingo Schommer
c4ca3b1da4 Merge pull request #2870 from svandragt/patch-1 
Better visibility of key phrasing
 2014-03-03 10:30:55 +13:00
Ingo Schommer
3023639354 Merge pull request #2886 from KarlKl/patch-1 
Silverstripe.com is not this version
 2014-03-03 10:30:35 +13:00
Ingo Schommer
f00672bb83 Merge pull request #2889 from howardgrigg/patch-1 
MINOR Corrected links for 'Topics' documentation index
 2014-03-03 10:30:07 +13:00
Ingo Schommer
edd9738957 Merge pull request #2898 from torleif/patch-1 
Update shortcodes.md
 2014-03-03 10:29:56 +13:00
Ingo Schommer
b489f40866 Added 3.0.9 changelog 2014-03-03 10:19:08 +13:00
Ingo Schommer
ead3e26378 Added 3.1.3 changelog 2014-03-03 08:54:18 +13:00
torleif
56e0c72cb0 Update shortcodes.md 
Trying to link to [embed] causes the parser to break. (see: http://doc.silverstripe.org/framework/en/reference/shortcodes)
 2014-02-26 13:39:14 +13:00
Will Rossiter
8b92300622 Add support for many_many_extraField in YAML 
Format is

RelationName:
  - =>Obj.name:
    ExtraFieldName: "Foo"
 2014-02-24 22:03:53 +13:00
Ingo Schommer
d6b75acbc4 Added 3.1.3-rc2 changelog 2014-02-24 10:08:09 +13:00
Howard Grigg
733bc42dd7 MINOR Corrected links for 'Topics' documentation index 2014-02-22 17:16:07 +10:00
Will Morgan
6e0a65f293 Removing broken reference to "getNextID()" 
It doesn't exist.
 2014-02-21 15:24:01 +00:00
KarlKl
2ae65a6f3d Silverstripe.com is not this version 
On Silverstripe.com(http://doc.silverstripe.com/framework/en/3.0/topics/shortcodes) is an older version of this file.
From the "Built-in Shortcodes"-heading down to the bottom the page is marked as code.

Cheers
K
 2014-02-21 09:04:53 +01:00
sanjay
fff9222dd3 update dataobject.md 
fixex typo
 2014-02-20 16:40:47 +05:30
Fred Condo
46695d3b4b Combine form validation topic with forms topic 
- Proofread entire file (forms & form validation topics)
- Re-wrap paragraphs to 80 columns
- Correct/update links from other doc files
 2014-02-19 13:43:17 -08:00
Sander van Dragt
ced49d9090 Better visibility of key phrasing 2014-02-19 11:25:44 +00:00
Ingo Schommer
6ba7b2e3d8 Added changelog links 2014-02-19 15:40:16 +13:00
Ingo Schommer
2bc62f2e71 Added changelog links 2014-02-19 15:39:54 +13:00
Ingo Schommer
4af711613f 3.1.3-rc1 changelog 2014-02-19 15:24:04 +13:00
Ingo Schommer
ec02df2160 Removed SS-2014-002 from changelog, not backported to 3.0 2014-02-19 15:22:12 +13:00
Ingo Schommer
a6f794c3b9 Added 3.0.9-rc1 changelog 2014-02-19 15:20:24 +13:00
Tom Densham
f2568f8489 FIX Requirement documentation of MySQL driver 
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
 2014-02-18 23:06:29 +13:00
Ingo Schommer
d8361f9d3f Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:59 +13:00
Ingo Schommer
1930add745 Note about SiteTree.ExtraMeta in security docs 2014-02-18 16:07:50 +13:00
Ingo Schommer
9b57609fcd Merge pull request #2853 from hafriedlander/feature/htmltext_whitelist 
NEW Allow specifying element whitelist in HTMLText fields
 2014-02-18 15:38:30 +13:00
Hamish Friedlander
d6630d240a NEW Allow specifying element whitelist in HTMLText fields 2014-02-18 14:02:04 +13:00
Ingo Schommer
53a699527e Preliminary 3.1.3 changelog 2014-02-18 11:44:08 +13:00
Sean Harvey
03f14565b5 Merge pull request #2841 from chillu/pulls/dateformat-simplified 
API Default to "yyyy-MM-dd" for date format
 2014-02-17 14:05:39 +13:00
Ingo Schommer
6906c9bd1a API Removed auto-detection for i18n date/time formats 
Default to "yyyy-MM-dd" for date format, and "H:mm" for time_format.
Switched to config API for setting/getting values.

Avoid using "MMM" in particular, since it causes
inconsistencies in month names between jQuery UI and Zend_Locale_Format.

Fixes https://github.com/silverstripe/silverstripe-cms/issues/544
 2014-02-16 23:57:49 +13:00
Tom Densham
8b3d74ed0f FIX Requirement documentation of MySQL driver 
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
 2014-02-14 13:29:54 +00:00
Sam Minnee
346d3edb37 Merge branch '3.1' 2014-02-13 17:58:30 +13:00
Hamish Friedlander
a0b21d7433 Merge pull request #2844 from chillu/pulls/security-mailinglist-docs 
Documented security pre announce mailinglist
 2014-02-12 15:32:24 +13:00
Ingo Schommer
5e29249593 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	search/filters/PartialMatchFilter.php
 2014-02-12 15:18:27 +13:00
Ingo Schommer
1121603da9 Documented security pre announce mailinglist 
See https://groups.google.com/forum/#!topic/silverstripe-dev/0mjNBaSP8vE
for details
 2014-02-12 14:37:47 +13:00
Sean Harvey
9048eab4a2 Merge branch '3.1' 2014-02-12 11:06:54 +13:00
Matt Kirwan
7b1f1a5e4d Updated add-on URL. 2014-02-07 15:48:34 +00:00
Ingo Schommer
4af9143d3b Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/code.md
 2014-02-07 16:43:22 +13:00
Ingo Schommer
1e2a2ca969 Merge pull request #2831 from silverstripe-rebelalliance/fixingURLs 
NEW: Updating out of date URLs in the framework source code and docs
 2014-02-07 16:16:24 +13:00
Kirk Mayo
632884252b NEW: Updating out of date URLs in the framework source code and docs 2014-02-07 15:10:44 +13:00