Commit Graph
569 Commits
Author SHA1 Message Date
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 JayandGitHub 715e40f020 Merge pull request #81 from coralproject/connect-reset-to-fe
Connect reset to fe
2016-11-21 19:17:18 -05:00
David JayandGitHub 06686105c4 Merge branch 'master' into connect-reset-to-fe 2016-11-21 19:06:04 -05:00
David JayandGitHub 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 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 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
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 JohnsonandGitHub 642e05f999 Merge branch 'master' into wordlist 2016-11-21 14:18:16 -07:00
Andrew LosowskyandGitHub 1ab2e061eb added word lists 2016-11-21 16:12:07 -05: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ónandGitHub 645a06484d Merge branch 'master' into user-integration 2016-11-18 20:47:38 -08:00
Gabriela Rodríguez BerónandGitHub 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
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
David Jay 7a6dfbcb4a Returning public user info. 2016-11-18 14:13:42 -05:00
David Jay a0db48ea22 Adding author id to posted comments. 2016-11-18 13:10:59 -05:00
David Jay d12c58c2de Merge branch 'notification-room' of https://github.com/coralproject/talk into notification-room 2016-11-18 12:22:11 -05:00
David Jay da07b737b2 Allowing commentstream to be rendered outside of embed. 2016-11-18 12:19:58 -05:00
Wyatt Johnson 88f963b564 Removed unneeded lines in test 2016-11-18 10:18:44 -07:00
Dan Zajdband ee9dc7260f add(coral-admin): Added cointains link warning 2016-11-18 12:15:53 -05:00
Wyatt Johnson 21d96f2210 Added fix for error view 2016-11-18 10:12:22 -07:00
Wyatt Johnson fe4f8bc464 Replaced query with aggregation 2016-11-18 09:56:52 -07: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 2e6700e490 Addressing but where flag increases like count. 2016-11-18 11:50:12 -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
Gabriela Rodríguez BerónandGitHub d9f1c05216 Merge pull request #64 from coralproject/passport
Auth
2016-11-18 03:41:07 -08: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
Wyatt Johnson c4ba18778c Merge branch 'master' into passport 2016-11-17 14:26:52 -07:00
Riley DavisandGitHub 8184fdf581 Merge pull request #71 from coralproject/password-reset
reset password endpoints
2016-11-17 13:32:08 -07:00
David Jay c7d2a9a94f Adding padding for notifications at the bottom of the comment stream. 2016-11-17 14:52:08 -05:00