Commit Graph
1468 Commits
Author SHA1 Message Date
gaba 3266934fc8 It needed to have the Moderation Modal inside a tab container too. 2016-12-16 17:39:22 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07: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
David Jay 979b54166b Updating search with delay. 2016-12-16 16:24:32 -05:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Dan ZajdbandandGitHub 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
Dan ZajdbandandGitHub 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
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
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
David Jay 65b308a061 Adding initial stream list. 2016-12-14 16:01:43 -05:00
David Jay 7c6299243f Connecting sorting options to state. 2016-12-14 15:29:56 -05: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
David JayandGitHub 5cb1a15273 Merge branch 'master' into use-js-while-rendering 2016-12-13 13:06:47 -05:00
Gabriela Rodríguez BerónandGitHub b895dbc8cd Update translations.json 2016-12-12 22:38:53 -08:00
David Jay e88e8212f4 Updating translations. 2016-12-12 20:33:55 -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
David Jay cd63f49a5e Disabling save button on error and updating translations. 2016-12-12 19:08:35 -05:00
David Jay ba8a845741 Making character input field green to match designs. 2016-12-12 18:14:03 -05:00
David Jay 4a4b92299c Adding error message. 2016-12-12 18:10:47 -05:00
David Jay 48b1f7fc2b Moving text to translations file. 2016-12-12 17:45:20 -05:00
David Jay 182c504edb Updating settings box style. 2016-12-12 17:35:33 -05:00
David Jay 39479fd9ad Add character count field. 2016-12-12 17:07:43 -05:00
Riley DavisandGitHub 749a5d9853 Merge branch 'master' into use-js-while-rendering 2016-12-12 07:34:36 -10:00
Riley DavisandGitHub c18f885277 Merge branch 'master' into use-js-while-rendering 2016-12-09 15:06:51 -10:00
Riley DavisandGitHub 9e353eaae8 Merge branch 'master' into simplify-community-page 2016-12-09 15:06:43 -10:00
Riley DavisandGitHub 84453ef7bd Merge branch 'master' into use-js-while-rendering 2016-12-09 14:53:56 -10:00
Riley Davis 0f7e4bd239 simplify Community page 2016-12-09 14:52:17 -10:00
Riley Davis 7bfd9e2e71 remove lodash implementation 2016-12-09 14:48:29 -10:00
Riley Davis 74c4d812cd less changes 2016-12-09 14:39:16 -10:00
Riley Davis 7186c2b060 have moderation queue use proper mapStateToProps 2016-12-09 14:38:29 -10:00
David Jay faca09dbd2 Merge branch 'master' of github.com:coralproject/talk into update-users-api 2016-12-09 19:35:09 -05:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
Riley Davis b05f4cfb16 remove logs 2016-12-09 14:25:24 -10:00
Riley Davis 7732aa4abe typo 2016-12-09 14:20:46 -10:00
Riley Davis a80dd953c8 update ModerationQueue and CommentStream to not use immutable.js deep in the stack 2016-12-09 14:13:48 -10:00
Kim Gardner 5279ad3305 Typo 2016-12-09 13:01:54 -10:00
Riley Davis 1c2ef760ef remove cruft by pulling out some immutable.js stuff 2016-12-09 11:46:04 -10:00