wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-09 02:11:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,162 Commits 10 Branches 125 Tags
367ec00a025e0851abe4bcad3cf2df56163f9964
Commit Graph

7162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riley Davis 203d35e6d1 link to comment instead of article 2016-12-15 14:33:33 -07:00
gaba e76d6e4694 Merge branch 'master' into csrf 2016-12-15 13:23:18 -08:00
gaba 369ed3fc29 Adds csrf protection to some routes. 2016-12-15 13:12:03 -08:00
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07:00
gaba fc042779c2 Adds csurf to and cookie-parser to manage CRSF protection. 2016-12-15 12:56:34 -08:00
Gabriela Rodríguez Berón 5ffc575fae Merge branch 'master' into my-comments-fix 2016-12-15 12:52:26 -08:00
Gabriela Rodríguez Berón ecfedabc28 Merge branch 'master' into login-fix 2016-12-15 12:51:31 -08:00
Wyatt Johnson 9cf2d88ce2 Merge branch 'master' into suspect-wordlist 2016-12-15 13:51:16 -07:00
Dan Zajdband fcb107aefe Global comment stream close setting (#171) 
* Added basic ui

* Added functionality

* Linted code

* using named params instead of props

* lint

* fixed missing merge
 2016-12-15 15:50:19 -05:00
Riley Davis 1ea284d428 remove fromJS call 2016-12-15 13:43:06 -07:00
Wyatt Johnson 556f58e4eb Merge branch 'master' into login-fix 2016-12-15 13:32:18 -07:00
Riley Davis 39fdd168fa admins can still view all comment streams 2016-12-15 13:18:28 -07:00
Riley Davis f4ee28c618 allow non-admin folks to list their comments 2016-12-15 13:05:59 -07:00
Kim Gardner d64c848baa Merge pull request #163 from coralproject/my-comments 
My comments
 2016-12-15 14:24:21 -05:00
David Jay 1154b65c91 Updating state from menu. 2016-12-15 14:19:44 -05:00
Wyatt Johnson 1713b52cb0 The current user can see their own roles. 2016-12-15 12:14:58 -07:00
David Jay 328eaad8e5 Adding update state to reducer. 2016-12-15 14:05:10 -05:00
David Jay c7b232f0b3 Adding action to upate asset state. 2016-12-15 13:10:23 -05:00
Riley Davis d599a65c05 file not being used anywhere 2016-12-15 10:44:20 -07:00
Riley Davis 0892996be0 remove this route until someone is actually using it 2016-12-15 10:41:34 -07:00
David Jay 86eef68b16 Adding status menu. 2016-12-15 12:25:43 -05:00
David Jay d526898962 Loading assets into Streams component. 2016-12-14 20:19:27 -05:00
David Jay faafbfa78c Loading assets and adding to store. 2016-12-14 19:58:04 -05:00
David Jay 78c81aeaf4 Adding asset reducer. 2016-12-14 19:30:59 -05:00
David Jay b98201afa3 Adding and testing function to fetch assets in talk reducer. 2016-12-14 19:03:07 -05:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
David Jay 65b308a061 Adding initial stream list. 2016-12-14 16:01:43 -05:00
Riley Davis 601010f1f9 update constant names 2016-12-14 13:58:28 -07:00
Riley Davis a6fdd2e46b remove redundant endpoint 2016-12-14 13:53:07 -07:00
Riley Davis a072601c3e ignore html files 2016-12-14 13:35:28 -07:00
David Jay 7c6299243f Connecting sorting options to state. 2016-12-14 15:29:56 -05:00
Riley Davis eac53a58b4 add jsdom. tests pass 2016-12-14 13:22:01 -07:00
David Jay dad46cc8de Add style and language to left nav. 2016-12-14 15:15:13 -05:00
David Jay fe2487dea5 Add streams option and sidebar. 2016-12-14 15:02:26 -05:00
Riley Davis 755d090289 Merged branch master into my-comments 2016-12-14 12:01:39 -07:00
Riley Davis 624eaeee11 move tests to tests directory 2016-12-14 12:01:32 -07: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
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -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 243bd50894 Merged branch master into my-comments 2016-12-13 15:01:34 -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
riley 2be60b3208 Merged master into my-comments 2016-12-13 14:33:17 -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