tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,114 Commits 29 Branches 78 Tags 4 MiB
Commit Graph

1114 Commits

Author SHA1 Message Date
Guy Sartorelli 67a21914eb
Merge branch '2.7-release' into 2.7 2022-12-19 03:00:24 +00:00
Guy Sartorelli 901dbc8848
Merge branch '2.6' into 2.7-release 2022-12-19 13:52:24 +13:00
Steve Boyd 4308ac4316
Merge pull request #498 from creative-commoners/pulls/2.6/file-permissions 
Subsite file permissions
 2022-12-19 11:34:52 +13:00
Steve Boyd 73f3d15bfb
[CVE-2022-42949] Subsite file permissions 2022-12-19 11:30:59 +13:00
Guy Sartorelli a7e9e8dcdc
Merge pull request #496 from creative-commoners/pulls/2.7-release/historyviewer 
FIX Do not show copy to subsite buttons in history viewer
 2022-12-14 10:54:12 +13:00
Steve Boyd 5f489b1df9 FIX Do not show copy to subsite buttons in history viewer 2022-12-14 10:43:53 +13:00
Guy Sartorelli a1ee94ce61
Update translations 2022-11-10 01:56:21 +00:00
Guy Sartorelli 1e311e8668
Merge pull request #487 from creative-commoners/pulls/2/review-behat-tests 
ENH Replace ADMIN permissions with less permissions in Behat test
 2022-09-13 10:14:54 +12:00
Sabina Talipova 5eb7e8a7a3 ENH Replace ADMIN permissions with less permissions in Behat test 2022-09-09 15:16:40 +12:00
Maxime Rainville 837ab70a8d
Merge pull request #486 from creative-commoners/pulls/2/fix-userdoc-deploy 
MNT Fix github action for deploying userdocs
 2022-08-24 11:11:02 +12:00
Guy Sartorelli 800e8dc473
MNT Fix github action for deploying userdocs 2022-08-23 13:55:05 +12:00
Guy Sartorelli d13d73299a
Merge pull request #485 from creative-commoners/pulls/2/userhelp-fix 
DOC Correct title for userhelp
 2022-08-22 11:01:31 +12:00
Maxime Rainville 945e2bc370 DOC Correct title for userhelp 2022-08-20 22:00:04 +12:00
Steve Boyd 9ad6c8f97e Merge branch '2.6' into 2 2022-08-02 19:00:38 +12:00
Steve Boyd f566ab2b2a Merge branch '2.5' into 2.6 2022-08-02 19:00:11 +12:00
Guy Sartorelli 0338d41626
Merge pull request #484 from creative-commoners/pulls/2.5/standardise-modules 
MNT Standardise modules
 2022-08-02 16:11:26 +12:00
