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
20,016 Commits 31 Branches 527 Tags 162 MiB
9539d17aee
Commit Graph

20016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8a6686bc0f
Merge pull request #7814 from raissanorth/patch-1 
FIX Fix typo in error message
 2018-01-30 16:24:34 +13:00
Raissa North
cd6faac7a9
FIX Fix typo in error message 2018-01-30 15:48:42 +13:00
Robbie Averill
3d7ecc5240 FIX Allow cleanup marker regex to handle self closing HTML5 tags 2018-01-30 11:16:21 +13:00
Robbie Averill
dac247b58d
Merge pull request #7809 from open-sausages/pulls/4/docs-module-list 
Remove module-specific docs instructions
 2018-01-30 10:13:18 +13:00
Ingo Schommer
26c3e224db Remove module-specific docs instructions 
We have too many docs to list these out now,
even in 3.x this was a bit of a stopgap solution.
Point to a centrally managed URL on silverstripe.org
instead, where we can update the list of "core modules" regularly
without breaking URLs in the docs etc

Note that these URLs are also used internally by the
Open Sourcerers team.
 2018-01-30 09:08:49 +13:00
Robbie Averill
ae130bff23
Merge pull request #7095 from oddnoc/nginx-config-update 
Update nginx configuration
 2018-01-27 10:35:15 +13:00
Chris Joe
f1628e3252 Docs updated injector docs to reflect inject() changes (#7768) 
* Docs updated injector docs to reflect inject() changes and added example for the change

* Minor docs revision

* Added notes about context
 2018-01-27 09:18:45 +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
Damian Mooyman
76d2db12b0
Merge pull request #7794 from kinglozzer/id-like-to-place-an-ordinal 
NEW: Add support for ordinals in DBDate::Format()
 2018-01-26 09:27:46 +13:00
Loz Calver
fcf5022550 NEW: Add support for ordinals in DBDate::Format() 2018-01-25 09:41:06 +00:00
Damian Mooyman
68952e2677
Remove security releases from 4.0.1 2018-01-25 14:40:07 +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
Damian Mooyman
bca47029c4
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Control/SimpleResourceURLGenerator.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
 2018-01-25 12:53:15 +13: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
c7e341c67d Added 4.0.2 changelog 2018-01-25 12:26:49 +13:00
Damian Mooyman
7ba19fc282 Update translations 2018-01-25 12:15:34 +13:00
Damian Mooyman
f764ab04e8
Merge pull request #7796 from bummzack/fix-date-rfc3339 
Fixed Rfc3339 implementation of Date and Datetime
 2018-01-25 11:44:53 +13: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
Roman Schmid
6fafce766e Fixed Rfc3339 implementation of Date and Datetime 2018-01-24 16:58:12 +01:00
Loz Calver
f2b4c192ec FIX: Fix UploadField cuts off “Save” button (closes #2862) 2018-01-24 15:49:46 +00:00
Robbie Averill
8d762e9402
Merge pull request #7793 from open-sausages/pulls/4/publish-recursive-docs 
DOCS Correct usage of publishRecursive() in docs
 2018-01-24 17:42:12 +13:00
Chris Joe
bef0b620a9
Merge pull request #7780 from open-sausages/pulls/4/host-with-the-most 
API Director::host() now formally includes port in host consistently
 2018-01-24 16:14:44 +13:00
Damian Mooyman
0eaebe54f9
DOCS Correct usage of publishRecursive() in docs 2018-01-24 14:41:06 +13:00
Robbie Averill
1a421dc947
Merge pull request #7792 from open-sausages/pulls/4.0/fix-limit-phpdoc 
DOC Fix phpdoc on ArrayList::limit
 2018-01-24 11:20:37 +13:00
Chris Joe
c0085efae6
Merge pull request #7785 from open-sausages/pulls/4.0/better-upload-message 
BUG Better upload error message
 2018-01-24 10:37:47 +13:00
Damian Mooyman
3fce5372b0
DOC Fix phpdoc on ArrayList::limit 
Fixes #7781
 2018-01-24 10:18:15 +13:00
Robbie Averill
795c07c51d
Merge pull request #7787 from NightJar/patch-2 
FIX: Allow absolute URLs be use as resources
 2018-01-24 09:44:16 +13:00
Dylan Wagstaff
e1a4b89912
Code lint fix 
change `else if` to `elseif`
 2018-01-24 09:04:22 +13: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
Dylan Wagstaff
943821f984
Add a test for external resource support 
`SimpleResourceURLGenerator` has been altered to allow absolute URLs to be loaded directly, as so is now also tested to ensure the added functionality is true to design.
 2018-01-23 17:43:01 +13:00
Dylan Wagstaff
9c3feb4ab4
FIX: Allow absolute URLs be use as resources 
At current certain interfaces exist that assume only local assets will be loaded (e.g. `SilverStripe\Forms\HTMLEditor\TinyMCEConfig::getConfig()`), where as someone may wish to load an off site resource via the use of an absolute URL (e.g. for fontawesome css provided via a CDN). Because asset path parsing is filtered through a `SilverStripe\Core\Manifest\ResourceURLGenerator`, one must either know in advance if they want an internal or external resource (loading different generators), or the API must allow for this (i.e. an inclusion function for each type of asset). So we can either double the API on the implementing class, or simply make an exception for an absolute URL as high as possible; inside the filter - for which the `vendor/module : path/to/file.asset` shorthand syntax was specifically designed not to conflict with.
 2018-01-23 17:31:43 +13:00
Damian Mooyman
b44273d1d6
BUG Better upload error message 
Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/720
 2018-01-23 16:08:42 +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
04050b2753 API Director::host() now formally includes port in host 
API Add Director::hostName() and Director::port()
Fixes #7685
 2018-01-23 12:19:09 +13:00
Chris Joe
0e905b99a3
Merge pull request #7782 from open-sausages/pulls/4/fix-gridfield-versioned-tests 
BUG Prevent versioned from breaking gridfield tests
 2018-01-23 10:43:45 +13:00
Damian Mooyman
c32b3dd5ba
BUG Prevent versioned from breaking gridfield tests 2018-01-23 09:29:42 +13:00
Loz Calver
7603c6d798
Merge pull request #7779 from open-sausages/pulls/4.0/fix-login-casting 
BUG Fix double casting in login authenticator name
 2018-01-22 09:10:35 +00:00
Chris Joe
6a63b61623
Merge pull request #7774 from open-sausages/pulls/4/gridfield-versioned-state-refactor 
API Deprecate GridFieldVersionedState
 2018-01-22 16:55:42 +13:00
Damian Mooyman
f4092f7bcf API Deprecate GridFieldVersionedState 2018-01-22 15:28:09 +13:00
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Core/TempFolder.php
#	src/ORM/DataObject.php
#	src/View/ThemeResourceLoader.php
#	src/includes/constants.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
#	tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
#	tests/php/View/RequirementsTest.php
 2018-01-22 14:57:05 +13:00