Maxime Rainville
0f02f2364f
MINOR Make installer default to using _resources ( #242 )
2019-01-16 21:34:13 +13:00
Maxime Rainville
f04beea2f3
Merge pull request #246 from Firesphere/patch-1
...
Add Roave Security advisories to composer
2019-01-08 10:07:45 +13:00
Simon Erkelens
a302acfa5a
NEW Add Roave Security advisories to composer
...
Add Security Advisories as dev requirement to
- Prevent installation of known breached libraries
- Give devs the option to remove it if they might want to
2019-01-08 09:37:34 +13:00
Robbie Averill
b66e851dda
Merge branch '4.3' into 4
2018-11-21 09:12:30 +01:00
Robbie Averill
3abeb18858
Merge branch '4.2' into 4.3
...
# Conflicts:
# composer.json
2018-11-21 09:12:10 +01:00
Robbie Averill
84aaa17461
Merge branch '4.1' into 4.2
2018-11-21 09:11:20 +01:00
Robbie Averill
d0890776e8
Merge branch '4.0' into 4.1
2018-11-21 09:11:04 +01:00
Robbie Averill
fcd4052a07
Update Slack integration token
2018-11-21 09:10:41 +01:00
Robbie Averill
90f54ccfe9
Merge pull request #240 from JorisDebonnet/patch-4
...
Correct typo
2018-10-17 21:56:44 +02:00
JorisDebonnet
fa3c87f61e
Correct typo
2018-10-17 18:05:20 +02:00
Robbie Averill
fa67bc614b
Bump branch alias and root version in Travis to 4.4.x-dev
2018-10-15 14:54:38 +02:00
Robbie Averill
05fd5a9a96
Bump branch alias and root version in Travis to 4.4.x-dev
2018-10-15 14:44:14 +02:00
Robbie Averill
caf0bc12f7
Merge branch '4.3' into 4
2018-10-15 14:43:00 +02:00
Aaron Carlino
c24d4c73c3
Remove obsolete branch-alias
2018-10-15 16:31:48 +13:00
Dan Hensby
986a2f951a
Update composer.json version constraint
2018-08-04 08:59:12 +02:00
Daniel Hensby
eba91f9bec
Merge branch '4.2' into 4
...
# Conflicts:
# composer.json
2018-07-30 17:14:31 +01:00
Daniel Hensby
539b58d7aa
Merge tag '4.2.1' into 4.2
...
Release 4.2.1
2018-07-30 17:12:06 +01:00
root
0307496292
Update development dependencies
2018-07-30 15:23:32 +00:00
Daniel Hensby
15f8011493
Merge branch '4.2' into 4
...
# Conflicts:
# composer.json
2018-07-30 11:23:08 +01:00
Daniel Hensby
6ad3a067c3
Merge tag '4.2.0' into 4.2
...
Release 4.2.0
2018-07-30 11:14:13 +01:00
root
b1cd5afe28
Update development dependencies
2018-07-24 19:22:22 +00:00
Daniel Hensby
7d838b0631
Update composer dep
2018-07-24 16:47:35 +01:00
Robbie Averill
baf63747b4
Bump Postgres version to 2.1.x-dev for SilverStripe 4.2+
2018-06-29 16:39:17 +12:00
Robbie Averill
28da082fa1
Merge pull request #232 from open-sausages/pulls/4.3/increment-travis-version-to4.3.x-dev
...
Increment travis root version to 4.3.x-dev
2018-06-29 16:38:38 +12:00
Maxime Rainville
1431370940
Increment travis root version to 4.3.x-dev
2018-06-26 17:49:01 +12:00
Damian Mooyman
5e4ad34162
Fix incorrect base recipe dependency
2018-06-15 16:47:59 +12:00
Damian Mooyman
f5b659cb4f
Merge remote-tracking branch 'origin/4.2' into 4
2018-06-15 16:06:14 +12:00
Damian Mooyman
0d5daf5658
Update development dependencies
2018-06-15 15:52:39 +12:00
Damian Mooyman
6a7bd05a1d
Remove obsolete branch-alias
2018-06-15 15:30:04 +12:00
Damian Mooyman
97ef910478
Update installer to use new recipe versioning
2018-06-14 13:29:03 +12:00
Damian Mooyman
d178ebdb9e
Merge pull request #230 from creative-commoners/pulls/4/remove-classmap
...
FIX Remove incorrect classmap for Page and PageController
2018-06-05 12:08:10 +12:00
Robbie Averill
a9e2af6863
FIX Remove incorrect classmap for Page and PageController
...
These files to not always exist in this path, so this autoload definition is misleading
2018-06-01 15:54:11 +12:00
Robbie Averill
9a407320ed
Merge branch '4.1' into 4
2018-05-28 18:32:48 +12:00
Robbie Averill
dc4b512afb
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
2018-05-28 17:57:27 +12:00
Robbie Averill
743f9c649e
Merge remote-tracking branch 'origin/3.6' into 4.0
...
# Conflicts:
# .cow.json
# .gitignore
# composer.json
2018-05-28 17:54:29 +12:00
Robbie Averill
cd6a22c78f
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:47:06 +12:00
Robbie Averill
ec5093feb6
Merge pull request #3 from silverstripe-security/pulls/4.0/ss-2018-014
...
[SS-2018-014] Remove jar, css and js from file extension whitelist
2018-05-14 17:20:31 +12:00
Robbie Averill
be96858e85
[SS-2018-014] Remove jar, dotm, potm, xltm from file extension whitelist, hard-code CSS and JS for TinyMCE support
2018-05-14 17:20:03 +12:00
Robbie Averill
c6ff9b1245
Merge pull request #2 from silverstripe-security/pulls/4.0/ss-2018-012
...
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:36 +12:00
Damian Mooyman
f9c03fa623
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:12 +12:00
Robbie Averill
9d8193d19c
Merge pull request #225 from open-sausages/pulls/4.0/selenium-upgrade
...
Update selenium to chromedriver
2018-04-13 10:50:50 +12:00
Damian Mooyman
7cfaeccfb1
Remove empty psr-4
2018-04-13 10:15:04 +12:00
Damian Mooyman
d678bd76f9
Update selenium to chromedriver
2018-04-13 09:30:04 +12:00
Damian Mooyman
39f0af225f
Merge pull request #223 from open-sausages/pulls/4/appy-days
...
Shift resources into app folder
2018-04-11 15:25:06 +12:00
Damian Mooyman
b18d3752b6
Merge pull request #224 from aNickzz/patch-1
...
Update .gitignore
2018-04-11 10:44:24 +12:00
aNickzz
26f4ef722d
Update .gitignore
...
Update to match #213
2018-04-10 16:34:40 +09:30
Damian Mooyman
f514ba42b6
Bump recipe plugin dependency
2018-04-05 16:43:07 +12:00
Damian Mooyman
0b71d14fe1
Shift resources into app folder
...
Add autoloading skeleton and classmap for Page.php / PageController.php
2018-04-05 15:17:03 +12:00
Damian Mooyman
30df0f5e43
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-07 16:44:41 +13:00
Damian Mooyman
b6730c5c9c
Update root composer version for 4.1 branch
2018-02-07 16:43:17 +13:00
