tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-20 18:33:52 +02:00
Code Issues Projects Releases Wiki Activity
16,817 Commits 29 Branches 519 Tags 147 MiB
46d8aad91a
Commit Graph

16817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fred Condo
8f91f35526 Remove module blacklist 
- It's not necessary, as SilverStripe returns a not-found page when an
  attempt is made to retrieve a file directly from a module.
- Also format as a fenced code block and style as nginx.
 2018-01-24 15:53:23 -08:00
Fred Condo
de25c93b75 Update nginx configuration 
- Add buffer parameters without which some parts of the CMS fail with
  "too big header"
- Use RFC-2606-compliant example domains
- Remove configuration that allows arbitrary PHP execution
- Improve sample denials to show how to secure modules
- Restore missing boilerplate for MIME types
 2018-01-24 15:36:43 -08:00
Damian Mooyman
72e2326731
Merge pull request #7798 from kinglozzer/member-groupset-delete 
FIX: Fix Member_GroupSet::removeAll() (fixes #3948)
 2018-01-25 09:20:30 +13:00
Loz Calver
c2cd6b3832 FIX: Fix Member_GroupSet::removeAll() (fixes #3948) 2018-01-24 17:17:20 +00:00
Loz Calver
f2b4c192ec FIX: Fix UploadField cuts off “Save” button (closes #2862) 2018-01-24 15:49:46 +00:00
Damian Mooyman
83de0a0d36
Merge pull request #7783 from emteknetnz/emteknetnz-member-id-cast 
Ensure currentUserID() returns an int
 2018-01-23 18:18:28 +13:00
Steve Boyd
f214cd52e0
Ensure currentUserID() returns an int 
Cast $id returned from Session as an int to ensure it's never returned as a string
 2018-01-23 13:37:06 +13:00
Damian Mooyman
e770146141
Merge remote-tracking branch 'origin/3.6' into 3 2018-01-16 17:06:59 +13:00
Damian Mooyman
bb37bc5491 Added 3.6.4 changelog 2018-01-16 16:40:43 +13:00
Daniel Hensby
bb90751cc8
Merge branch '3.6' into 3 2018-01-15 16:44:48 +00:00
Damian Mooyman
39a8410460
Merge pull request #7754 from oetiker/patch-1 
JSON.parse does not like empty strings
 2018-01-15 10:56:15 +13:00
Tobias Oetiker
396005381f
JSON.parse does not like empty strings 
Add some protection for the case that envent.data is empty or null
 2018-01-12 16:21:33 +01:00
Daniel Hensby
4c51cf67e7
Merge pull request #7742 from nglasl/3.6 
FIX, adding a missing return statement.
 2018-01-09 23:43:18 +00:00
Nathan
2ef4a2d4ee
FIX, adding a missing return statement. 
This causes issues such as an `_function` to incorrectly return null.
 2018-01-10 09:50:18 +11:00
Daniel Hensby
c80cc17cf6
Merge branch '3.6' into 3 2018-01-09 13:35:45 +00:00
Daniel Hensby
a049876418
Merge branch '3.5' into 3.6 2018-01-09 13:34:56 +00:00
Damian Mooyman
677336fbef
Merge pull request #7726 from dhensby/pulls/3.5/functionaltest-html5-forms 
FIX Allow HTML 5 input tags in FunctionalTest form submissions
 2018-01-08 13:32:44 +13:00
Daniel Hensby
44930f211b
FIX Allow HTML 5 input tags in FunctionalTest form submissions 2017-12-22 11:15:56 +00:00
Daniel Hensby
7897b3bb25
Merge branch '3.6' into 3 2017-12-14 15:31:51 +00:00
Daniel Hensby
7b0500982e
Merge branch '3.5' into 3.6 2017-12-14 15:25:36 +00:00
Daniel Hensby
81150c5922
FIX Use PHP 5.3 array syntax 2017-12-14 15:24:53 +00:00
Damian Mooyman
3346b37ef0
Merge branch '3.6' into 3 2017-12-08 11:53:49 +13:00
Damian Mooyman
052f11a427
Remove merge artifact 2017-12-08 11:52:48 +13:00
Damian Mooyman
b7b3e4b1f8
Merge remote-tracking branch 'origin/3.6' into 3 2017-12-07 14:09:33 +13:00
Damian Mooyman
c22726bfd7
Merge remote-tracking branch 'origin/3.5' into 3 2017-12-07 14:09:02 +13:00
Damian Mooyman
bf74e8347a Added 3.6.3 changelog 2017-12-07 13:35:49 +13:00
Damian Mooyman
b6a7e47441 Added 3.5.6 changelog 2017-12-07 13:27:17 +13:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3 2017-12-07 13:20:58 +13:00
Loz Calver
aac828a6ee
Merge pull request #7559 from silverstripe/pulls/3/auto-index-sort 
NEW Add sort columns to DB index automatically
 2017-12-06 16:13:48 +00:00
Daniel Hensby
89166a2ff2
Try using parseSortColumn from ArrayList 2017-12-06 13:38:58 +00:00
Daniel Hensby
2e43780a8a
NEW Add sort columns to DB index automatically 2017-12-06 13:38:25 +00:00
Damian Mooyman
8537dd56dd Added 3.6.3-rc2 changelog 2017-12-06 18:11:03 +13:00
Damian Mooyman
55739fa5af
Merge pull request #50 from silverstripe-security/pulls/3.6/ss-2017-007 
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.6)
 2017-12-06 17:41:49 +13:00
Damian Mooyman
d47667bb07
Merge pull request #52 from silverstripe-security/pulls/3.6/ss-2017-006 
[ss-2017-006] Fix user agent invalidation on session startup (3.6 branch)
 2017-12-06 17:41:07 +13:00