Commit Graph

6090 Commits

Author SHA1 Message Date
Kiwi b7e501f7a3 Merge branch 'master' into story/150381206 2017-09-11 10:37:08 +02:00
Kim Gardner 823c570539 Merge pull request #939 from coralproject/losowsky-patch-1
Fixed broken link on docs homepage
2017-09-09 14:31:26 +01:00
Andrew Losowsky 221db29539 Fixed broken link on docs homepage
also changed the phones detail so that we don't have to keep updating it with new phones
2017-09-08 21:10:14 -05:00
Wyatt Johnson 9af21b4226 test fixes 2017-09-08 16:23:31 -06:00
Wyatt Johnson d20bd20005 linting 2017-09-08 15:46:04 -06:00
Wyatt Johnson ce3e29813b implemented status switch when mismatched 2017-09-08 15:41:43 -06:00
Kiwi 7ea22c84ee Merge pull request #935 from coralproject/kill-the-zombies
Kill the zombies
2017-09-08 19:28:35 +02:00
Chi Vinh Le 4046b6e0a6 Remove zombie files 2017-09-09 00:20:18 +07:00
Kim Gardner 1221c6043f Merge pull request #931 from coralproject/prop-types
PropTypes
2017-09-08 12:09:53 +01:00
Kim Gardner 76fd261141 Merge branch 'master' into prop-types 2017-09-08 10:56:35 +01:00
Kim Gardner 5e295fc337 Merge pull request #803 from coralproject/feature/talk-plugin-toxic-comments
Toxic Comments Plugin
2017-09-08 10:51:14 +01:00
Kim Gardner 299c6f1ffd Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-08 10:16:40 +01:00
Kim Gardner 42e15bd630 Merge branch 'master' into prop-types 2017-09-08 09:37:24 +01:00
Kim Gardner 51077b689d Merge pull request #926 from coralproject/private-npm
Marking Talk as a Private Repo
2017-09-08 09:33:38 +01:00
Wyatt Johnson f69703a8ba fixed missing 2017-09-08 00:47:08 -06:00
Wyatt Johnson 2e350c2244 Merge branch 'master' into prop-types 2017-09-08 00:44:09 -06:00
Wyatt Johnson b43a57328c Merge branch 'master' into private-npm 2017-09-08 00:40:22 -06:00
Kim Gardner 589189023a Merge pull request #928 from coralproject/fix-linting
Fix linting
2017-09-08 06:53:08 +01:00
Wyatt Johnson 671c1d7449 Merge pull request #927 from pdehaan/issue-923
Tweak ESLint config to check .js files
2017-09-07 14:04:29 -06:00
Wyatt Johnson 22cea681a7 Merge branch 'fix-linting' into issue-923 2017-09-07 14:03:21 -06:00
Wyatt Johnson 56bd3f23c7 fixed broken query 2017-09-07 13:53:37 -06:00
Wyatt Johnson 2b91bcffda fixes #923 2017-09-07 13:49:22 -06:00
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
Wyatt Johnson 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
Kiwi bd7f81fb35 Merge branch 'master' into change-websocket-uri 2017-09-07 18:36:21 +02:00
Kiwi 53372ca1e8 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-07 18:22:04 +02:00
Kim Gardner 856ae456f4 Merge pull request #920 from coralproject/bump-version
Bump version to 3.5.0
2017-09-07 17:18:06 +01:00
Kim Gardner aa52063fa4 Merge branch 'master' into bump-version 2017-09-07 16:55:10 +01:00
Kim Gardner b72bba96fb Merge branch 'master' into change-websocket-uri 2017-09-07 16:54:59 +01:00
Chi Vinh Le f82a0c80bf Handle timeout and failure of perspective api 2017-09-07 19:37:45 +07: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 Gardner 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
Kim Gardner 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