wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-22 13:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,120 Commits 10 Branches 125 Tags
e47cb9732e50e8a12d4f8712d5ab8d4494b44e0e
Commit Graph
6120 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim GardnerandGitHub e47cb9732e Merge branch 'master' into fix-graphql-warnings 2017-09-11 11:49:45 +01:00
Kim GardnerandGitHub 0bc9ede8bc Merge pull request #938 from coralproject/story/150381206 
Comment Status Fixes
 2017-09-11 11:46:45 +01:00
Kim GardnerandGitHub d8d758255d Merge branch 'master' into story/150381206 2017-09-11 11:39:38 +01:00
Kim GardnerandGitHub c1e52ba494 Merge pull request #937 from coralproject/reject-instream 
In-Stream Moderation - Accept, Reject and Feature!
 2017-09-11 11:39:11 +01:00
KiwiandGitHub b7e501f7a3 Merge branch 'master' into story/150381206 2017-09-11 10:37:08 +02:00
Kim GardnerandGitHub 965b8f9bda Merge branch 'master' into reject-instream 2017-09-09 14:31:54 +01:00
Kim GardnerandGitHub 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 LosowskyandGitHub 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 CurcioandGitHub 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
KiwiandGitHub 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
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 GardnerandGitHub 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
Kim GardnerandGitHub 1221c6043f Merge pull request #931 from coralproject/prop-types 
PropTypes
 2017-09-08 12:09:53 +01:00
Kim GardnerandGitHub 76fd261141 Merge branch 'master' into prop-types 2017-09-08 10:56:35 +01:00
Kim GardnerandGitHub f2ecfa0a0d Merge branch 'master' into fix-graphql-warnings 2017-09-08 10:56:33 +01:00
Kim GardnerandGitHub 5e295fc337 Merge pull request #803 from coralproject/feature/talk-plugin-toxic-comments 
Toxic Comments Plugin
 2017-09-08 10:51:14 +01:00
Kim GardnerandGitHub 299c6f1ffd Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-08 10:16:40 +01:00
Kim GardnerandGitHub 42e15bd630 Merge branch 'master' into prop-types 2017-09-08 09:37:24 +01:00
Kim GardnerandGitHub d16066a981 Merge branch 'master' into fix-graphql-warnings 2017-09-08 09:33:59 +01:00
Kim GardnerandGitHub 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 JohnsonandGitHub b43a57328c Merge branch 'master' into private-npm 2017-09-08 00:40:22 -06:00
Wyatt JohnsonandGitHub d5fcdd6a76 Merge branch 'master' into fix-graphql-warnings 2017-09-08 00:40:15 -06:00
Kim GardnerandGitHub 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 JohnsonandGitHub 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 JohnsonandGitHub 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 JohnsonandGitHub 94b9c4b2df Merge pull request #921 from coralproject/change-websocket-uri 
Change Websocket URI
 2017-09-07 11:21:54 -06:00