Commit Graph

503 Commits

Author SHA1 Message Date
Damian Mooyman
ad93c5c3ab Fix merge conflict 2015-04-21 19:34:04 +12:00
Damian Mooyman
298ac89ad6 Merge pull request #118 from scott1702/parent-comment
Remove Parent Comment row
2015-04-21 18:45:56 +12:00
scott1702
a5bed7f27f Remove parent comment field 2015-04-21 16:31:02 +12:00
Christopher Pitt
614da962ce Merge pull request #115 from tractorcow/pulls/2.0/nested-comments
API Nested comments feature (final)
2015-04-21 14:45:54 +12:00
Damian Mooyman
a0974dd399 Merge pull request #117 from assertchris/add-spam-row-highlight
Updated for new GridField API
2015-04-21 11:47:10 +12:00
Damian Mooyman
468df23801 Nested comments proof of concept
Update theme to new look and feel
Add jquery-validate 1.3.1 (w/ nz dst patch)
2015-04-21 11:12:42 +12:00
Christopher Pitt
adabc623f6 Updated for new GridField API 2015-04-21 09:28:11 +12:00
Damian Mooyman
75be840dce Merge pull request #114 from assertchris/add-spam-row-highlight
Add spam row highlight
2015-04-20 16:23:00 +12:00
Christopher Pitt
5c71b2f141 Add spam row highlight 2015-04-20 10:03:45 +12:00
Christopher Pitt
0c698a813a Merge pull request #113 from tractorcow/pulls/2.0/comment-gridfield-actions
BUG Only show correct gridfield options for comments
2015-04-16 15:47:16 +12:00
Damian Mooyman
85653fea1e BUG Only show correct gridfield options for comments 2015-04-16 15:37:42 +12:00
Damian Mooyman
26361cccba Merge pull request #112 from assertchris/change-moderation-labels
Change moderation labels
2015-04-16 15:18:20 +12:00
Christopher Pitt
086dd03b5c Change moderation labels 2015-04-16 14:50:56 +12:00
Christopher Pitt
1410702fce Merge pull request #110 from tractorcow/pr/109
Fixed comment permissions
2015-04-16 11:10:19 +12:00
Christopher Pitt
a004dfe780 Fixed comment permissions 2015-04-16 11:01:34 +12:00
Christopher Pitt
7585b5d19f Merge pull request #108 from tractorcow/pulls/2.0/frontend-moderation
API Restore ability to do frontend-moderation
2015-04-14 14:09:35 +12:00
Damian Mooyman
3deea94a8c API Restore ability to do frontend-moderation
This feature is disabled by default, but can be turned on either for spam, unmoderated comments, or both.
2015-04-14 14:04:29 +12:00
Damian Mooyman
eadde16232 Merge pull request #107 from assertchris/add-new-moderation-lists
[Review/Feedback] Add new moderation lists
2015-04-14 13:04:55 +12:00
Christopher Pitt
162ad33e26 Adding new moderation lists 2015-04-14 12:57:30 +12:00
Christopher Pitt
128fa67f65 Merge pull request #106 from tractorcow/pulls/2.0/fix-login-options
BUG Fix comments form appearing on login page
2015-04-13 18:48:59 +12:00
Damian Mooyman
69c928650a BUG Fix comments form appearing on login page 2015-04-13 16:34:20 +12:00
Christopher Pitt
5254d72ccd Merge pull request #105 from tractorcow/pulls/2.0/config-moderation-options
API Allow commenting options to be set per page
2015-04-13 15:39:40 +12:00
Damian Mooyman
6ebbd9e1ac API Allow commenting options to be set per-page in CMS 2015-04-13 15:35:25 +12:00
Sam Minnée
f9c93ef9aa Merge pull request #104 from tractorcow/pulls/2.0/config-api
API Move configuration of comments to the config API and enable per-instance configuration
2015-04-13 15:23:40 +12:00
Damian Mooyman
1900ab14b5 API Move configuration of comments to the config API and enable per-instance configuration
Enable comment moderation per-page
2015-04-09 10:34:33 +12:00
Christopher Pitt
93414c5231 Merge pull request #103 from tractorcow/pulls/better-redirect
Better redirection on posting of comment
2015-04-02 12:02:29 +13:00
Daniel Hensby
882c65fdd5 Merge pull request #97 from arambalakjian/pulls/controller-instantiation
API Adding config option for enabling comments to be added to SiteTree
2015-04-01 13:04:54 +01:00
Damian Mooyman
0b49de3648 ENHANCEMENT If a user posts a spamcomment and it's saved, ensure the form is correctly redirected to 2015-04-01 17:12:47 +13:00
Christopher Pitt
e576717c26 Merge pull request #102 from tractorcow/pulls/fix-action-nullification
BUG Workaround for https://github.com/silverstripe/silverstripe-framework/pull/4053
2015-04-01 16:54:35 +13:00
Damian Mooyman
26d0212ef3 BUG Workaround for https://github.com/silverstripe/silverstripe-framework/pull/4053 2015-04-01 15:29:01 +13:00
Christopher Pitt
a41a0054e2 Merge pull request #101 from tractorcow/pulls/ux-redirection
UX Improvements
2015-03-31 08:36:47 +13:00
Damian Mooyman
b5a53451b3 UX Improvements
Redirect to login form if lacking permissions
Better redirectBack if we can guess from the comment
2015-03-30 18:57:29 +13:00
Christopher Pitt
974b4554fb Merge pull request #99 from tractorcow/pulls/better-xss-protection
Better XSS Protection via hashed token
2015-03-30 15:30:21 +13:00
Damian Mooyman
9087261654 Better XSS Protection via hashed token
Allows moderation links to be generated for users other than the currently logged in user, as it doesn't rely on the current session.
2015-03-30 14:56:28 +13:00
Aram Balakjian
00cb672bf5 Changed instantiation of controller to ::create 2015-03-23 17:58:53 +00:00
Aram Balakjian
99cf501393 NEW Only add comments to SiteTree objects if needed 2015-03-23 16:59:05 +00:00
Will Rossiter
2a20037e49 Merge pull request #92 from tractorcow/pulls/fix-temp-files
Provide better temporary location for HTMLPurifier cache files
2015-01-12 19:11:16 +13:00
Damian Mooyman
7f1005ed06 Provide better temporary location for HTMLPurifier cache files 2015-01-12 14:00:20 +13:00
Will Rossiter
c73f9f48f0 Merge pull request #88 from tractorcow/pulls/fix-deps
Update composer to point to now fixed 2.1 branch of bulk editing tools
2014-12-15 15:34:13 +13:00
Will Rossiter
589e2e4660 Merge pull request #90 from dhensby/master
Adding .editorconfig
2014-12-05 15:22:31 +13:00
Daniel Hensby
7f05c0039c Adding .editorconfig 2014-12-04 15:47:12 +00:00
Will Rossiter
a061be8732 Merge pull request #89 from stevie-mayhew/feature/administration
UPDATE: explicitly provide permissions for comment administration
2014-11-12 12:13:33 +13:00
Stevie Mayhew
bba7a84bd1 UPDATE: explicitly provide permissions for comment administration 2014-11-12 10:38:50 +13:00
Damian Mooyman
1d315983a4 Update composer to point to now fixed 2.1 branch of bulk editing tools 2014-11-03 09:50:46 +13:00
Damian Mooyman
aaec312fd5 Merge pull request #86 from halkyon/fixing_comment_dependency
Setting third-party module dependency to latest known version that works
2014-09-15 12:35:45 +12:00
Sean Harvey
ee55545744 Setting third-party module dependency to latest known version that works 2014-09-15 12:17:33 +12:00
Will Rossiter
e9695af2c7 Merge pull request #83 from gordonbanderson/ISSUE82
FIX: Ensure that comments edited using AJAX are themselves AJAX editable
2014-07-03 18:52:47 +12:00
Gordon Anderson
827ae69d2f FIX: Ensure that comments edited using AJAX are themselves editable using AJAX 2014-07-02 23:51:08 +07:00
Sean Harvey
cf33eb79a4 Merge pull request #81 from RuthAdele/patch-1
'live' is deprecated, use 'on' instead.
2014-04-07 14:41:33 +12:00
RuthAdele
240c73b2a8 'live' is deprecated, use 'on' instead. 2014-04-07 12:05:42 +09:30