wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,775 Commits 10 Branches 125 Tags
4fcdec92d8e68b60efa047b50cdc4ec8fe1ee2ce
Commit Graph
8775 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Jay 31abe57cb2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
 2017-01-25 17:15:12 -05:00
Wyatt JohnsonandGitHub 000f2c64bb Merge branch 'master' into streams-by-asset-id 2017-01-25 14:50:51 -07:00
Wyatt JohnsonandGitHub 34ca36822f Merge pull request #259 from coralproject/graphql-abstraction 
Moved the graphql file out of the const string
 2017-01-25 14:50:42 -07:00
Wyatt JohnsonandGitHub 0035037583 Merge branch 'master' into graphql-abstraction 2017-01-25 14:32:52 -07:00
Wyatt Johnson 693e92a627 Moved the graphql file out of the string 2017-01-25 14:31:11 -07:00
David Erwin b4abb9724e Fix homepage bug 2017-01-25 15:59:08 -05:00
David Erwin 9764631a37 Fix asset search skip limit bug 2017-01-25 15:37:18 -05:00
David ErwinandGitHub e320a9dd20 Merge branch 'master' into streams-by-asset-id 2017-01-25 15:30:44 -05:00
David Erwin 1f1b1d43ae Add useful links 2017-01-25 15:27:38 -05:00
David Erwin 29e69a66bb Add basic index page for assets 2017-01-25 15:23:02 -05:00
Wyatt JohnsonandGitHub 9598c55466 Merge pull request #256 from coralproject/graoh-fixes 
Comment ordering fixed, banned users can't do anything
 2017-01-25 13:16:05 -07:00
Belen Curcio ec0dd34d40 Configure tab while you are loggedOff 2017-01-25 16:33:55 -03:00
David Erwin ad9684acd9 Create load stream by id route 2017-01-25 14:08:19 -05:00
Wyatt Johnson 91402a3e8b Moved PID into util.js 2017-01-25 11:57:40 -07:00
Wyatt Johnson edf9ced454 Added PID support 2017-01-25 11:11:33 -07:00
Belen Curcio 7c132600f0 Console log and typo 2017-01-25 11:47:35 -03:00
Belen Curcio b3eb3e3c43 Updated tests for Comment History 2017-01-25 11:44:51 -03:00
Belen Curcio d19d2ebe48 My Comment History Working - linted 2017-01-25 11:19:34 -03:00
Belen Curcio 30b6f8d112 my Comment History working 🎉 : TADA : 2017-01-25 11:04:23 -03:00
Belen Curcio 14483a39a0 Tests passing, removing legacy items 2017-01-25 08:38:03 -03:00
Belen Curcio c1d3cdce77 deprecating items 2017-01-25 08:11:52 -03:00
Belen Curcio cebc5f2f45 Adding fragment views 2017-01-25 07:09:11 -03:00
Belen Curcio b1848c28e4 Adding Missing Translations 2017-01-25 07:08:55 -03:00
Belen Curcio e993330467 Adding fragments 🎉 2017-01-25 05:20:34 -03:00
Belen Curcio e3b183c565 Items cleanup 2017-01-25 05:15:04 -03:00
Wyatt Johnson 373f119ac2 Added more comment sorting 2017-01-24 17:22:29 -07:00
Wyatt Johnson eb469df573 Removed debugging tool 2017-01-24 17:08:12 -07:00
Wyatt Johnson 26b7d48f1f Comment ordering fixed, banned users can't do anything 2017-01-24 17:06:40 -07:00
David ErwinandGitHub 79b366f257 Merge pull request #255 from coralproject/translation-fix 
fixed translation key, enforced moderation setting schema
 2017-01-24 18:34:48 -05:00
Wyatt Johnson b6d917a22b fixed translation key, enforced moderation setting schema 2017-01-24 16:08:13 -07:00
David ErwinandGitHub 622afcc80f Merge pull request #254 from coralproject/graphql 
Graphql redux (as in 'the return of')
 2017-01-24 18:02:18 -05:00
David ErwinandGitHub a09c208f58 Merge branch 'master' into graphql 2017-01-24 17:56:04 -05:00
Wyatt Johnson 2698045e82 Fixed capital 2017-01-24 15:50:37 -07:00
Wyatt Johnson 5a2d8c5201 Fixed template tag 2017-01-24 15:40:32 -07:00
David ErwinandGitHub 9616c50d49 Merge pull request #251 from coralproject/graphql 
Graphql for the comment feed
 2017-01-24 17:24:11 -05:00
David Erwin 66b0babdde Merge branch 'graphql' of https://github.com/coralproject/talk into graphql 2017-01-24 17:17:38 -05:00
David Erwin 9435b627b1 Uppercase more enums in coral-admin 2017-01-24 17:17:03 -05:00
Riley Davis da7349343e Merged branch graphql into graphql 2017-01-24 15:09:09 -07:00
Riley Davis 62ae297887 make sure the app does not break if you don't have react devtools installed 2017-01-24 15:08:38 -07:00
Belen Curcio d2acffc19c linting! 2017-01-24 19:07:53 -03:00
Belen Curcio 054baa0530 çonfig actions not defined 2017-01-24 19:01:45 -03:00
Belen Curcio fb791a9df9 merge 2017-01-24 18:52:37 -03:00
Belen Curcio ecfb365c24 log 2017-01-24 18:51:06 -03:00
Wyatt Johnson fa300b1c24 Fixes to circle 2017-01-24 14:38:44 -07:00
David Jay b0acdff34d Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-24 16:23:27 -05:00
Belen Curcio 6f44b9cba0 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-24 18:23:11 -03:00
David Jay 7c3f566202 Handling links inside of iframe in via Pym. 2017-01-24 16:21:49 -05:00
Belen Curcio 9edf99730d Status 2017-01-24 18:21:49 -03:00
Wyatt Johnson 050e98f157 Fixed report location 2017-01-24 14:12:52 -07:00
David Erwin 5566856542 Merge branch 'graphql' of https://github.com/coralproject/talk into graphql 2017-01-24 16:12:13 -05:00