Steve Boyd 193866ec62 MNT Standardise modules 2022-08-01 16:23:25 +12:00
Bart van Irsel 74b6cec374
ENH added config setting to ignore subsite language (#481) 
added config setting to ignore subsite language; when using subsites in combination with fluent it picked up wrong yml file
 2022-07-28 12:19:33 +12:00
Steve Boyd b16495cf54 Merge branch '2.6' into 2 2022-07-25 11:39:47 +12:00
Steve Boyd cdc37de076 Merge branch '2.5' into 2.6 2022-07-25 11:39:25 +12:00
Guy Sartorelli b9d972b7fd
Merge pull request #483 from creative-commoners/pulls/2.5/behat 
FIX Move files to client directory
 2022-07-20 09:43:37 +12:00
Steve Boyd 6e1b504ff3 FIX Move files to client directory 2022-07-19 18:35:15 +12:00
Guy Sartorelli 2bab73ee35
Merge pull request #482 from creative-commoners/pulls/2.5/module-standards 
MNT Use GitHub Actions CI
 2022-07-15 17:22:14 +12:00
Steve Boyd 6969fe06d3 MNT Use GitHub Actions CI 2022-07-05 19:07:52 +12:00
Guy Sartorelli 7860a03180
Merge pull request #478 from creative-commoners/pulls/2/php81 
ENH PHP 8.1 compatibility
 2022-04-26 17:57:39 +12:00
Steve Boyd ed4663be9b ENH PHP 8.1 compatibility 2022-04-13 13:49:48 +12:00
Maxime Rainville acf9715c3b
Merge pull request #475 from creative-commoners/pulls/2/php74 
DEP Set PHP 7.4 as the minimum version
 2022-02-18 22:09:19 +13:00
Michal Kleiner 5c3d000b9b
Merge pull request #476 from wilr/wilr-patch-1 
FIX replace `in_array` check with `hasTable` check
 2022-02-15 15:39:46 +13:00
Will Rossiter dfe1ba5c6a
FIX replace in_array check with `hasTable` check. 
in_array is case-sensitive and may not detect that a table exists when using lowercase format
 2022-02-15 15:05:43 +13:00
Steve Boyd 07aefb1982 DEP Set PHP 7.4 as the minimum version 2022-02-10 17:39:05 +13:00
Maxime Rainville 2a16e1eefa
Merge pull request #469 from creative-commoners/pulls/2.4/behat 
MNT Update behat tests
 2021-11-15 14:31:30 +13:00
Steve Boyd cae9bd51ec MNT Update behat tests 2021-11-12 12:38:44 +13:00
Maxime Rainville 5049a5e13c
Merge pull request #471 from creative-commoners/pulls/2/sapphire-test-nine 
API phpunit 9 support
 2021-11-01 22:29:34 +13:00
Steve Boyd 13ab072303 API phpunit 9 support 2021-10-27 18:24:03 +13:00
Steve Boyd 0179176b6c Merge branch '2.4' into 2 2021-09-13 16:00:54 +12:00
Maxime Rainville 3a2ef2b3bc
Merge pull request #467 from creative-commoners/pulls/2.4/fix-test 
MNT Fix test to work with session-manager module
 2021-09-09 22:48:38 +12:00
Steve Boyd 643b8d436a MNT Fix test to work with session-manager module 2021-09-07 15:36:57 +12:00
Steve Boyd e306264740
Update build status badge 2021-01-21 16:42:37 +13:00
Steve Boyd f4ec177065 Merge branch '2.3' into 2 2020-11-11 17:01:38 +13:00
Steve Boyd bd690ae62b
Merge pull request #458 from creative-commoners/pulls/2.3/fix-travis 
FIX yml config, use sminnee/phpunit fork
 2020-11-11 11:01:17 +13:00
Serge Latyntcev 3fb2e9a1e0 MNT Define phpcs paths 2020-11-09 16:39:15 +13:00
Serge Latyntcev 08e5af4f2b MNT use shared travis config 2020-11-06 15:34:01 +13:00
Serge Latyntcev b5bd1e69b5 MNT Fix travis matrix 2020-11-06 13:08:31 +13:00
Serge Latyntcev 017804dbd4 DEP use sminnee/phpunit:5.7 fork 2020-11-06 12:17:07 +13:00
Serge Latyntcev 683e7da208 MNT Fix yaml config syntax 2020-11-06 12:17:05 +13:00
Steve Boyd 212790ae29 Merge branch '2.3' into 2 2020-09-12 18:39:03 +12:00
Steve Boyd 5a4d613d8e
Merge pull request #452 from chrometoasters/bugfix/default-subsite-query 
FIX Adjusting query used in getSubsiteIDForDomain()
 2020-09-12 18:37:35 +12:00
Mohamed Alsharaf 27bae53017 Adjusting query used in getSubsiteIDForDomain 
Prevent unknow database field error when a new DB field added
to Subsite data object.
 2020-09-11 16:39:33 +12:00
Dylan Wagstaff fd10b868ec
Merge pull request #451 from cjsewell/2 
Fix "Column 'URLSegment' in where clause is ambiguous" when duplicating pages
 2020-01-22 09:01:17 +13:00
Corey Sewell f1fce6f739 Fix "Column 'URLSegment' in where clause is ambiguous" when duplicating pages 2020-01-17 12:35:08 +13:00