tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
6,725 Commits 29 Branches 403 Tags 28 MiB
c77a4c94f5
Commit Graph

6725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Boyd
946dd50ab4 Merge branch '4.9' into 4 2021-09-04 17:36:54 +12:00
Maxime Rainville
8cbc6d2110 Update translations 2021-08-27 11:27:34 +12:00
Maxime Rainville
5634173d9b
Merge pull request #2682 from creative-commoners/pulls/4/fix-unit-tests 
MNT Use logInAs() for unit tests
 2021-08-19 13:49:13 +12:00
Steve Boyd
db9d86eade MNT Use logInAs() for unit tests 2021-08-18 17:18:01 +12:00
Steve Boyd
e98110d336
MNT Update tests to use logInAs() (#2679) 2021-08-18 12:35:36 +12:00
Daniel Hensby
6617c63dea
Merge pull request #2673 from silverstripe/dependabot/npm_and_yarn/ws-5.2.3 
Bump ws from 5.2.2 to 5.2.3
 2021-08-09 08:56:33 +01:00
dependabot[bot]
1d2c4a21a7
Bump ws from 5.2.2 to 5.2.3 
Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-08 21:51:13 +00:00
dependabot[bot]
280151c6e1
Merge pull request #2658 from silverstripe/dependabot/npm_and_yarn/merge-2.1.1 2021-08-05 06:22:45 +00:00
Steve Boyd
293c98790d
Merge pull request #2676 from sunnysideup/patch-13 
DOC: docblock for return value fixed for get_by_link
 2021-08-05 13:42:08 +12:00
Nicolaas
10e2c1f271
PATCH: docblock for return value fixed for get_by_link 2021-07-17 11:39:18 +12:00
Steve Boyd
12c11e5308 Merge branch '4.8' into 4 2021-07-07 14:01:30 +12:00
Steve Boyd
c505091d93
Merge pull request #2672 from creative-commoners/pulls/4.8/duplicate-embeds 
MNT Update embed shortcode unit test
 2021-07-01 16:56:16 +12:00
Maxime Rainville
973577e9f7
Merge pull request #2572 from creative-commoners/pulls/4/no-state-no-shoes-no-preview 
FIX Show 'No preview available' message for pages with no state
 2021-06-29 13:44:06 +12:00
Steve Boyd
c2026d06bf MNT Update embed shortcode unit test 2021-06-29 12:53:48 +12:00
Steve Boyd
9d77ff3b90 FIX Show 'No preview available' message for pages with no state 
This accompanies a logic patch in the admin module to ensure that when
no preview state is available for a pagetype, it renders a message
stating this. Previously a broken layout would appear instead.
 2021-06-23 12:04:17 +12:00
Steve Boyd
4c8823f218 Merge branch '4.8' into 4 2021-05-28 13:31:52 +12:00
Steve Boyd
ac35e94a19 Merge branch '4.7' into 4.8 2021-05-28 13:31:35 +12:00
Ingo Schommer
8438bf98ec
Remove broken versioneye badges 
[ci-skip]
 2021-05-24 17:30:50 +12:00
Andre Kiste
87ac196378
Merge pull request #2585 from open-sausages/pulls/4/toast-react 
BUG Fix Behat test to use new toast notification step
 2021-05-21 15:43:24 +12:00
Daniel Hensby
76b907020c
Merge pull request #2640 from silverstripe/dependabot/npm_and_yarn/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4
 2021-05-17 09:33:01 +01:00
Steve Boyd
88e8355bc5 Merge branch '4.8' into 4 2021-05-17 16:30:31 +12:00
Steve Boyd
8fb175171d MNT Remove COMPOSER_ROOT_VERSION 2021-05-17 16:29:54 +12:00
Steve Boyd
8c1516270a Update translations 2021-05-17 10:53:21 +12:00
dependabot[bot]
83e32a1fe3
Bump elliptic from 6.5.3 to 6.5.4 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-14 20:53:44 +00:00
Daniel Hensby
f230adcc69
Merge pull request #2647 from muskie9/bugfix/virtualPageCanonical2637 
UPDATE generate canonical via MetaComponents
 2021-05-14 21:49:30 +01:00
dependabot[bot]
83bf0b77ee
Merge pull request #2644 from silverstripe/dependabot/npm_and_yarn/y18n-3.2.2 2021-05-14 20:02:45 +00:00
dependabot[bot]
ac78336f1f
Bump merge from 1.2.1 to 2.1.1 
Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 01:01:46 +00:00
Steve Boyd
4b32d96b2c
Merge pull request #2656 from creative-commoners/pulls/4.8/backport-pull-2651 
BUGFIX: Ensure SiteTree is always available in the CMS, along with ancestors
 2021-05-11 10:35:35 +12:00
Aaron Carlino
67bfdf0ff1 BUGFIX: Ensure SiteTree is always available in the CMS, along with ancestors 2021-05-11 10:22:30 +12:00
Steve Boyd
6fb89ae384
Merge pull request #2651 from unclecheese/pulls/4/beta-blocker 
BUGFIX: Ensure SiteTree and ancestors always available in the CMS
 2021-05-10 13:05:22 +12:00
Aaron Carlino
ed4ff6eadc BUGFIX: Ensure SiteTree is always available in the CMS, along with ancestors 2021-05-07 16:42:36 +12:00
Steve Boyd
a6a3b3829c Merge branch '4.7' into 4 2021-04-27 15:09:00 +12:00
Andre Kiste
4e8c5e6844
Merge pull request #2649 from creative-commoners/pulls/4.7/i-click-elements 
MNT Use behat-extension function for clicking elements
 2021-04-22 12:27:32 +12:00
Steve Boyd
d7570cb0e6 MNT Use behat-extension function for clicking elements 2021-04-15 13:42:45 +12:00
Nic Horstmeier
85c3b1096b
UPDATE generate canonical via MetaComponents 
This replaces using the `MetaTags` method as replacing or removing a canonical requires string manipulation vs unsetting an array key, and is preferred.
 2021-04-05 19:52:35 -05:00
dependabot[bot]
26aba13496
Bump y18n from 3.2.1 to 3.2.2 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-30 15:11:04 +00:00
Steve Boyd
f892205b9b
Merge pull request #2638 from wilr/pulls/undefined 
FIX undefined variable inChangeSets
 2021-03-22 14:13:07 +13:00
Steve Boyd
e91e6e56f5 Merge branch '4.7' into 4 2021-03-21 10:26:05 +13:00
Steve Boyd
acbcf4660c Merge branch '4.6' into 4.7 2021-03-21 10:25:47 +13:00
Maxime Rainville
1cd8b76426
Merge pull request #2642 from creative-commoners/pulls/4.6/fix/behat 
MNT Fix archive button behat test
 2021-03-19 17:32:10 +13:00
Steve Boyd
1ccf67b158 MNT Fix archive button behat test 2021-03-18 15:15:16 +13:00
Will Rossiter
db7efad6ca
FIX undefined variable inChangeSets 2021-03-05 14:48:08 +13:00
Steve Boyd
f9b6d58295
Update build status badge 2021-01-21 16:30:45 +13:00
Steve Boyd
7886e51f81 Merge branch '4.7' into 4 2021-01-02 10:48:03 +13:00
Steve Boyd
babc8a462e Merge branch '4.6' into 4.7 2021-01-02 10:40:57 +13:00
Steve Boyd
3bbc4aa6b3 Merge branch '4.5' into 4.6 2021-01-02 10:17:51 +13:00
dependabot[bot]
8788d62bc4
Merge pull request #2623 from silverstripe/dependabot/npm_and_yarn/ini-1.3.7 2020-12-31 06:47:02 +00:00
Garion Herman
bae853837e Merge branch '4.7' into 4 2020-12-22 14:22:49 +13:00
Garion Herman
0db4650147
Merge pull request #2619 from creative-commoners/pulls/4.7/travis-shared 
MNT Travis shared config
 2020-12-22 14:19:16 +13:00
Steve Boyd
53ec8880cd MNT Travis shared config 2020-12-22 10:25:15 +13:00