Commit Graph

82 Commits

Author SHA1 Message Date
Belen Curcio c72e504af8 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-11 19:43:49 -03:00
Belen Curcio 7df9e9ed15 Merge branch 'passport' of github.com:coralproject/talk into passport 2016-11-11 19:42:20 -03:00
Wyatt Johnson 80e12d2e30 Added photo support 2016-11-11 14:59:27 -07:00
Wyatt Johnson 68433ec973 Added "display: popup" to the facebook dialog 2016-11-11 14:27:48 -07:00
gaba 51b497e991 Merge branch 'master' into moving-to-queue 2016-11-11 12:17:56 -08:00
Wyatt Johnson f6184fddb0 Added facebook login support + redis cache 2016-11-11 12:53:51 -07:00
Belen Curcio 799c460186 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-11 16:49:28 -03:00
gaba ad01bc813f Removes script and change according to suggestion. 2016-11-11 08:38:51 -08:00
Belén Curcio 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
Wyatt Johnson 6867760099 Initial pass at adding middleware for users 2016-11-10 17:14:33 -07: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 Erwin 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
gaba 6f0698b950 More endpoints 2016-11-07 11:27:05 -08:00
Wyatt Johnson 4a9c1775f1 Updated linting rules + fixed test layout to standardize 2016-11-07 11:51:45 -07:00
David Erwin c84fc24f78 Update based on review 2016-11-07 13:07:25 -05:00
Dan Zajdband adb2dc2054 fix(coral-admin): updated queue endpoint 2016-11-07 12:21:27 -05:00
gaba cffee1ec18 Merge branch 'master' of github.com:coralproject/talk into comment-api-implementation 2016-11-07 09:18:51 -08:00
David Erwin 2ff6bcf85d Merging master into asset 2016-11-07 12:00:28 -05:00
David Erwin c1359a9af9 Move url route into general asset search 2016-11-05 14:44:42 -04:00
David Erwin a6b2215a4b Implement asset tests 2016-11-05 11:14:21 -04:00
David Erwin cb08f139ca Swagger and linting 2016-11-05 08:50:34 -04:00
David Erwin c80282dd91 Implement asset upsert and find 2016-11-04 22:24:06 -04:00
gaba 9916edc127 Adds implementation for get all comments 2016-11-04 15:10:28 -07:00
gaba 9be29b9346 Removes console log. 2016-11-04 14:59:25 -07:00