Commit Graph

2028 Commits

Author SHA1 Message Date
gaba f51c857e8b Merge branch 'master' into sory-139595043-qbox 2017-02-14 08:51:58 -08:00
David Erwin b85950140b Merge pull request #309 from coralproject/install-missing
Missing reducer in Talk Installer
2017-02-14 09:59:16 -05:00
Belen Curcio f07900b294 Missing reducer 2017-02-14 11:44:22 -03:00
gaba d4109c8fca Adds textfield to coral-UI. 2017-02-13 16:51:31 -08:00
David Erwin 586d3c4c8a Merge pull request #304 from coralproject/mod-queues-ql
Moderation Queue
2017-02-13 17:40:26 -05:00
Wyatt Johnson 51cbf79f30 Changed fragment 2017-02-13 15:33:10 -07:00
gaba 1d70ae0dec Adds question enable checkbox. 2017-02-13 14:31:56 -08:00
Belen Curcio 8953182329 merge 2017-02-13 19:14:27 -03:00
gaba f9f32b1ef6 Merge branch 'master' into sory-139595043-qbox 2017-02-13 14:13:28 -08:00
gaba 1b788b98c6 Adds questionBox to the gl query 2017-02-13 14:12:32 -08:00
Belen Curcio 51be47b62e added flag functionality 2017-02-13 19:09:26 -03:00
David Erwin b30ace74b4 Merge pull request #299 from coralproject/username-displayname
Inital rename of displayName -> username
2017-02-13 17:07:56 -05:00
gaba 5a2e4b708b Adds question box 2017-02-13 13:48:03 -08:00
Belen Curcio 37ba14f3b5 breaking big words 2017-02-13 18:27:26 -03:00
Belen Curcio 519298b980 Design Pass 2017-02-13 18:12:37 -03:00
gaba b16bdafc1a Adds plugin for question box. 2017-02-13 12:22:05 -08:00
Belen Curcio 732ef9b8bd Adding moderationList for the tests 2017-02-13 16:24:12 -03:00
Belen Curcio 72156a01b8 Merge branch 'mod-queues-ql' of github.com:coralproject/talk into mod-queues-ql 2017-02-13 16:14:48 -03:00
Belen Curcio 0403c46c6c Adding errors response 2017-02-13 16:13:03 -03:00
Belen Curcio 594b87208a GraphQL Review and Responses 2017-02-13 16:00:55 -03:00
Belén Curcio 12acbeee45 Merge branch 'master' into mod-queues-ql 2017-02-13 15:23:43 -03:00
Wyatt Johnson e494cbd7e8 Merge branch 'master' into username-displayname 2017-02-13 11:17:29 -07:00
Riley Davis e178b2e82a Merge pull request #305 from coralproject/date-spacing
add a non-breaking space in between username and pubdate
2017-02-13 11:08:58 -07:00
riley ba51b0742f remove non-breaking space and add css 2017-02-13 11:00:28 -07:00
Riley Davis 5a0af59c45 add a non-breaking space in between username and pubdate 2017-02-13 10:53:03 -07:00
Wyatt Johnson b30a5d2184 Removed 3.4 dep 2017-02-13 10:49:47 -07:00
Belen Curcio e2ebac7176 adds new mutations: setCommentStatus 2017-02-13 14:32:48 -03:00
Wyatt Johnson 4e73d7fc23 Switched from Circle 2.0 -> 1.0, added set -e 2017-02-13 10:23:11 -07:00
Wyatt Johnson a2855a7343 Removed unused shell 2017-02-13 10:03:55 -07:00
Belen Curcio 90ed1f1056 Ban user with graphql, 100 refactor 2017-02-13 11:50:16 -03:00
Wyatt Johnson af49b0f6fb Fixed checkout order 2017-02-10 16:29:29 -07:00
Wyatt Johnson 184e63e4e3 Updated circle based on feedback 2017-02-10 16:28:09 -07:00
Wyatt Johnson de54433c5c Merge branch 'master' into username-displayname 2017-02-10 16:19:27 -07:00
Gabriela Rodríguez Berón b962d672f4 Merge pull request #300 from coralproject/story-137818425-tag-staff
Tag comments made by Staff with 'STAFF' tag automatically.
2017-02-10 13:48:41 -08:00
gaba e2e40ca2b3 Merge branch 'master' into story-137818425-tag-staff 2017-02-10 13:42:50 -08:00
David Erwin 4db2d63ee2 Merge pull request #302 from coralproject/like-bugfix
fix very annoying Like bug
2017-02-10 16:35:20 -05:00
gaba 11ef12c14c Adds padding and resolves when is not staff. 2017-02-10 13:33:57 -08:00
Belen Curcio 894fec9fb6 adding context for moderation 2017-02-10 17:55:51 -03:00
Riley Davis a5e66e61f3 Merge branch 'master' into like-bugfix 2017-02-10 13:26:55 -07:00
Riley Davis 81a408a0b1 fix very annoying Like bug 2017-02-10 13:21:58 -07:00
Belen Curcio bc14b908eb banUsers and moderate separate streams, not found assets etc 2017-02-10 17:15:26 -03:00
gaba 498eb5eb91 Fix the test. 2017-02-10 12:06:36 -08:00
David Erwin 5c4daa72cb Merge pull request #297 from coralproject/actions
Actions Metadata
2017-02-10 14:53:46 -05:00
gaba c80f406b21 Add tests 2017-02-10 11:52:02 -08:00
Wyatt Johnson c637be364a Moved tag creation into mutator 2017-02-10 12:00:50 -07:00
Gabriela Rodríguez Berón 7325525716 Merge branch 'master' into story-137818425-tag-staff 2017-02-10 10:32:43 -08:00
gaba 71fcf9cd3f FE for the Staff Tag. Modifed typedfs graphql. 2017-02-10 10:20:34 -08:00
Wyatt Johnson 2c2541e7be Added fix for not logged in user 2017-02-10 11:00:12 -07:00
Riley Davis 27ea409e31 html things 2017-02-10 10:52:55 -07:00
Belen Curcio 9320ece35b Merge branch 'master' of github.com:coralproject/talk into mod-queues-ql 2017-02-10 08:57:35 -03:00