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,789 Commits 31 Branches 527 Tags 162 MiB
76936d863d
Commit Graph

20789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Carlino
76936d863d Merge branch '4.3' into 4 2018-11-07 23:20:44 +13:00
Aaron Carlino
687e8c84b1 Add changelog 2018-11-07 23:20:11 +13:00
Aaron Carlino
1944a5a99b Update translations 2018-11-07 16:31:27 +13:00
Loz Calver
0877442c64 Implement ConfirmationTokenChain to handle multiple tokens at once 2018-11-07 11:24:51 +13:00
Robbie Averill
637b4225c6 [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls 2018-11-07 11:24:51 +13:00
Loz Calver
3dbb10625c [SS-2018-019] Add confirmation token to dev/build 2018-11-07 11:24:51 +13:00
Robbie Averill
64c2938c96 Merge branch '4.3' into 4 2018-11-06 11:05:22 +01:00
Robbie Averill
3c58ae009e Merge branch '4.2' into 4.3 2018-11-06 11:05:08 +01:00
Robbie Averill
22c7fa2bc9 Merge branch '4.1' into 4.2 2018-11-06 11:04:43 +01:00
Robbie Averill
6d2665d687 Merge branch '4.0' into 4.1 2018-11-06 11:04:28 +01:00
Robbie Averill
db425c76a3
Merge pull request #8573 from wernerkrauss/fix-8570 
Convert::memstring2bytes should preserve -1
 2018-11-06 11:02:23 +01:00
Loz Calver
0e492b0017
Merge pull request #8453 from sminnee/less-original 
FIX: Update “original” DataObject data to be the content of the last write
 2018-11-06 10:46:11 +01:00
Werner M. Krauß
adafd73943 Convert::memstring2bytes should preserve -1 
fixes #8570
 2018-11-06 10:22:13 +01:00
Aaron Carlino
0ba275cb40 Merge branch '4.2' into 4.3 2018-11-06 15:09:01 +13:00
Aaron Carlino
e60cea8561 Merge branch '4.1' into 4.2 2018-11-06 15:08:42 +13:00
Aaron Carlino
c4bb60bc20 Merge branch '4.0' into 4.1 2018-11-06 15:08:09 +13:00
Sam Minnee
67fe41d00b FIX: Ensure that repeated setting/unsetting doesn’t corrode forceChange() 2018-11-05 23:09:24 +13:00
Sam Minnee
5bb2d9484a FIX: Update “original” DataObject data to be the content of the last write 
FIX: Compare to original when determining fields changes

This fixes a number of edge-case issues relating to change detection.

Fixes #8443
Fixes #3821
Fixes #4561
 2018-11-05 23:09:24 +13:00
Loz Calver
b835b77574
Merge pull request #8568 from sminnee/test-subclass-default 
MINOR: Add test for defaults on subclasses
 2018-11-05 10:34:12 +01:00
Sam Minnée
536e2d6835
Merge pull request #8511 from jmfederico/patch-1 
Update comment about locks in MySQL
 2018-11-05 22:32:18 +13:00
Sam Minnee
78ceca6934 MINOR: Add test for defaults on subclasses 
This was raised in https://github.com/silverstripe/silverstripe-framework/issues/8567
and wasn’t covered by a test.
 2018-11-05 16:09:49 +13:00
Andre Kiste
6bd2281b83
Merge pull request #8537 from dnsl48/fix/8530 
Fix the GitHub issue template
 2018-11-05 11:24:40 +13:00
Luke Edwards
97180c2612 Fix readonly grid state always being truthy (#8562) 2018-11-02 14:28:47 +13:00
Luke Edwards
8866e7674a BUG: Fix duplicate plugins on HTML editor fields (#8559) 
* BUG: Fix duplicate plugins on HTML editor fields

* Add new test
 2018-11-02 12:26:53 +13:00
Maxime Rainville
5172dcbb1e
Merge pull request #8561 from open-sausages/pullss/4.0/reference-ss-object-upgrade-yml 
MINOR Add a reference to SS_Object in .upgrade.yml to allow upgrade from SS3.7
 2018-11-02 09:14:13 +13:00
Maxime Rainville
46e4c19070 MINOR Add a reference to SS_Object in .upgrade.yml to allow upgrade from SS3.7 2018-11-01 22:38:26 +13:00
Michael Strong
55f95b7bc8 BUGFIX many many through not sorting by join table (#8534) 
* BUGFIX many many through not sorting by join table

* #8534 added docs to support many many sorting fix

* #8534 added test cases for many_many default sorting
 2018-11-01 14:17:15 +13:00
Michael Strong
7086f2ea3a BUGFIX many many through not sorting by join table (#8534) 
* BUGFIX many many through not sorting by join table

* #8534 added docs to support many many sorting fix

* #8534 added test cases for many_many default sorting
 2018-11-01 13:42:27 +13:00
Luke Edwards
c7b8b80e8b Persist GridField readonly state, add view button (#8535) 
* Persist GridField readonly state, add view button

* Minor clarity fixes
 2018-11-01 11:12:52 +13:00
Loz Calver
50dfe3ff27
Merge pull request #8552 from robby-nzta/patch-1 
Update the box list link
 2018-10-30 17:58:14 +01:00
robby-nzta
07fe1437a7
Update the box list link 
box  list link is broken
 2018-10-31 05:49:22 +13:00
Loz Calver
d66df38862
Merge pull request #8539 from creative-commoners/pulls/4.4/json-deprecation 
Add missing deprecation notices to Convert json methods
 2018-10-30 10:13:48 +01:00
Paul
7d04da50b5
Merge pull request #8541 from open-sausages/pulls/4/seo-browser-requirements 
DOC Improving SEO of browser requirements
 2018-10-30 12:46:06 +13:00
Maxime Rainville
b591ac30c8 DOC Improving SEO of browser requirements 2018-10-30 12:28:00 +13:00
Robbie Averill
98c038688d Add missing deprecation notices to Convert json methods 2018-10-29 22:15:22 +00:00
Loz Calver
81561cf762
Merge pull request #8528 from creative-commoners/pulls/4.4/deprecate-json-methods 
API Convert JSON methods are now deprecated, use json_encode or decode instead
 2018-10-29 17:50:36 +01:00
Serge Latyntcev
1c6e222391 Fix the GitHub issue template 
Add description of how to find the installed framework version in CMS for 4.3.0 and later.

Fixes #8530
 2018-10-29 15:49:05 +13:00
Andre Kiste
511c368e8c
Merge pull request #8521 from open-sausages/pulls/4.3/searching-for-legacy 
Add config to force legacy filter header globally
 2018-10-29 14:57:21 +13:00
Robbie Averill
b02a6fa02d FIX Replace usage of Convert JSON methods with json_encode 2018-10-28 21:15:29 +00:00
Robbie Averill
9724d1dd73 API Convert JSON methods are now deprecated, use json_encode or decode instead 2018-10-28 21:13:47 +00:00
Luke Edwards
3284bf48d6 Fix search filtering relations and clear filters (#8477) 2018-10-26 14:43:56 +13:00
Luke Edwards
d879148bff Add config to force legacy filter header globally 2018-10-26 14:28:15 +13:00
Andre Kiste
1ac8665aa9
Merge pull request #8510 from open-sausages/pulls/4/remove-legacy-article 
DOC Remove buggy example form the _Show Help Text on CMS Form Fields_
 2018-10-26 14:21:08 +13:00
Andre Kiste
bed1906f73
Fix typo 2018-10-25 15:59:02 +13:00
Sam Minnée
e72fc9e3d0 FIX DataObject singleton creation (#8516) 
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)

Correctly applies https://github.com/silverstripe/silverstripe-framework/pull/7850 to the 4.x line
This has already been fixed in 3.x
 2018-10-25 11:42:45 +13:00
Daniel Hensby
b47d9abd7c
Merge pull request #8488 from open-sausages/pulls/4/update-pattern-lib-doc 
MINOR Update doc to explain how to use and build the pattern lib
 2018-10-24 17:33:46 +01:00
Aaron Carlino
a3a4f48cb7 MINOR Update doc to explain how to use and build the pattern lib 2018-10-24 16:48:29 +13:00
Maxime Rainville
4e62698391 Add entry to change log about CMSPageHistoryController deprecation. (#8508) 
* Add entry to change log about CMSPageHistoryController deprecation.

* Correct typo #8508

* Tweaking CMS History controller changelog entry #8508
 2018-10-24 15:27:15 +13:00
Federico Jaramillo Martínez
e9bffe4020
Update comment about locks in MySQL 
MySQL 5.7.5 and newer allow for multiple lock form the same session. This information is now reflected in the comment.
 2018-10-22 22:33:16 -05:00
Maxime Rainville
40e542de2d DOC Remove buggy example form the _Show Help Text on CMS Form Fields_ article 2018-10-23 16:04:54 +13:00