Commit Graph
94 Commits
Author SHA1 Message Date
riley 9942d6eee4 remove reference 2016-11-16 12:09:47 -07:00
Riley Davis 1795fc8863 remove log 2016-11-16 12:00:44 -07:00
riley fa8036ac3f merge master 2016-11-16 11:58:01 -07:00
Riley Davis 7df7279323 endpoints for updating password 2016-11-16 11:49:58 -07:00
David Erwin b55d3768ff Merge master into site-wide-comments 2016-11-16 10:43:35 -05:00
Riley Davis c86e1e8d47 create and decode jwt 2016-11-15 16:21:25 -07:00
riley e5898118e1 Merged master into password-reset 2016-11-15 13:11:02 -07:00
David Jay d1ea85468e Addressing issue when deleting actions. 2016-11-15 14:46:08 -05:00
David Jay a886123c62 Merge branch 'like-button' of https://github.com/coralproject/talk into like-button 2016-11-15 14:39:58 -05:00
Riley Davis eabce87f99 Merged branch master into password-reset 2016-11-15 12:34:43 -07:00
David Jay fbf27a9d75 Resolving 500 error when deleting an action. 2016-11-15 14:24:38 -05:00
Riley DavisandGitHub 7ecd60fbf7 Merge branch 'master' into like-button 2016-11-15 12:15:13 -07:00
David Jay 44292a81ad Moving init and responsehandler to shared functions, updating all routes to return valid JSON. 2016-11-14 17:09:20 -05:00
David Jay 688fbd0bf6 Sending asset_url to backend and retreiving stream with asset. 2016-11-14 16:40:04 -05:00
Dan Zajdband 223887616d feature(coral-admin): Add users role change 2016-11-14 16:20:56 -05:00
David Jay 1a7b716820 Updating stream endpoint to expect asset_url and to return asset. 2016-11-14 15:51:17 -05:00
Riley Davis 7d9b24c5b9 start adding mail settings 2016-11-14 10:44:33 -07:00
David Jay 8abec63620 Merge branch 'master' of https://github.com/coralproject/talk into like-button 2016-11-11 19:20:37 -05:00
David Jay 4bea5e5914 Adding route to delete actions. 2016-11-11 17:06:29 -05:00
gaba 51b497e991 Merge branch 'master' into moving-to-queue 2016-11-11 12:17:56 -08:00
gaba ad01bc813f Removes script and change according to suggestion. 2016-11-11 08:38:51 -08:00
Belén CurcioandDan Zajdband 5b74beabd6 Community Section - Search Commenters (#60)
* Table

* úsers api

* Ádding envs and version

* Community Table Added

* Ádding redux

* Adding loading data state

* Community Actions

* Adding Inmutable

* Fetching commenters

* Search commenters

* Linting and translations

* Ádding Sort

* sortBuilder

* pagr

* request per page, pager and mor

* package.json

* new Page actiokn

* éslint

* Changes and cleaner comps

* removed console.log
2016-11-11 11:14:26 -05:00
gaba 7d5b79c6a0 Moved the moderation queue to its own folder and change the route to /queue/comments/pending 2016-11-10 14:59:56 -08:00
David Erwin f7249c4016 More linting and commenting 2016-11-10 15:12:56 -05:00
David Erwin 89398120d5 Remove function keyword 2016-11-10 14:57:57 -05:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
David ErwinandGitHub fcd62140c6 Merge branch 'master' into remove-queue-folder 2016-11-10 13:27:25 -05:00
gaba eb9e8f4713 Removes queue folder as we are already working on the moderation queue in comments. 2016-11-10 09:38:46 -08:00
David Erwin e632632754 Merging and updating tests 2016-11-10 12:16:58 -05:00
David Erwin a234eeb3ba Add json header, update status, and lint 2016-11-10 10:49:55 -05:00
David Erwin b6a0a99d91 Update method name for clarity 2016-11-10 10:12:47 -05:00
David Jay b50c22a414 Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 22:44:12 -05:00
gaba eae2a0285b More tests and move settings stuff to routes and out of models. 2016-11-09 12:35:59 -08:00
gaba 9ff2613ab4 Comment stream with new and approved when post-moderated. 2016-11-09 11:40:57 -08:00
David Jay 07db6b3f9c Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 13:22:45 -05:00
gaba ab68b81f21 Add tests to stream on moderated comments. 2016-11-09 09:33:15 -08:00
gaba 0968b02c3a Moderation queue depending on moderation settings. 2016-11-08 15:26:05 -08:00
David Jay e8584b499b Returning actions, items, and comments as seperate arrays. 2016-11-08 15:32:52 -05:00
David Jay fcd65c18fd Switching stream to use action summaries function. 2016-11-08 15:23:04 -05:00
gaba c8c82fd03b Move all DB functions into models. Clean up tests. 2016-11-07 18:10:17 -08:00
gaba 0c04e765d6 Moderation queue on flagged comments. 2016-11-07 15:10:56 -08:00
gaba 48e61c2dc1 Merge branch 'master' into mod-queue 2016-11-07 14:28:25 -08:00
gaba 626687f05b Adds moderations queues. 2016-11-07 14:18:43 -08:00
David Jay c8bdecbd1b Merge branch 'master' of https://github.com/coralproject/talk into post-comment 2016-11-07 16:29:06 -05:00
David Jay 0e1e04d2a9 Returning usernames. 2016-11-07 16:19:20 -05:00
David Jay 4737e84681 Displaying comments and replies appropriately. 2016-11-07 16:11:10 -05:00
gaba d911e5b30d Improve test. 2016-11-07 13:08:23 -08:00
gaba 03e5242dcf Merge branch 'master' into comment-api-implementation 2016-11-07 12:22:31 -08:00
Wyatt Johnson fff55e808b Merge branch 'master' into asset 2016-11-07 12:42:30 -07:00
gaba 16e7a6c868 CHanges from query to body for post/put. 2016-11-07 11:34:34 -08:00