Commit Graph

21722 Commits

Author SHA1 Message Date
Christopher Darling
cab1ea0dbe
DOCS fix 4.0.0 changelog example code
ThemeResourceLoader::inst()->findThemedResource() requires two arguments af2c3886b9/src/View/ThemeResourceLoader.php (L286-L294)
2018-06-05 16:58:37 +01:00
Daniel Hensby
801a51d0f7
Merge branch '3.5' into 3.6 2018-06-05 16:30:20 +01:00
Robbie Averill
13ea2f9b80
Merge pull request #8132 from dhensby/pulls/3.5/postgres-test-fix
FIX Regression from #8009
2018-06-05 13:43:19 +12:00
Daniel Hensby
41e601a036
FIX Regression from #8009 2018-06-04 17:03:05 +01:00
Loz Calver
050018dba6
Merge pull request #8134 from dhensby/pulls/3.5/memory-limit
Increase memory limit to 2G in Travis builds
2018-06-04 16:50:52 +01:00
Loz Calver
0a4e3fc716
Merge pull request #8133 from dhensby/pulls/3.5/php53-compat
FIX PHP 5.3 compat for referencing $this in closures
2018-06-04 16:30:21 +01:00
Robbie Averill
c1b0c56788
Increase memory limit to 2G in Travis builds 2018-06-04 16:24:18 +01:00
Robbie Averill
1cbf27e0f4
FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason
sdf
2018-06-04 16:05:49 +01:00
Daniel Hensby
0bec6e07dc
Merge pull request #8111 from open-sausages/pulls/4/7.2-is-just-out-of-each
BUGFIX: Refactor difflib to not use each()
2018-06-04 12:47:59 +01:00
Daniel Hensby
1658fe7617
Merge pull request #8127 from jonom/4.0-read-only-currency
Fix: negative values in read only currency field
2018-06-04 11:52:01 +01:00
Daniel Hensby
e67d947b26
Merge pull request #8130 from Juanitou/patch-2
Update 03_Requirements.md
2018-06-04 11:36:21 +01:00
Juan Molina
35943ac68a
Update 03_Requirements.md 2018-06-03 14:25:05 +02:00
Juan Molina
031f8b23ec
Update 03_Requirements.md
Update Blocking section to reflect new vendor path
2018-06-02 19:30:12 +02:00
Jonathon Menz
5a5ba1e5c0 Fix: negative values in read only currency field
Don’t strip out ‘-‘ character as this makes negative values appear to be positive (Fixes #8126)
2018-06-01 12:59:02 -07:00
Robbie Averill
8064ed8220 FIX Minor updates to unit tests to pass with HTML5 parser and various themes 2018-06-01 17:47:03 +12:00
Maxime Rainville
adb64c074a Making our diff unit test a bit more forgiving of spaces.
#8053
2018-06-01 13:02:49 +12:00
Maxime Rainville
33b14e7ec2 Test updated no-each logic
Added a test that trigger the DiffEngine::diag. This test when run against the
old `each` loop under PHP 7.2 triggers a deprecated warning.
 #8053
2018-06-01 11:16:03 +12:00
Damian Mooyman
2510935b53
Merge pull request #8065 from dhensby/pulls/4/mmtl-jointable
NEW Add getJoinTable to MMTL
2018-06-01 10:33:46 +12:00
Aaron Carlino
4b3e76a976 Fix missing braces 2018-06-01 10:14:42 +12:00
Loz Calver
d1e8900853
Merge pull request #8117 from DorsetDigital/patch-6
Update 00_Introduction.md
2018-05-31 14:38:41 +01:00
DorsetDigital
86b755f12a
Update 00_Introduction.md
Update filename in example for clarity
2018-05-31 11:47:42 +01:00
Loz Calver
ad171c1a8a
Merge pull request #8116 from DorsetDigital/patch-5
Update 04_Static_Publishing.md
2018-05-31 11:16:22 +01:00
DorsetDigital
a7c5e60195
Update 04_Static_Publishing.md
Update link to current static publisher module
2018-05-31 10:55:13 +01:00
Aaron Carlino
c8a1bb314d Refactor difflib to not use each() 2018-05-31 12:39:12 +12:00
Aaron Carlino
8e4a1ba8fa Replace each() with foreach() 2018-05-31 12:39:12 +12:00
Aaron Carlino
5f23381143 Reword docs 2018-05-31 09:04:11 +12:00
Aaron Carlino
8c56506a05 Add upgrade docs 2018-05-31 09:04:11 +12:00
Aaron Carlino
4497f99d89 Remove versioned cache from core caches 2018-05-31 09:03:29 +12:00
Loz Calver
7d10c27346
Merge pull request #8108 from open-sausages/pulls/4/docs-remove-old-changelogs
Removed old changelogs (fixes #8035)
2018-05-30 09:12:18 +01:00
Ingo Schommer
7ba13e91db Removed old changelogs (fixes #8035) 2018-05-30 16:07:21 +12:00
Robbie Averill
e0993043f8 Merge branch '4.1' into 4 2018-05-30 15:08:39 +12:00
Robbie Averill
d0d936bc40 Merge branch '4.0' into 4.1 2018-05-30 14:52:31 +12:00
Robbie Averill
c8b0bc0ad7 Merge branch '4.0' into 4.1
# Conflicts:
  #	src/ORM/DataObject.php
  #	tests/php/ORM/DataObjectDuplicationTest.php
  #	tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
624a5326a7
Typo in PHPDoc type 2018-05-30 14:51:09 +12:00
Robbie Averill
2dd8e867b0 DOCS Remove broken badges from readme: versioneye and helpfulrobot 2018-05-30 14:14:27 +12:00
Robbie Averill
7a8a24d175 Reset force SSL domain/patterns in setup to prevent global state pollution 2018-05-29 17:34:22 +12:00
Robbie Averill
063d765e94 Add test assertion for response instance
This prevents middlewares that return null (like the example delegate in this test) from killing a testsuite
2018-05-29 17:26:29 +12:00
Luke Edwards
385e9e105c Create GridField Actions Menu component (#8083)
* WIP GridField action menu work, the gist of the idea is using a new gridfield component

* Add delete action to actions menu

* Actions are added automatically to action menu (allows for extension)

* Add test and minor changes

* Add docs and minor changes

* Refactor ActionMenuItem into distinct types, general ActionMenu cleanup

* Add icons and fix title

* Pass columnName, so it can be used by components

* Update test to open and find action menu buttons

* Add section in changelog upgrade section for GridField_ActionMenu
2018-05-29 16:10:52 +12:00
Robbie Averill
a0d0564369
Merge pull request #60 from silverstripe-security/pulls/4/ss-2018-003
[ss-2018-003] Update docs for oembed
2018-05-28 18:58:04 +12:00
Robbie Averill
c3e5ab2258
Merge pull request #65 from silverstripe-security/pulls/4.2/ss-2018-009
[SS-2018-009] Allow forced redirects to HTTPS for responses with basic authentication
2018-05-28 18:57:38 +12:00
Robbie Averill
ea16e28aa7 Merge branch '4.1' into 4 2018-05-28 18:33:56 +12:00
Robbie Averill
6d98a912c9 Merge branch 'heads/4.1.1' into 4.1 2018-05-28 18:26:20 +12:00
Robbie Averill
3244603458 Merge remote-tracking branch 'origin/3.6' into 4.0 2018-05-28 17:50:54 +12:00
Robbie Averill
3a537bc745 Merge branch 'heads/4.0.4' into 4.0 2018-05-28 17:50:07 +12:00
Robbie Averill
d21660971f Merge branch 'heads/3.6.6' into 3.6 2018-05-28 17:44:28 +12:00
Robbie Averill
dae8fefb1e Merge remote-tracking branch 'origin/3.5' into 3.6 2018-05-28 17:43:55 +12:00
Robbie Averill
df4648a308 Merge branch 'heads/3.5.8' into 3.5 2018-05-28 17:42:31 +12:00
Robbie Averill
912dc60cf3
Added 3.5.8 changelog 2018-05-28 15:50:54 +12:00
Robbie Averill
8f4f923062
Merge pull request #8096 from Juanitou/patch-1
Minor grammar fix - 05_Template_Inheritance.md
2018-05-26 00:21:10 +12:00
Juan Molina
5e45a4be88
Update 05_Template_Inheritance.md
Minor grammar fix.
2018-05-25 14:17:28 +02:00