Commit Graph

232 Commits

Author SHA1 Message Date
gaba ff6ee76d3d Fix changeStatus 2016-11-22 12:32:33 -08:00
gaba f7c4e8bf24 Merge branch 'master' into ban-user 2016-11-22 09:35:06 -08:00
gaba 7dc7df2601 Merge branch 'master' into ban-user 2016-11-22 09:30:52 -08:00
David Jay 2e54a51678 Merge branch 'master' into user-integration 2016-11-22 12:09:29 -05:00
Wyatt Johnson 8eacb01484 Added fixes for prod 2016-11-22 09:31:54 -07:00
David Jay 5c532dab5e Merge branch 'master' of https://github.com/coralproject/talk into user-integration 2016-11-22 11:11:52 -05:00
Wyatt Johnson 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
gaba 0a8ab759b5 Move into setStatus and other actions when banned and unbanned. 2016-11-21 17:01:36 -08:00
David Jay 1931c85d67 Merging 2016-11-21 19:23:29 -05:00
David Jay 06686105c4 Merge branch 'master' into connect-reset-to-fe 2016-11-21 19:06:04 -05:00
David Jay 2b9caf8daf Updating frontend to utilize new action delete endpoint. 2016-11-21 18:00:50 -05:00
David Jay 1a648ca20e Simplifying item references in CommentStream. 2016-11-21 17:12:55 -05:00
David Jay c6b1e5a800 Adding frontend IDs to facilitate management of actions. 2016-11-21 16:54:01 -05:00
Bel fa190b4b3e CoralLogo added to Coral-UI as SVG. and Admin session 2016-11-21 18:30:12 -03:00
David Jay 9afc9640ee Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room 2016-11-21 16:26:22 -05:00
David Jay 56205aee74 Expanding dialog box for signin. 2016-11-21 16:19:27 -05:00
gaba 3337e95a6c Move the change status of the user to a ban the user func. 2016-11-21 12:18:19 -08:00
Riley Davis a375c63cbb Merged branch master into connect-reset-to-fe 2016-11-21 12:56:43 -07: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
Gabriela Rodríguez Berón 645a06484d Merge branch 'master' into user-integration 2016-11-18 20:47:38 -08:00
gaba 2b3da02cb7 Merge branch 'master' into ban-user 2016-11-18 20:41:49 -08:00
gaba 225592d7b5 Modify the action for status update. 2016-11-18 20:39:11 -08:00
David Jay 1a1df1656f Posting like and flag with appropriate user_id. 2016-11-18 23:20:17 -05:00
David Jay a4a8b97873 Including author name when comments are first posted. 2016-11-18 23:15:41 -05:00
Riley Davis 506c514799 request pw reset from ui 2016-11-18 15:09:13 -07:00
gaba 7c960e7118 Add ban action. 2016-11-18 13:22:54 -08:00
Dan Zajdband 0f7d758336 fix(coral-admin): Linted code 2016-11-18 15:12:59 -05:00
David Jay 29bf5b9990 Adding author info to comments and author name display. 2016-11-18 14:22:21 -05:00
gaba 0f5c0d7ce2 Adding the ban action to the moderation queue. 2016-11-18 11:14:53 -08:00
gaba e2813d2cc7 Missing SET_STATUS 2016-11-18 10:21:03 -08:00
David Jay a0db48ea22 Adding author id to posted comments. 2016-11-18 13:10:59 -05:00
gaba 8bf8ed08aa Merge branch 'master' into ban-user 2016-11-18 09:36:38 -08:00
gaba 2f6e0b04d6 Adds status to the user. 2016-11-18 09:29:14 -08:00
David Jay da07b737b2 Allowing commentstream to be rendered outside of embed. 2016-11-18 12:19:58 -05:00
Dan Zajdband ee9dc7260f add(coral-admin): Added cointains link warning 2016-11-18 12:15:53 -05:00
David Jay 95cd83c09e Merge branch 'master' of https://github.com/coralproject/talk into notification-room 2016-11-18 11:55:47 -05:00
David Jay b14bd02de6 Addressing style bug in FlagButton. 2016-11-18 11:51:08 -05:00
David Jay 53fa63b269 Fixing bug where reply buttons in replies to not operate as expected. 2016-11-18 11:30:38 -05:00
Dan Zajdband 1134e3bc09 add(coral-admin): Syntax highlighting on links 2016-11-18 10:46:09 -05:00
Belen Curcio 6e75b03d6b Empty states, validation and removing availability 2016-11-18 07:41:46 -03:00
Belen Curcio b1824cdc01 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-18 06:08:23 -03:00
David Jay 243c36a306 Switching Permalink props on replies to avoid null errors. 2016-11-17 17:45:44 -05:00
gaba 81f770fb05 Merge branch 'passport' into ban-user 2016-11-17 11:55:20 -08:00
David Jay c7d2a9a94f Adding padding for notifications at the bottom of the comment stream. 2016-11-17 14:52:08 -05:00