Commit Graph

1065 Commits

Author SHA1 Message Date
gaba 369ed3fc29 Adds csrf protection to some routes. 2016-12-15 13:12:03 -08:00
gaba fc042779c2 Adds csurf to and cookie-parser to manage CRSF protection. 2016-12-15 12:56:34 -08:00
Riley Davis 7ef75fa92c Merge pull request #170 from coralproject/build-fix
Updated tests, fixes #166
2016-12-13 16:24:49 -07:00
Wyatt Johnson 3710d23991 Fixed the settings cache 2016-12-13 16:16:39 -07:00
Wyatt Johnson 55bd600d96 Removed public function in favor of filterForUser transformer 2016-12-13 16:14:49 -07:00
Wyatt Johnson 9bc81f97e5 Merge branch 'master' into build-fix 2016-12-13 15:16:57 -07:00
Wyatt Johnson ce17fa8773 Updated tests, fixes #166 2016-12-13 15:15:08 -07:00
Riley Davis 3754bbd466 Merge pull request #167 from coralproject/view-char-count
View char count
2016-12-13 14:50:21 -07:00
David Jay f17564ec36 Merge branch 'master' into view-char-count 2016-12-13 15:34:58 -05:00
Gabriela Rodríguez Berón 5ed961a90a Merge pull request #169 from coralproject/pluralize-asset
pluralize asset endpoints
2016-12-13 12:03:37 -08:00
Gabriela Rodríguez Berón 497fbaef25 Merge branch 'master' into pluralize-asset 2016-12-13 12:00:33 -08:00
Gabriela Rodríguez Berón ec49f22c0e Merge pull request #168 from coralproject/hide-wordlist-from-fe
Preventing backend from sending banned words to frontend
2016-12-13 11:58:57 -08:00
Riley Davis 61795fa110 tests pass 2016-12-13 12:49:45 -07:00
Riley Davis 52771fc82c pluralize asset endpoints 2016-12-13 12:45:58 -07:00
Gabriela Rodríguez Berón 163fa5fbeb Merge branch 'master' into hide-wordlist-from-fe 2016-12-13 11:40:18 -08:00
Riley Davis 454357fa55 Merge branch 'master' into view-char-count 2016-12-13 12:09:52 -07:00
David Jay cb1d12f757 Preventing backend from sending banned words to frontend. 2016-12-13 14:09:50 -05:00
David Jay 49cea6b71c Merge pull request #161 from coralproject/asset-status
Open/Close comments stream
2016-12-13 14:08:02 -05:00
David Jay 8d35e65cba Merge branch 'view-char-count' of github.com:coralproject/talk into view-char-count 2016-12-13 14:06:39 -05:00
David Jay 277eecaf6c Merge branch 'master' into view-char-count 2016-12-13 14:06:38 -05:00
Riley Davis ac82f3dd98 Merge pull request #150 from coralproject/use-js-while-rendering
remove cruft by pulling out some immutable.js stuff
2016-12-13 14:06:38 -05:00
David Jay 9c7eeb1ec5 Merge branch 'master' into use-js-while-rendering 2016-12-13 14:06:37 -05:00
David Jay 72226f6fe8 Merge branch 'master' into asset-status 2016-12-13 14:00:58 -05:00
Riley Davis 133e6e0311 Merge pull request #150 from coralproject/use-js-while-rendering
remove cruft by pulling out some immutable.js stuff
2016-12-13 11:44:14 -07:00
gaba 387e20309a We already have the default for closedMessage to be null in the model. Removing the passing of a blank closedMEssage. 2016-12-13 10:42:30 -08:00
David Jay 0de2cb7d82 Merge branch 'view-char-count' of github.com:coralproject/talk into view-char-count 2016-12-13 13:37:46 -05:00
David Jay 643373e224 Rejecting comments on the server if the character count is too long. 2016-12-13 13:36:54 -05:00
gaba 894a6c929d Merge branch 'asset-status' of github.com:coralproject/talk into asset-status 2016-12-13 10:33:00 -08:00
Wyatt Johnson 61128e9c06 Updated docs, services, tests. 2016-12-13 11:29:48 -07:00
David Jay 113ceb9889 Merge branch 'master' into view-char-count 2016-12-13 13:28:06 -05:00
gaba 020452684f Merge branch 'master' into asset-status 2016-12-13 10:10:21 -08:00
David Jay 5cb1a15273 Merge branch 'master' into use-js-while-rendering 2016-12-13 13:06:47 -05:00
Belén Curcio 62d8023a0a Merge branch 'master' into asset-status 2016-12-13 14:10:02 -03:00
David Jay 6301408973 Merge pull request #165 from coralproject/set-char-count
Set char count as admin
2016-12-13 12:02:24 -05:00
David Jay 4dca9ff061 Updating translation. 2016-12-13 12:02:00 -05:00
Gabriela Rodríguez Berón b895dbc8cd Update translations.json 2016-12-12 22:38:53 -08:00
gaba 270e6ba70c Merge branch 'master' into asset-status 2016-12-12 22:20:45 -08:00
gaba 7a3b5b60f0 Merge branch 'master' of github.com:coralproject/talk 2016-12-12 22:20:26 -08:00
gaba 9043ae9f20 We are using asset and not article. 2016-12-12 22:19:09 -08:00
gaba 475c84dfbc Fix date comparision and change article for asset. 2016-12-12 22:18:11 -08:00
David Jay 24cc86b130 Merge branch 'master' into use-js-while-rendering 2016-12-12 20:36:10 -05:00
David Jay 533e8d9b94 Merge branch 'set-char-count' of github.com:coralproject/talk into set-char-count 2016-12-12 20:34:45 -05:00
David Jay e88e8212f4 Updating translations. 2016-12-12 20:33:55 -05:00
David Jay ff62c9c14d Merge branch 'master' of github.com:coralproject/talk into set-char-count 2016-12-12 20:30:32 -05:00
David Jay 87a5c4b2d6 Displaying character count and preventing user from posting when count is too high. 2016-12-12 20:29:54 -05:00
Kim Gardner e4ad374366 Merge pull request #162 from coralproject/wordlist
Fix banned word bug
2016-12-12 19:39:41 -05:00
David Jay 44e397b86c Passing character count into commentbox. 2016-12-12 19:36:32 -05:00
David Jay aed1516f95 Merge branch 'master' into set-char-count 2016-12-12 19:21:06 -05:00
David Jay 426e0a02bd Raising error if no count is entered. 2016-12-12 19:12:53 -05:00
David Jay bd240923cc Updating default charcount setting. 2016-12-12 19:10:54 -05:00