Commit Graph
71 Commits
Author SHA1 Message Date
Wyatt Johnson 8eacb01484 Added fixes for prod 2016-11-22 09:31:54 -07:00
Wyatt JohnsonandGitHub 00a8c59c96 Merge branch 'master' into admin 2016-11-22 08:31:21 -07:00
Belen Curcio 8108ca09ef Permissions, views and somestyling 2016-11-22 11:04:56 -03:00
Belen Curcio c8d7585e90 Added FabButton to CoralUI 2016-11-22 09:34:46 -03:00
Belen Curcio 6e6681a553 Styles and refactor errors 2016-11-22 09:08:08 -03:00
Belen Curcio f7daa35c41 Active Routes 2016-11-22 08:32:26 -03:00
Bel b74a1bece3 Link Routes 2016-11-22 08:10:46 -03:00
Bel fa190b4b3e CoralLogo added to Coral-UI as SVG. and Admin session 2016-11-21 18:30:12 -03:00
Wyatt Johnson 3abd6cabac Merge branch 'master' into wordlist 2016-11-21 12:44:08 -07:00
Wyatt Johnson 7cc311bd81 Added wordlist, cleaned comments api 2016-11-21 11:18:52 -07:00
Dan Zajdband 0f7d758336 fix(coral-admin): Linted code 2016-11-18 15:12:59 -05:00
Dan Zajdband ee9dc7260f add(coral-admin): Added cointains link warning 2016-11-18 12:15:53 -05:00
Dan Zajdband 1134e3bc09 add(coral-admin): Syntax highlighting on links 2016-11-18 10:46:09 -05:00
Belen Curcio a8f28f64b7 Merge Issues 2016-11-17 11:00:35 -03:00
gaba 7968839826 It adds translations for the admin and fix CSS. 2016-11-16 03:07:27 -08:00
gaba ff2c3cf30b Hide the textfield when not enable. 2016-11-15 20:31:24 -08:00
gaba 4137758bfd Merge branch 'master' into comment-box 2016-11-15 15:21:08 -08:00
gaba 399ba72e0e It changes translations to json file. It adds infobox setting. 2016-11-15 15:15:41 -08:00
Dan Zajdband a0accfd993 Fixed infoBoxEnabled name 2016-11-15 13:26:39 -05:00
gaba 08d672ed46 Changes model and add admin. 2016-11-15 10:11:37 -08: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
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
gaba c6198b21bc It changes the endpoint for the moderation queue. 2016-11-11 12:59:24 -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 ce2b21b805 Merge branch 'master' into lint-newlines 2016-11-10 15:09:49 -08:00
David Erwin 6f7fe6ace7 Add embedding routes and homepage 2016-11-10 17:12:32 -05:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -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 ErwinandGitHub 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
gaba d7ea18cba9 Fix linting problems. Remove comment of code. Add package. 2016-11-09 13:52:47 -08:00
David Erwin ef0016dbc1 Merge in master and lint 2016-11-09 16:30:30 -05:00
David Erwin c2f450d969 Merging master and linting 2016-11-09 14:37:23 -05:00
David Erwin dc981a93a6 Merging in master 2016-11-09 13:58:19 -05:00
Wyatt Johnson eb146f286b Merge branch 'master' into client-eslint 2016-11-09 11:16:21 -07:00
David Jay 1e2f377329 Updating copied text padding. 2016-11-09 13:13:25 -05:00
Belen Curcio 3dcfb58134 Merge branch 'master' of github.com:coralproject/talk into flagging-adapt-api 2016-11-09 13:08:26 -03:00
David Jay 418b1529ed Updating copying style to match designs. 2016-11-08 19:18:26 -05:00
Wyatt Johnson d8ec009482 Added linting to the client 2016-11-08 17:16:24 -07:00
riley 843f90baea merge master 2016-11-08 16:22:05 -07:00
Riley Davis c6188913d8 display a simple error text 2016-11-08 16:19:40 -07:00