Commit Graph

1700 Commits

Author SHA1 Message Date
David Erwin 087b1a7bd7 Merge pull request #264 from coralproject/postmod-default
Update default setting to POST moderation
2017-01-27 11:16:36 -05:00
Wyatt Johnson 0096de6e79 Merge branch 'master' into postmod-default 2017-01-27 09:11:51 -07:00
Kim Gardner 88d718e7c9 Merge pull request #265 from coralproject/remove-avatar
Remove avatar from user cards
2017-01-27 10:32:12 -05:00
David Erwin c8c160a551 Remove avatar from user cards 2017-01-27 10:16:09 -05:00
Wyatt Johnson 9fbde9c023 Update init.js 2017-01-27 08:04:00 -07:00
David Erwin 744fce4563 Set settings model as well 2017-01-27 10:01:58 -05:00
David Erwin c071484357 Removing test artifiacts 2017-01-27 09:48:41 -05:00
David Erwin 0a80205095 Update default setting to POST moderation 2017-01-27 09:45:35 -05:00
David Erwin fbc5a6660a Merge pull request #263 from coralproject/moderate-bio
Marking correct user as "Pending" on user flags.
2017-01-27 09:25:02 -05:00
David Jay e7587d9a41 Merge branch 'master' into moderate-bio 2017-01-26 17:46:20 -05:00
David Jay 02ece80227 Marking correct user as Pending on user flags. 2017-01-26 17:42:45 -05:00
David Erwin 74d78b76a5 Merge pull request #219 from coralproject/moderate-bio
Moderate bio or username
2017-01-26 17:09:44 -05:00
David Jay f06edec6a2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-26 16:38:43 -05:00
David Jay b6d8a90084 Updating style of UserActions and moving ActionButton to its own component. 2017-01-26 16:36:43 -05:00
David Erwin b35336d1ed Merge pull request #260 from coralproject/hide-premod-links
Hiding premod links
2017-01-26 16:28:48 -05:00
David Erwin f42b8f324a Merge branch 'master' into hide-premod-links 2017-01-26 16:24:06 -05:00
David Erwin 30583cd93f Merge pull request #261 from coralproject/collapse-replies
Collapse replies
2017-01-26 16:21:07 -05:00
David Erwin 2086bd7b72 Merge branch 'master' into collapse-replies 2017-01-26 16:17:23 -05:00
David Erwin fe62c1a739 Merge pull request #257 from coralproject/refresh-data-fix
Cleanup and more GraphQL features
2017-01-26 16:15:55 -05:00
David Jay 06331d3c07 Updating bio moderation to graphQL architecture. 2017-01-26 15:31:15 -05:00
Riley Davis 2ad27ef6f9 add a cancel button to the reply box 2017-01-26 13:21:23 -07:00
Riley Davis 3cbe8bb7ac Stream now tracks what reply box is open 2017-01-26 12:45:14 -07:00
David Erwin afb246b173 Hiding premod links 2017-01-26 10:46:01 -05:00
Belen Curcio 88169526c3 Missing semicolon 2017-01-26 10:50:53 -03:00
Belen Curcio 4a54c571ed Open Stream and Closed Stream status 2017-01-26 10:45:50 -03:00
Belen Curcio 853981e21f Working configure tab and refresh data. Adding uncontrolled components, deleting state 2017-01-26 10:19:49 -03:00
Belen Curcio 74bef18098 user checker 2017-01-26 09:34:47 -03:00
Belen Curcio 64ed10845b Merge 2017-01-25 21:59:42 -03:00
David Erwin 0b73f18eb3 Merge pull request #258 from coralproject/streams-by-asset-id
Streams by asset
2017-01-25 17:48:41 -05:00
David Erwin 1a065ffa51 Merge branch 'streams-by-asset-id' of https://github.com/coralproject/talk into streams-by-asset-id 2017-01-25 17:45:09 -05:00
David Erwin c4256fd27b Ditch console logs 2017-01-25 17:44:21 -05:00
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 Johnson 000f2c64bb Merge branch 'master' into streams-by-asset-id 2017-01-25 14:50:51 -07:00
Wyatt Johnson 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 Johnson 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 Erwin 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 Johnson 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
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