Commit Graph
8775 Commits
Author SHA1 Message Date
Peter deHaan 2b6a5bfe6e Tweak ESLint config to check .js files 2017-09-07 12:46:52 -07:00
Wyatt Johnson d57c4b253a fixes #924 2017-09-07 13:25:15 -06:00
Belen Curcio 462fcb6b94 Approve actions and styles 2017-09-07 15:02:38 -03:00
Belen Curcio 8e96ef4692 Approve 2017-09-07 14:33:53 -03:00
Wyatt JohnsonandGitHub 94b9c4b2df Merge pull request #921 from coralproject/change-websocket-uri
Change Websocket URI
2017-09-07 11:21:54 -06:00
Wyatt Johnson 96e37ac725 moved config loading to bootstrap 2017-09-07 10:58:58 -06:00
KiwiandGitHub bd7f81fb35 Merge branch 'master' into change-websocket-uri 2017-09-07 18:36:21 +02:00
KiwiandGitHub 53372ca1e8 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-07 18:22:04 +02:00
Kim GardnerandGitHub 856ae456f4 Merge pull request #920 from coralproject/bump-version
Bump version to 3.5.0
2017-09-07 17:18:06 +01:00
Belen Curcio f6b02a52fe Cache and Tombstoning rejected comment working 2017-09-07 13:08:52 -03:00
Kim GardnerandGitHub aa52063fa4 Merge branch 'master' into bump-version 2017-09-07 16:55:10 +01:00
Kim GardnerandGitHub b72bba96fb Merge branch 'master' into change-websocket-uri 2017-09-07 16:54:59 +01:00
Belen Curcio 32d9dc6646 Permissions to moderate comments 2017-09-07 11:27:12 -03:00
Belen Curcio a31a63e1c8 Working Tooltip 2017-09-07 10:12:49 -03:00
Chi Vinh Le f82a0c80bf Handle timeout and failure of perspective api 2017-09-07 19:37:45 +07:00
Belen Curcio 7b59323b26 Moderation Actions 2017-09-07 08:05:39 -03:00
Chi Vinh Le f1c5d479ad Merge branch 'master' into feature/talk-plugin-toxic-comments
Conflicts:
	graph/resolvers/root_mutation.js
	graph/typeDefs.graphql
2017-09-07 16:59:46 +07:00
Chi Vinh Le d8a956d09c Remove dependency on wrapResponse 2017-09-07 16:04:01 +07:00
Chi Vinh Le a78be6874b Remove response helpers 2017-09-07 15:49:51 +07:00
Chi Vinh Le c95c20c9ad Don't put in default plugins 2017-09-07 15:41:00 +07:00
Chi Vinh Le 43b7326db4 Cleanup and apply pr suggestions 2017-09-07 15:38:39 +07:00
Chi Vinh Le b1b3db51a6 Typo 2017-09-07 03:59:15 +07:00
Chi Vinh Le 41cd5b320f Refactor & cleanup toxic-comments plugin 2017-09-07 03:50:49 +07:00
Chi Vinh Le 9b0caa42cd Put toxic comment into premod and add flag 2017-09-06 22:58:52 +07:00
Kim GardnerandGitHub aeb8852588 Merge pull request #922 from coralproject/story-search
Fixed old story search query
2017-09-06 16:39:00 +01:00
Chi Vinh Le b3fe3afd4c Add todo 2017-09-06 22:20:19 +07:00
Wyatt Johnson e96e9c0d5c Fixed old story search query 2017-09-06 09:18:22 -06:00
Chi Vinh Le a11f149c5a Refactor 2017-09-06 22:15:57 +07:00
Chi Vinh Le a6b517b3dd Remove unused code 2017-09-06 22:14:58 +07:00
Chi Vinh Le 6f82fd76f5 First draft of toxic-comments 2017-09-06 22:11:48 +07:00
Wyatt Johnson 4a9b24f096 added more docs related to cookies 2017-09-05 14:08:43 -06:00
Wyatt Johnson 48875294c8 initial support for changing the uri 2017-09-05 13:57:35 -06:00
Belen Curcio 12be487783 excludeIf no featured tags 2017-09-05 16:19:46 -03:00
Kim GardnerandGitHub 5953ef1695 Merge pull request #919 from coralproject/staff-badge-bug
Missing permission for staff members
2017-09-05 17:36:08 +01:00
Kim Gardner 17ae62c66b Bump version to 3.5.0 2017-09-05 17:28:23 +01:00
Wyatt JohnsonandGitHub bb66d7220b Merge branch 'master' into staff-badge-bug 2017-09-05 10:26:11 -06:00
Belen Curcio 0cf7d19d4d Missing permission for staff members 2017-09-05 13:20:36 -03:00
Kim GardnerandGitHub 24a8712159 Merge pull request #918 from coralproject/graph-typo
Graph Typo
2017-09-05 16:58:44 +01:00
Wyatt Johnson 7b27feee96 fixed typo 2017-09-05 09:45:31 -06:00
Kim GardnerandGitHub 0b1e95e66d Merge pull request #894 from coralproject/asset-graph-api
Added graph API for assets
2017-09-05 16:20:21 +01:00
Wyatt JohnsonandGitHub 997a336483 Merge branch 'master' into asset-graph-api 2017-09-05 08:56:49 -06:00
Kim GardnerandGitHub 51a4f0e02e Merge pull request #899 from coralproject/settings-graph-api
Added graph API for settings
2017-09-05 13:23:51 +01:00
Kim GardnerandGitHub 869bf10c96 Merge branch 'master' into asset-graph-api 2017-09-05 11:57:08 +01:00
Kim GardnerandGitHub 0375e7e039 Merge branch 'master' into settings-graph-api 2017-09-05 11:56:57 +01:00
Kim GardnerandGitHub 9b29261f3d Merge pull request #917 from coralproject/fix-offtopic-checkbox
OffTopic checkbox should follow state
2017-09-05 11:56:33 +01:00
KiwiandGitHub fea5f75aa6 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-05 12:56:27 +02:00
Chi Vinh Le 345d183bc4 OffTopic checkbox should follow state 2017-09-05 17:21:11 +07:00
Kim GardnerandGitHub 2564aa98bb Merge pull request #916 from coralproject/author-menu
Author menu, member since, and ignored users
v3.4.0
2017-09-05 09:03:17 +01:00
Chi Vinh Le 612ed3a16d Merge branch 'author-menu' of ssh://github.com/coralproject/talk into author-menu 2017-09-05 02:24:55 +07:00
Chi Vinh Le a5acf8ba82 Add some global css classes 2017-09-05 02:22:10 +07:00