Commit Graph

20156 Commits

Author SHA1 Message Date
Damian Mooyman
710a793d57
Merge pull request #8106 from creative-commoners/pulls/4/remove-broken-badges
DOCS Remove broken badges from readme: versioneye and helpfulrobot
2018-06-06 09:28:56 +12:00
Damian Mooyman
f91c14551f
Merge branch '4' into pulls/4/remove-broken-badges 2018-06-06 09:27:07 +12:00
Daniel Hensby
73c6c61ff7
Merge pull request #8137 from christopherdarling/patch-11
DOCS fix 4.0.0 changelog example code for findThemedResource
2018-06-05 17:18:47 +01:00
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
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
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
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
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
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
Robbie Averill
01ed8a316b
Added 4.1.1 changelog 2018-05-24 16:52:15 +12:00
Robbie Averill
722202fef4 Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
# Conflicts:
  #	src/Control/Director.php
2018-05-24 15:41:11 +12:00
Robbie Averill
fe4f6f42d3
Updated 4.0.4 changelog 2018-05-24 13:51:21 +12:00
Damian Mooyman
5bff64b47b BUG Fix Director::test() not persisting removed session keys on teardown 2018-05-24 13:10:03 +12:00
Robbie Averill
e7e32d13a3
FIX Add namespace and encryptor to tests that expect blowfish to be available 2018-05-24 11:24:56 +12:00
Robbie Averill
bb1f0cce58
Added 4.0.4 changelog 2018-05-24 11:15:14 +12:00
Loz Calver
bff4acbe71
Merge pull request #8092 from Makreig/patch-1
Corrected Classname for DBFile
2018-05-23 11:29:54 +01:00
Mark Anderson
da91a36098
Corrected Classname for DBFile
The wrong classname was being used in the "Creating custom image functions" section
2018-05-23 11:23:36 +01:00
Damian Mooyman
865ebb3398 ENHANCEMENT Improve upgrading experience. (#8025)
* ENHANCEMENT Improve upgrading experience.
Show errors and back button if errors encountered during install
BUG Fix hard-coded 'mysite' folder
Fixes #8024

* Patch behat tests to work with new  buttons
2018-05-21 22:08:34 +12:00
Robbie Averill
b0e46ea5c0
Merge pull request #8081 from silverstripe/sminnee-patch-1
Add semver reference in core committers guide
2018-05-21 14:10:54 +12:00
Sam Minnée
4ccacf509f
Add semver reference in core committers guide 2018-05-21 14:08:52 +12:00
Robbie Averill
7b6f4c0a53
Merge pull request #8079 from open-sausages/pulls/4/docs-login
Personal data usage docs corrections
2018-05-21 11:59:37 +12:00