tonyair/silverstripe-contentreview
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-contentreview synced 2024-10-22 17:05:47 +02:00
Code Issues Projects Releases Wiki Activity
366 Commits 20 Branches 64 Tags 3.1 MiB
5f04e466d2
Commit Graph

366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
586fb516c6
Merge pull request #121 from silverstripe/dependabot/npm_and_yarn/jquery-3.4.0 
Bump jquery from 3.2.1 to 3.4.0
 2019-12-16 15:22:45 -08:00
dependabot[bot]
79f7ed77f8
Bump jquery from 3.2.1 to 3.4.0 
Bumps [jquery](https://github.com/jquery/jquery) from 3.2.1 to 3.4.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.2.1...3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-14 02:48:34 +00:00
dependabot[bot]
c22ef1c9e9
Merge pull request #111 from silverstripe/dependabot/npm_and_yarn/stringstream-0.0.6 2019-12-14 02:48:06 +00:00
dependabot[bot]
9180213d63
Bump stringstream from 0.0.5 to 0.0.6 
Bumps [stringstream](https://github.com/mhart/StringStream) from 0.0.5 to 0.0.6.
- [Release notes](https://github.com/mhart/StringStream/releases)
- [Commits](https://github.com/mhart/StringStream/compare/v0.0.5...v0.0.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-14 01:59:58 +00:00
Robbie Averill
544571007b Merge branch '4.1' 2019-08-15 14:28:13 +12:00
Robbie Averill
5920058287 Update Travis to trusty and increase PHP memory limit 2019-08-15 13:53:00 +12:00
Robbie Averill
c190330521 Merge branch '4.1' 2019-08-15 09:58:56 +12:00
Guy Marriott
3d00342ac2
Merge pull request #107 from creative-commoners/pulls/4.1/remove-json-methods 
FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4
 2018-10-29 11:31:08 +13:00
Robbie Averill
6bc589c741 FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4 2018-10-28 21:32:15 +00:00
Dylan Wagstaff
6bcf66c7d1
Merge pull request #106 from janzenz/patch-1 
Prevent eslint rules from cascading.
 2018-10-05 13:18:04 +13:00
Janzen Zarzoso
1bd0418b62
Prevent eslint rules from cascading. 
This prevents eslint rules from cascading to the parent directory. This prevents the same issue on [ss-userforms](https://github.com/silverstripe/silverstripe-userforms/issues/819).
 2018-10-05 12:05:28 +13:00
Robbie Averill
680d300e65 Merge branch '4.1' 2018-09-17 10:08:56 +02:00
Robbie Averill
188f77c569
Merge pull request #102 from pjayme/bugfix/ownergroups-check-before-method-call 
BUGFIX: Error trying to access OwnerGroups() method on boolean value
 2018-08-22 08:48:58 +12:00
pjayme
d5b4fe1929 changed 'option' variable name to 'options' in places its used 2018-08-22 08:43:44 +12:00
pjayme
156a76a8e5 BUGFIX: Error trying to access OwnerGroups() method on boolean value 2018-08-22 08:20:36 +12:00
Robbie Averill
cc4b6960e6
Merge pull request #101 from phalkunz/bugfix/page-check-before-method-call 
BUGFIX: Error trying to OwnerGroups() method on boolean value
 2018-08-21 09:50:43 +12:00
Saophalkun Ponlu
68b1616d22 BUGFIX: Error trying to OwnerGroups() method on boolean value 
This issue occurs when a page has "Inherit from parent page" for content
review option and a review date, and its parent has "Disable content
review" for content review option.
 2018-08-21 09:27:05 +12:00
Massey Isa'ako
cf35e056b6 BUGFIX: Remove pages from content review email list, if a review log submitted after review date (#98) 2018-08-14 15:43:10 +12:00
Robbie Averill
051a945e7d Merge branch '4.1' 2018-08-14 15:19:04 +12:00
Robbie Averill
8428df1502
Merge pull request #91 from dhensby/pulls/fix-assert 
FIX Use assertListEquals instead of contains and notcontains
 2018-07-31 12:09:16 +12:00
Dan Hensby
6b5bc12f31
FIX Use assertListEquals 2018-07-31 00:55:50 +01:00
Robbie Averill
6ff726d0a1
Merge pull request #90 from creative-commoners/pulls/4.1/reduce-test-assertion 
FIX Updating test to not assert order of results
 2018-07-31 09:46:21 +12:00
Guy Marriott
8e73114051
FIX Updating test to not assert order of results 2018-07-31 09:26:49 +12:00
Robbie Averill
97a91ba20c Merge branch '4.1' 2018-06-25 14:28:12 +12:00
Robbie Averill
7f985ee5c8 Merge branch '4.0' into 4.1 2018-06-25 14:27:21 +12:00
Robbie Averill
c2f0d754c2
Merge pull request #86 from creative-commoners/pulls/4.1/fix-for-ss42 
BUG Update modal API for Reactstrap in SilverStripe 4.2, bump constraint
 2018-06-25 14:20:43 +12:00
Guy Marriott
39a51857e9
Merge pull request #87 from creative-commoners/pulls/4.0/constrain-core 
Constraint 4.0.x release line to SilverStripe 4.0 and 4.1, use contentreview 4.1 for SS 4.2+
 2018-06-25 13:48:28 +12:00
Robbie Averill
c56d00878b Update tested recipe versions to have a 4.2.x minimum 2018-06-25 13:22:15 +12:00
Robbie Averill
839ea9d3a5 Add various recipe versions to Travis matrix 2018-06-25 13:22:15 +12:00
Robbie Averill
6c56694bde BUG Update modal API for Reactstrap in SilverStripe 4.2, bump constraint 2018-06-25 13:22:15 +12:00
Daniel Hensby
fec030f9f2
Merge branch '4.1' 2018-06-20 11:00:43 +01:00
Daniel Hensby
53ecc52af4
Merge branch '4.0' into 4.1 2018-06-20 11:00:06 +01:00
Daniel Hensby
d989d4c68e
Linting fixes 2018-06-20 10:58:54 +01:00
Daniel Hensby
13aed4953f
Merge branch '3' 2018-06-20 10:55:37 +01:00
Daniel Hensby
61841ebabc
Merge branch '4.0' 2018-06-20 10:55:36 +01:00
Daniel Hensby
76e7d58ffc
Merge branch '4.0' into 4.1 2018-06-20 10:46:25 +01:00
Daniel Hensby
92770b01c6
Merge branch '3.0' into 4.0 2018-06-20 10:45:28 +01:00
Daniel Hensby
c3a343d263
Merge branch '3.0' into 3 2018-06-20 10:44:20 +01:00
Robbie Averill
a112834cc8
Merge pull request #54 from silbinarywolf/fix-healthcheckbug 
FIX Ensure QueuedJob health check doesn't kill long running review jobs
 2018-06-20 19:33:14 +12:00
Robbie Averill
5232b28551 Constraint 4.0.x release line to SilverStripe 4.0 and 4.1, use contentreview 4.1 for SS 4.2+ 2018-06-20 19:23:01 +12:00
Robbie Averill
5163c8d27e Merge branch '4.1' 2018-06-20 19:18:06 +12:00
Robbie Averill
ca9faaf4bd Disable transactions in SiteTreeContentReview test 2018-06-20 18:51:00 +12:00
Damian Mooyman
06a1d3a907
Merge pull request #83 from creative-commoners/pulls/master/add-supported-module-badge 
Add supported module badge to readme
 2018-06-18 10:46:47 +12:00
Dylan Wagstaff
d3de12fd59 Add supported module badge to readme 2018-06-15 17:33:20 +12:00
Robbie Averill
bc74fc019d Update branch alias for 4.x-dev 2018-06-11 14:50:15 +12:00
Robbie Averill
86965e885d Merge branch '4.0' 2018-06-11 14:50:02 +12:00
Robbie Averill
c6c7b18a5c Remove obsolete branch alias 2018-06-11 14:49:45 +12:00
Dylan
a20a29b1f0 Update translations 2018-04-04 10:17:01 +12:00
Dylan Wagstaff
709bed209d
Merge pull request #82 from creative-commoners/pulls/4.0/member-profile-fix 
FIX Remove automatically scaffolded GridField for Site Tree Content Review in Member fields
 2018-03-26 11:21:46 +13:00
Robbie Averill
dd7d1a70ec FIX Remove automatically scaffolded GridField for Site Tree Content Review in Member fields 2018-03-22 17:09:57 +13:00