Commit Graph

6138 Commits

Author SHA1 Message Date
Chi Vinh Le d8ca9dfb07 Fix edit animation 2017-09-12 20:58:33 +07:00
Kiwi f2804f2394 Merge pull request #930 from coralproject/fix-graphql-warnings
Fix graphql warnings
2017-09-12 11:10:44 +02:00
Kiwi a9c4c12824 Merge branch 'master' into fix-graphql-warnings 2017-09-11 16:49:10 +02:00
Kim Gardner ab1f1dee3e Merge pull request #936 from coralproject/remember-sort
Init, Introspection service, pymStorage, and talk-plugin-remember-sort
2017-09-11 12:05:41 +01:00
Kim Gardner 04ad649f01 Merge branch 'master' into remember-sort 2017-09-11 12:00:18 +01:00
Kim Gardner 18e36af50a Merge pull request #940 from bocoup/improve-docs
improve docker compose getting started docs
2017-09-11 11:59:40 +01:00
Kim Gardner 8f1ce9cef6 Merge branch 'master' into remember-sort 2017-09-11 11:53:07 +01:00
Kim Gardner e47cb9732e Merge branch 'master' into fix-graphql-warnings 2017-09-11 11:49:45 +01:00
Kim Gardner 851c5fbfbc Merge branch 'master' into improve-docs 2017-09-11 11:48:35 +01:00
Kim Gardner 0bc9ede8bc Merge pull request #938 from coralproject/story/150381206
Comment Status Fixes
2017-09-11 11:46:45 +01:00
Kim Gardner d8d758255d Merge branch 'master' into story/150381206 2017-09-11 11:39:38 +01:00
Kim Gardner c1e52ba494 Merge pull request #937 from coralproject/reject-instream
In-Stream Moderation - Accept, Reject and Feature!
2017-09-11 11:39:11 +01:00
Kiwi b7e501f7a3 Merge branch 'master' into story/150381206 2017-09-11 10:37:08 +02:00
Boaz Sender ee41cc690c add link to new location for config vars, and include min needed docker env vars in example 2017-09-09 18:05:08 -04:00
Kim Gardner 965b8f9bda Merge branch 'master' into reject-instream 2017-09-09 14:31:54 +01: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
Belen Curcio 7f85ceb566 Featuring from Featured Tab 2017-09-08 18:55:11 -03: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
Belen Curcio 1f6da44b25 Merge branch 'reject-instream' of github.com:coralproject/talk into reject-instream 2017-09-08 18:07:24 -03:00
Belen Curcio 0ea951f3d9 wrong translation 2017-09-08 17:50:30 -03:00
Belén Curcio b75539fb57 Merge branch 'master' into reject-instream 2017-09-08 17:47:09 -03:00
Belen Curcio 72530e7501 Linting and Indenting 2017-09-08 17:17:03 -03:00
Belen Curcio 790c20e7ac Indent 2017-09-08 17:14:15 -03:00
Belen Curcio 2cbd59b4b5 Featured comments error in permalink view, handling permaview moderation and handling replies moderation 2017-09-08 17:05:20 -03:00
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
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