Commit Graph

8345 Commits

Author SHA1 Message Date
David Jay 8507a699e8 Adressing linting errors. 2016-11-21 21:24:34 -05:00
David Jay dd060c5fd1 Signing in via e2e and posting comment. 2016-11-21 21:23:48 -05:00
gaba 0a8ab759b5 Move into setStatus and other actions when banned and unbanned. 2016-11-21 17:01:36 -08:00
David Jay b8212c8986 Merge branch 'master' of https://github.com/coralproject/talk into user-integration 2016-11-21 19:24:31 -05:00
David Jay 1931c85d67 Merging 2016-11-21 19:23:29 -05:00
David Jay 715e40f020 Merge pull request #81 from coralproject/connect-reset-to-fe
Connect reset to fe
2016-11-21 19:17:18 -05:00
David Jay 06686105c4 Merge branch 'master' into connect-reset-to-fe 2016-11-21 19:06:04 -05:00
David Jay d355211a53 Merge pull request #80 from coralproject/wordlist
Wordlist
2016-11-21 18:49:33 -05:00
Riley Davis 8a1c9ce44e Merged branch master into connect-reset-to-fe 2016-11-21 16:36:40 -07:00
Riley Davis ae1002fbbf update to root url 2016-11-21 16:36:07 -07:00
Riley Davis a0469301bb add password reset form 2016-11-21 16:32:07 -07:00
David Jay 4adba83c7b Adding test environment vars. 2016-11-21 18:13:05 -05:00
David Jay 2b9caf8daf Updating frontend to utilize new action delete endpoint. 2016-11-21 18:00:50 -05:00
David Jay 7aa893ba9e Adding signing flow to tests. 2016-11-21 17:26:04 -05:00
David Jay 1a648ca20e Simplifying item references in CommentStream. 2016-11-21 17:12:55 -05:00
David Jay f5f38004a2 Merge branch 'master' of https://github.com/coralproject/talk into user-integration 2016-11-21 17:06:00 -05:00
David Jay 357191484d Updating tests. 2016-11-21 17:04:47 -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
Wyatt Johnson 642e05f999 Merge branch 'master' into wordlist 2016-11-21 14:18:16 -07:00
Andrew Losowsky 1ab2e061eb added word lists 2016-11-21 16:12:07 -05:00
David Jay 11478bbdb6 Adding test env variables. 2016-11-21 15:53:26 -05:00
gaba 8355f441e3 When banning without commentid. 2016-11-21 12:42:14 -08:00
David Jay 769eba4515 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-21 15:29:48 -05:00
David Jay 15810e3ece Running comment post test w/ proper settings. 2016-11-21 15:27:31 -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 a45a5f7296 Updated test to verify middleware is working 2016-11-21 12:49:04 -07:00
Wyatt Johnson cab9ec3e52 Fixed package.json 2016-11-21 12:45:08 -07:00
Wyatt Johnson 3abd6cabac Merge branch 'master' into wordlist 2016-11-21 12:44:08 -07:00
Wyatt Johnson 7893d425ef Updated tests 2016-11-21 12:42:42 -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
Gabriela Rodríguez Berón 2160a81b7b Merge pull request #74 from coralproject/added-link-highlighting
add(coral-admin): Syntax highlighting on links
2016-11-18 20:38:35 -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
David Jay 7a6dfbcb4a Returning public user info. 2016-11-18 14:13:42 -05: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
David Jay 87e06678dd Clearing db and manipulating settings on nightwatch tests. 2016-11-18 12:56:17 -05:00
gaba 8bf8ed08aa Merge branch 'master' into ban-user 2016-11-18 09:36:38 -08:00