Commit Graph

141 Commits

Author SHA1 Message Date
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
David Jay fbf27a9d75 Resolving 500 error when deleting an action. 2016-11-15 14:24:38 -05:00
Riley Davis 7ecd60fbf7 Merge branch 'master' into like-button 2016-11-15 12:15:13 -07:00
Dan Zajdband 2438161ad9 Removed extra return 2016-11-15 12:54:25 -05:00
Dan Zajdband 1bd816dab3 Merged conflicts 2016-11-15 12:40:48 -05:00
Dan Zajdband 27261cc515 Added fix for returning a new array 2016-11-15 12:37:05 -05:00
Belen Curcio 366e072280 Linting Issues 2016-11-14 23:35:33 -03: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
Dan Zajdband e53ac55e6b Linting 2016-11-14 17:03:31 -05:00
Dan Zajdband 223887616d feature(coral-admin): Add users role change 2016-11-14 16:20:56 -05:00
David Jay 494b7d808b Addressing lint error. 2016-11-14 13:02:08 -05: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 b629cf359f Removing likes and flags on second click. 2016-11-11 19:07:15 -05:00
David Jay 92869e529a Fixing comment count bug. 2016-11-11 16:27:56 -05:00
David Jay 1adac5cde1 Adding like button. 2016-11-11 16:25:47 -05:00
gaba 879b32cf9e Merge branch 'master' into moving-to-queue 2016-11-11 13:01:48 -08:00
gaba c6198b21bc It changes the endpoint for the moderation queue. 2016-11-11 12:59:24 -08:00
Riley Davis 2c6d321c7f Merged branch permalinks-v2 into permalinks-v2 2016-11-11 13:25:56 -07:00
Riley Davis add200fe38 rename translations file to json 2016-11-11 13:25:46 -07:00
Riley Davis f0027220ce Merge branch 'master' into permalinks-v2 2016-11-11 13:18:30 -07:00
Riley Davis 4b6bf58d43 now with translations and page hostname 2016-11-11 13:17:18 -07:00
David Jay a16959b432 Merge branch 'i18n' of https://github.com/coralproject/talk into i18n 2016-11-11 13:49:48 -05:00
David Jay ba43e9d6dd Adding translations for comment post notifications. 2016-11-11 13:46:35 -05:00
Riley Davis 8369f09bda Merge branch 'master' into permalinks-v2 2016-11-11 11:45:42 -07:00
Riley Davis e2735759a6 first pass at permalink box 2016-11-11 11:27:39 -07:00
gaba aeefa89e0a Fix spanish translations. 2016-11-11 09:22:05 -08:00
David Jay 9174b0fcda Merge branch 'master' of https://github.com/coralproject/talk into i18n 2016-11-11 11:45:27 -05:00
David Jay 309f53b359 Adding notifcation translations. 2016-11-11 11:44:50 -05:00
David Erwin e279a46df5 Merge master into load-settings 2016-11-11 11:24:44 -05:00
David Erwin f6c295ca78 Lint 2016-11-11 11:16:19 -05:00
David Erwin 0c998e1196 Lint 2016-11-11 11:15:11 -05: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
gaba ce2b21b805 Merge branch 'master' into lint-newlines 2016-11-10 15:09:49 -08:00
David Jay d7c02b53a7 Addressing formatting errors. 2016-11-10 17:51:39 -05:00
David Jay ff4e778dde Adding seperate translation files for packages. 2016-11-10 17:34:26 -05:00
David Erwin 6f7fe6ace7 Add embedding routes and homepage 2016-11-10 17:12:32 -05:00
David Jay 0ce892fe7a Loading settings and modifying commentbox to reflect pre and post-mod behavior. 2016-11-10 17:04:04 -05:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
David Erwin f4bc5d4e82 Merge and resolve an initial state bug 2016-11-10 13:20:21 -05: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 465437b04a Merge branch 'master' into actions-working 2016-11-10 10:26:49 -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
David Jay 6ef0d3ef41 Posting flags correctly and displaying flags when clicked. 2016-11-09 18:30:01 -05:00
David Erwin 9856c377eb Merge branch 'master' into update-settings-in-ui 2016-11-09 17:34:25 -05:00
Dan Zajdband 99f0e77ce1 add(coral-admin): Working actions 2016-11-09 17:27:44 -05:00
David Erwin 777dd9d4ed Merge branch 'update-settings-in-ui' of https://github.com/coralproject/talk into update-settings-in-ui 2016-11-09 17:13:27 -05:00
David Erwin decb6747fd Comment out inactive Settings options 2016-11-09 17:12:52 -05:00
David Jay b7ee23d000 Updating commentstream to reflect new store structure. 2016-11-09 17:01:50 -05:00