Commit Graph

7162 Commits

Author SHA1 Message Date
Kiwi d88919e27b Merge branch 'master' into remember-sort 2017-09-08 19:29:08 +02:00
Kiwi 7ea22c84ee Merge pull request #935 from coralproject/kill-the-zombies
Kill the zombies
2017-09-08 19:28:35 +02:00
Kiwi be86a6f3dc Merge branch 'master' into remember-sort 2017-09-08 19:28:26 +02:00
Chi Vinh Le 4046b6e0a6 Remove zombie files 2017-09-09 00:20:18 +07:00
Chi Vinh Le 6b74877d01 Implement and use pymStorage 2017-09-09 00:15:19 +07:00
Chi Vinh Le 9f33a77745 Implement and use pymStorage 2017-09-09 00:11:15 +07:00
Belen Curcio f33c31c70e Merge branch 'master' of github.com:coralproject/talk into reject-instream 2017-09-08 13:49:54 -03:00
Belen Curcio e28f1caaef Styles 2017-09-08 13:33:53 -03:00
Belen Curcio fefacf039f Featured comments should have ACCEPTED status 2017-09-08 13:25:23 -03:00
Belen Curcio 6494669262 Working for permalink 2017-09-08 13:15:17 -03:00
Peter deHaan 4971ba4722 Add react/recommended ESLint rules 2017-09-08 09:02:54 -07:00
Kim Gardner a9626ad12c Merge branch 'master' into fix-graphql-warnings 2017-09-08 14:37:17 +01:00
Belen Curcio fd71acf7e0 With Featured Comments :) 2017-09-08 09:06:33 -03:00
Belen Curcio 05d643d3c3 Styling 2017-09-08 08:35:57 -03:00
Chi Vinh Le 244a4b108d Correctly detect subsequent change 2017-09-08 18:16:49 +07:00
Kim Gardner 1221c6043f Merge pull request #931 from coralproject/prop-types
PropTypes
2017-09-08 12:09:53 +01:00
Chi Vinh Le 0cfd8afce7 Merge branch 'master' into remember-sort
Conflicts:
	.eslintignore
	.gitignore
2017-09-08 17:56:18 +07:00
Chi Vinh Le c8d1da5715 Remember sort plugin 2017-09-08 17:54:02 +07:00
Chi Vinh Le e5bd8e2a3b No need to check for loading config anymore 2017-09-08 17:47:02 +07:00
Chi Vinh Le 7051c76b40 Init step for plugins and bootstrap, introspection service 2017-09-08 17:37:27 +07:00
Kim Gardner 76fd261141 Merge branch 'master' into prop-types 2017-09-08 10:56:35 +01:00
Kim Gardner f2ecfa0a0d Merge branch 'master' into fix-graphql-warnings 2017-09-08 10:56:33 +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 d16066a981 Merge branch 'master' into fix-graphql-warnings 2017-09-08 09:33:59 +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
Wyatt Johnson d5fcdd6a76 Merge branch 'master' into fix-graphql-warnings 2017-09-08 00:40:15 -06:00
Kim Gardner 589189023a Merge pull request #928 from coralproject/fix-linting
Fix linting
2017-09-08 06:53:08 +01:00
Chi Vinh Le 9c5821f6a2 Fix graphql warnings 2017-09-08 12:06:43 +07: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
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 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
Belen Curcio f6b02a52fe Cache and Tombstoning rejected comment working 2017-09-07 13:08:52 -03: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
Belen Curcio 32d9dc6646 Permissions to moderate comments 2017-09-07 11:27:12 -03:00