tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,851 Commits 31 Branches 527 Tags 162 MiB
49cafeeaf1
Commit Graph

16851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
d64fedd5e1
Merge pull request #7927 from 3Dgoo/patch-3 
Fixing FormAction API documentation
 2018-03-15 16:12:20 +13:00
3Dgoo
05b2979458
Update FormAction.php 2018-03-15 13:38:15 +10:30
Daniel Hensby
2c6f588785
Merge branch '3.6' into 3 2018-03-14 13:53:37 +00:00
Daniel Hensby
a7931e7a11
Merge branch '3.5' into 3.6 2018-03-14 13:49:29 +00:00
3Dgoo
1d74b3a22d
Update FormAction.php 2018-03-14 13:34:12 +10:30
3Dgoo
97f22cbaa5
Fixing FormAction API documentation 
The API documentation for FormAction is currently broken:
http://api.silverstripe.org/3/FormAction.html

This is because there are unescaped tags in the class description.

This fix changes the tag in the description to be escaped.
 2018-03-14 11:27:15 +10:30
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6 2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5 Updated the DocBlock for ManyManyList's add() method 2018-03-11 14:49:17 -06:00
Daniel Hensby
cf35aadfe5
Merge pull request #7904 from 3Dgoo/patch-2 
Fixing HTMLEditorField API documentation
 2018-03-01 13:03:08 +00:00
3Dgoo
6523d7a6eb
Fixing HTMLEditorField API documentation 
The API documentation for HTMLEditorField is currently broken:
http://api.silverstripe.org/3/HtmlEditorField.html

This is because there is unescaped start textarea tag in the class description. 

This fix changes the tag in the description to be escaped.
 2018-03-01 16:31:46 +10:30
Loz Calver
535d02ffeb
Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father 
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
 2018-02-28 10:06:36 +00:00
Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts 2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2 Remove short array syntax 2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288 Fix indentation 2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063 Back port 4.0 implementation of numeric/assoc key merging for summary_fields 2018-02-27 16:42:44 +13:00
Christopher Joe
86addea1d2 FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated 2018-02-16 23:34:05 +13:00
Daniel Hensby
09726333b7
Merge branch '3.6' into 3 2018-02-13 14:30:59 +00:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6 2018-02-13 14:30:29 +00:00
Daniel Hensby
1bec8a5d0c
Merge pull request #7850 from jonom/singleton-fix-3x 
FIX Singleton creation
 2018-02-13 08:29:47 +00:00
Jonathon Menz
c767e472dc FIX DataObject singleton creation 
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)
 2018-02-12 20:30:35 -08:00
Robbie Averill
1a91806bcc
Merge pull request #7857 from dhensby/pulls/3.5/add-license 
Create licence file so that GitHub (and humans) can more easily find it
 2018-02-13 09:32:24 +13:00
Daniel Hensby
24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it 2018-02-12 11:21:03 +00:00
Daniel Hensby
4ca385e033
Partial revert of #7665 - overzealous string renames 2018-02-09 19:27:45 +00:00
Daniel Hensby
85e97d204b
Partial revert of #7665 - bad docblock changes 2018-02-09 19:27:11 +00:00
Daniel Hensby
5d00d28b2f
Partial revert #7665 - undo changes to thirdparty dir 2018-02-09 18:43:02 +00:00
Daniel Hensby
747a98a07f
Merge branch '3.6' into 3 2018-02-09 13:21:15 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6 2018-02-09 13:20:38 +00:00
Daniel Hensby
2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values 
Fix for badly escaped values in CSV export
 2018-02-08 13:45:52 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton 2018-02-08 12:26:29 +00:00
Damian Mooyman
f4b13fb2c4
Merge remote-tracking branch 'origin/3.6' into 3 
# Conflicts:
#	model/DataQuery.php
 2018-02-05 16:53:15 +13:00
Damian Mooyman
a805aabecd Added 3.6.5 changelog 2018-02-05 15:19:24 +13:00
Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-02-05 15:07:21 +13:00
Damian Mooyman
abbc4b72be Added 3.5.7 changelog 2018-02-05 14:30:53 +13:00
Damian Mooyman
6fe5c37d6a
Merge pull request #7795 from kinglozzer/uploadfield-height 
FIX: Fix UploadField cuts off “Save” button (closes #2862)
 2018-02-05 14:24:30 +13:00
Damian Mooyman
fa44d22058
Merge pull request #6744 from d-rivera-c/dev/pharmac-fork 
fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE
 2018-02-05 14:22:08 +13:00
Damian Mooyman
aca1e16b8e
Merge pull request #6211 from jason-zz/patch-3 
BUG Fix : relObject() should return null if one of the node is null
 2018-02-05 14:18:44 +13:00
Damian Mooyman
98907b3ba4
Merge pull request #4096 from patricknelson/issue-4095-tinymce-embed 
FIX for #4095, TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2)
 2018-02-05 14:14:44 +13:00
Damian Mooyman
ffc0742bc7
Merge pull request #7665 from dhensby/pulls/3/php7.2 
NEW Add php 7.2 support
 2018-02-01 12:40:33 +13:00
Damian Mooyman
4da99efd5d
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-01-31 16:03:42 +13:00
Daniel Hensby
cf373ad53b
Merge pull request #7804 from beerbohmdo/bugfix/composite_field_missing_table 
BUG $this->tableName in CompositeDBField->addToQuery is blank.
 2018-01-30 16:52:02 +00:00
Daniel Hensby
74a3ba54ae
FIX count size of $relations 2018-01-30 16:50:33 +00:00
Daniel Hensby
e23fcda6b6
Remove usage of asserts with strings 2018-01-30 16:50:32 +00:00
Daniel Hensby
9103816333
NEW Add php 7.2 support 2018-01-30 16:50:32 +00:00
Daniel Hensby
231de43e3a
Merge pull request #7784 from spaceship-operators/bugfix/gridfield-overflow 
FIX: Gridfields with dropdowns having lots of overflow
 2018-01-30 16:36:27 +00:00
Scott Hutchinson
7384e3fc25
FIX: Gridfields with dropdowns having lots of overflow 2018-01-30 14:45:08 +00:00
Robbie Averill
ae130bff23
Merge pull request #7095 from oddnoc/nginx-config-update 
Update nginx configuration
 2018-01-27 10:35:15 +13:00
Dominik Beerbohm
416915b082 BUG tableName is blank in CompositeDBField->addToQuery 
Added call to setTable() to ensure tableName is provided inside addToQuery method.
 2018-01-26 14:58:46 +01:00
Loz Calver
861112bd31
Merge pull request #7803 from open-sausages/pulls/3.5/fix-ping-reqs 
BUG Fix ping including requirements
 2018-01-26 09:16:20 +00:00
Damian Mooyman
cf69d04866
BUG Fix ping including requirements 
Fixes #7802
 2018-01-26 10:26:18 +13:00
Fred Condo
6642772f76 Correct indentation 2018-01-24 16:41:04 -08:00