Commit Graph

7162 Commits

Author SHA1 Message Date
Riley Davis 7fc3dffc77 reload assets after updating state 2016-12-21 16:49:53 -07:00
Riley Davis 7cbd06834f set defaults on fetchAssets 2016-12-21 16:39:29 -07:00
David Jay 81ff5420fe Completing user endpoitn updates. 2016-12-21 15:26:47 -08:00
Wyatt Johnson 6db2361edb Adjusted middleware 2016-12-21 16:19:19 -07:00
Wyatt Johnson 8233937f7a Moved wordlist loading into the middleware 2016-12-21 15:55:40 -07:00
gaba 7f86c936ad Adds a very simple INSTALL file for devs. 2016-12-21 13:17:04 -08:00
David Jay c867ae8eeb Removing Next and Prev from pager and updating tests. 2016-12-21 12:11:42 -08:00
David Jay cfed42be2c Correcting bug in fetchAssets. 2016-12-21 12:05:25 -08:00
David Jay 00cf81563e Adding user endpoints to swagger. 2016-12-21 12:01:37 -08:00
David Jay 55f58beced Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list 2016-12-21 11:39:56 -08:00
David Jay 29fa26260c Handling undefined values in fetchAssets call. 2016-12-21 11:39:21 -08:00
David Jay 8f877b87cb Adding swagger endpoints. 2016-12-21 11:32:30 -08:00
Riley Davis 50112d3166 create mapStateToProps 2016-12-21 12:22:54 -07:00
Riley Davis 9cea233ce4 Merge branch 'master' into admin-asset-list 2016-12-21 12:13:27 -07:00
Riley Davis 4f9e793810 remove logs 2016-12-21 11:23:08 -07:00
riley f5b8c0bbba fix lint 2016-12-21 11:19:17 -07:00
Riley Davis b6a11fb729 Merged branch master into suspect-wordlist 2016-12-21 11:12:26 -07:00
Riley Davis 18d4c58a48 allow pasting comma-separated lists 2016-12-21 11:12:09 -07:00
gaba 7562edc168 Removes console log. 2016-12-21 08:52:39 -08:00
David Erwin 917feeaba2 Merge pull request #194 from coralproject/heroku
Initial support for Heroku Deployment
2016-12-21 10:17:47 -05:00
gaba 29250f2bbc Fixed unpromised rejection in test. 2016-12-20 18:01:28 -08:00
gaba 9c9597ae8c Persist the session in tests through chai agent. 2016-12-20 17:52:55 -08:00
David Jay 149a0487c6 Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:03:17 -08:00
David Jay a490aaeaf0 Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:02:24 -08:00
Wyatt Johnson ef38ed3443 Added postinstall hook for heroku deploys 2016-12-20 17:51:30 -07:00
David Jay 0235d26295 Correcting accidentally moved pager files. 2016-12-20 16:34:27 -08:00
Wyatt Johnson 36c9f51aa8 Initial support for Heroku Deployment 2016-12-20 17:33:18 -07:00
David Jay 7faa3eeecf Merge branch 'master' of github.com:coralproject/talk into add-flag-option 2016-12-20 16:23:39 -08:00
David Jay 8052dd9149 Merge branch 'docs-add-reactions' of github.com:coralproject/talk into docs-add-reactions 2016-12-20 16:19:57 -08:00
David Jay d998549fd0 Updating swagger docs. 2016-12-20 16:16:10 -08:00
Riley Davis 9315337ce6 suspect words are marked up 2016-12-20 16:56:16 -07:00
Riley Davis ef0055e689 highlight suspect words 2016-12-20 16:42:16 -07:00
Riley Davis 9e0ab7d2a1 load actions in a reducer 2016-12-20 15:47:27 -07:00
David Jay c85daa2ece Merge branch 'master' into docs-add-reactions 2016-12-20 13:53:49 -08:00
Riley Davis 652a41971b Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2016-12-20 14:51:36 -07:00
gaba 16a4daaeb3 Merge branch 'master' into csrf 2016-12-20 13:46:08 -08:00
Gabriela Rodríguez Berón 9d22dcd0d4 Merge pull request #190 from coralproject/refactor-talk-adapter
Refactor talk adapter
2016-12-20 13:45:19 -08:00
David Jay c4510c1abf Updating action documentation. 2016-12-20 13:43:38 -08:00
David Jay 67225b3a4b Updating documentation for actions. 2016-12-20 13:39:04 -08:00
Riley Davis 7351aecade update user constants 2016-12-20 13:48:00 -07:00
Riley Davis 55c5f6d5be use spread operator. update action constants 2016-12-20 13:25:21 -07:00
Riley Davis 96141d8abc remove status from new comment 2016-12-20 13:23:36 -07:00
gaba e16bc8f7ad Adds agent to persist session in tests. 2016-12-20 12:18:30 -08:00
David Jay d7829232a3 Making font sizes relative. 2016-12-20 12:00:56 -08:00
Riley Davis 7a1c3e730b fix lint 2016-12-20 12:56:44 -07:00
Riley Davis 96ed008b96 remove some more string literals 2016-12-20 12:50:12 -07:00
Riley Davis 0a19a284ab simplify banUser dialog action creators 2016-12-20 12:47:23 -07:00
Riley Davis 268f6616a5 update the status correctly 2016-12-20 12:45:30 -07:00
Riley Davis 11d8b2cd91 update a comment's status 2016-12-20 12:39:57 -07:00
David Jay a3eb4f5c76 Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option 2016-12-20 11:31:57 -08:00