Commit Graph

3586 Commits

Author SHA1 Message Date
Benjamin Goering bce84f24fd Embed can remove best tag 2017-02-28 19:59:33 +08:00
Benjamin Goering 98f3033326 Add permission checking to addCommentTag,removeCommentTag 2017-02-28 19:59:33 +08:00
Benjamin Goering 30ee80b12c basic working removeCommentTag mutation 2017-02-28 19:59:33 +08:00
Benjamin Goering 4ff6bce8ec Add ComentsService#removeTag 2017-02-28 19:59:33 +08:00
Benjamin Goering 1bb20923a2 Fix Commenter/BestCommentTest to postComment before checking things. 2017-02-28 19:59:32 +08:00
Benjamin Goering 6e338290a1 addCommentTag mutation works 2017-02-28 19:59:32 +08:00
Benjamin Goering fc9c67b05c BestButton sends mutations to backend, but they aren't implemented yet 2017-02-28 19:59:32 +08:00
Benjamin Goering 907c4526da BestButton only shows if currentUser can use it (and e2e) 2017-02-28 19:57:50 +08:00
Benjamin Goering a26a60cc67 minial best button uionly and e2e 2017-02-28 19:57:50 +08:00
Wyatt Johnson 87d64e575b Merge branch 'master' into whizard-whitelist 2017-02-27 15:52:16 -07:00
Wyatt Johnson aa88eb2374 Adjusted build process 2017-02-27 15:33:52 -07:00
Wyatt Johnson 6cd3c84853 Moved route definitions into env wrapped check, webpackified embed 2017-02-27 14:21:48 -07:00
David Jay 303148e5ba Merge pull request #345 from coralproject/bugfix-second-new-comments
Prevents "0" from appearing on empty comment streams
2017-02-27 15:34:40 -05:00
Belen Curcio 95876fa0e8 Merge branch 'master' of github.com:coralproject/talk into whizard-whitelist 2017-02-27 17:19:54 -03:00
Belen Curcio 555faa02f5 new translations for configure 2017-02-27 17:18:37 -03:00
Belen Curcio 1234a99a0d copy for install permitted domains updated 2017-02-27 17:16:19 -03:00
Belen Curcio b9e9d3e7fa status 2017-02-27 17:06:22 -03:00
Belen Curcio 628e8844f3 final translations 2017-02-27 17:04:14 -03:00
Belen Curcio b47fd35437 add user translations 2017-02-27 16:58:16 -03:00
David Jay 1b495b9b09 Merge branch 'master' into bugfix-second-new-comments 2017-02-27 14:57:24 -05:00
David Jay 373d0de576 Merge pull request #346 from coralproject/mod-queue-sort
Adding sort to moderation queue.
2017-02-27 14:57:09 -05:00
Belen Curcio 7341fdff4e add Organization translations 2017-02-27 16:54:03 -03:00
Belen Curcio 1e52c579cc Ínitial translations 2017-02-27 16:50:04 -03:00
Belen Curcio 013625df27 no validation for domains 2017-02-27 16:39:52 -03:00
David Jay ab16e5bfe7 Retrieving comment y id from backend 2017-02-27 14:26:20 -05:00
David Jay dfd211deda Merge branch 'master' into mod-queue-sort 2017-02-27 14:05:04 -05:00
Belen Curcio 9305853502 Renamed to PermittedDomains 2017-02-27 15:50:07 -03:00
Belen Curcio b1ec512721 Adding whitelist step, sending whitelist 2017-02-27 14:42:57 -03:00
gaba ca4b03872b Merge branch 'master' into story-138187767-mod-flag-names 2017-02-27 09:39:52 -08:00
David Jay 83e713d889 Merge branch 'master' into bugfix-second-new-comments 2017-02-27 12:34:11 -05:00
David Jay a47e2378e9 Merge pull request #331 from coralproject/dont-agree
Don't Agree flags
2017-02-27 12:32:56 -05:00
David Jay 491f254206 Merge branch 'mod-queue-sort' of github.com:coralproject/talk into mod-queue-sort 2017-02-27 12:30:04 -05:00
David Jay 2b22ce076c Merge branch 'master' into mod-queue-sort 2017-02-27 12:29:42 -05:00
David Jay 22793c02e2 Merge branch 'master' into dont-agree 2017-02-27 12:29:19 -05:00
David Jay 37b08fd4e4 Displaying oldest first by default. 2017-02-27 12:28:13 -05:00
Kim Gardner 7914296997 Merge pull request #347 from coralproject/header
[Tablet] - Header and Drawer
2017-02-27 11:50:30 -05:00
gaba 714b496c9d Merge branch 'master' into story-138187767-mod-flag-names 2017-02-27 07:46:23 -08:00
Belen Curcio e8a92b768c logout and version in drawer 2017-02-27 11:52:21 -03:00
Belen Curcio f85a6d4da1 Drawer 2017-02-27 11:49:53 -03:00
Kim Gardner 3a6a8ff199 Merge pull request #334 from coralproject/story-140080313-modal-dn
Prompt for username when signing up with Facebook
2017-02-27 08:08:19 -05:00
David Jay 847df91cbc Merge branch 'master' into bugfix-second-new-comments 2017-02-24 20:03:42 -05:00
gaba a429af3c0e Removes varialbe not used. 2017-02-24 16:10:39 -08:00
gaba d650779c1a Removes ; 2017-02-24 16:10:38 -08:00
gaba 7557592dc4 Get more data into the store. 2017-02-24 16:06:18 -08:00
David Jay 66a890458c Adding sort to moderation queue. 2017-02-24 17:42:29 -05:00
David Jay 6a9d8c0436 Removing refetch and prevent 0 from displaying on empty comment streams. 2017-02-24 15:51:43 -05:00
David Erwin f1c1214229 Merge branch 'master' into story-140080313-modal-dn 2017-02-24 15:40:11 -05:00
David Erwin 2739a01cd3 Merge pull request #341 from coralproject/notifications-alerts
copy updates and remove notification
2017-02-24 15:37:34 -05:00
Wyatt Johnson 212037891a Merge branch 'master' into assets-by-like 2017-02-24 13:36:54 -07:00
Riley Davis 11a664d446 Merge branch 'master'
Conflicts:
	client/coral-plugin-commentbox/CommentBox.js
2017-02-24 13:33:25 -07:00