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

3544 Commits

Author SHA1 Message Date
gaba ee6c4bb831 Merge branch 'master' into issue-186 2016-12-16 17:55:21 -08:00
Gabriela Rodríguez Berón fcb3eeca9e Merge branch 'master' into add-flag-option 2016-12-16 17:53:22 -08:00
Gabriela Rodríguez Berón 4f0c0d2e42 Merge branch 'master' into fix-config-warnings 2016-12-16 17:44:21 -08:00
Gabriela Rodríguez Berón 0e0aafeb1c Merge branch 'master' into add-flag-option 2016-12-16 17:44:03 -08:00
gaba 3266934fc8 It needed to have the Moderation Modal inside a tab container too. 2016-12-16 17:39:22 -08:00
gaba d8d30e512b Only on POST check for CSRF. 2016-12-16 16:02:45 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
David Jay 5973560043 Updating translation. 2016-12-16 18:20:31 -05:00
David Jay 871836f636 Adding description field to flags. 2016-12-16 18:19:05 -05:00
David Jay 8f1a6a777c Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-16 17:22:32 -05:00
David Jay c34bf5036e Updating page count. 2016-12-16 17:20:31 -05:00
Riley Davis 13994686e4 fix some config warnings 2016-12-16 15:20:02 -07:00
David Jay 0d2d6b52a5 Adding pagination. 2016-12-16 17:07:59 -05:00
Dan Zajdband ad084847e5 Lint 2016-12-16 16:35:39 -05:00
David Jay 979b54166b Updating search with delay. 2016-12-16 16:24:32 -05:00
Dan Zajdband 6ddece4717 Fixed closing at 2016-12-16 16:16:48 -05:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Riley Davis 5d96ff9d63 Merge branch 'master' into my-comments-designs 2016-12-16 12:29:38 -07:00
Riley Davis 647d62969d design tweaks per kim 2016-12-16 12:24:32 -07:00
Dan Zajdband decdfad39b Adding show shortcuts button and minor fixes (#177) 
* Adding show shortcuts button and minor fixes

* Lint

* Unwrapping the showComments method
 2016-12-16 12:32:09 -05:00
Dan Zajdband 9e9291ba64 Lint 2016-12-16 12:07:54 -05:00
Dan Zajdband 8631c3bd9b Adding show shortcuts button and minor fixes 2016-12-16 12:03:37 -05:00
gaba 4a76e43309 Merge branch 'master' into csrf 2016-12-15 14:25:08 -08:00
riley c7d4bb6961 add a newline so lint doesn't complain 2016-12-15 15:20:50 -07:00
riley 632956e084 failed to update tests. working now 2016-12-15 15:20:02 -07:00
gaba 70c86bf8f5 Merge branch 'master' into csrf 2016-12-15 13:54:22 -08:00
Gabriela Rodríguez Berón 70ef071464 Merge branch 'master' into fix-embed-pathing 2016-12-15 13:50:41 -08:00
Riley Davis 181e558b28 comments not showing on embed page 2016-12-15 14:36:14 -07:00
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
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
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
Riley Davis f4ee28c618 allow non-admin folks to list their comments 2016-12-15 13:05:59 -07:00
David Jay 1154b65c91 Updating state from menu. 2016-12-15 14:19:44 -05: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
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
David Jay 7c6299243f Connecting sorting options to state. 2016-12-14 15:29:56 -05:00