wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 17:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,202 Commits 10 Branches 125 Tags
fdf5da56cf6b0ea165f10ae44ecbe3d938c2f0a5
Commit Graph

559 Commits

Author SHA1 Message Date
David Jay fdf5da56cf Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list 2016-12-21 18:11:51 -08:00
David Jay 0fc3e09c74 Removing unused log statement and combining setState functions. 2016-12-21 18:08:57 -08:00
Riley Davis b8b47e9c2c normalize constant names 2016-12-21 16:56:29 -07:00
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 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 29fa26260c Handling undefined values in fetchAssets call. 2016-12-21 11:39:21 -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
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
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
Riley Davis b4b3420549 remove banUser and create fetchModerationQueueComments actions 2016-12-20 12:21:10 -07:00
David Jay 4d508f6afa Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-19 13:41:43 -05:00
Belen Curcio 2d9ee1d9d7 Moderaion Queue updated to master 2016-12-19 13:34:42 -03:00
Belen Curcio 9950595245 Commenter likes a comment 2016-12-18 19:34:41 -03:00
Belen Curcio f52a1668b0 Test logouts and approves after commenting 2016-12-18 19:07:31 -03:00
Belen Curcio 428a62ffd4 tests 2016-12-18 11:31:27 -03:00
Belen Curcio 927a3fcd83 Updating package.json and nightwatch package 2016-12-17 10:50:47 -03:00
gaba ee6c4bb831 Merge branch 'master' into issue-186 2016-12-16 17:55:21 -08:00
Gabriela Rodríguez Berón 4f0c0d2e42 Merge branch 'master' into fix-config-warnings 2016-12-16 17:44:21 -08:00
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
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
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
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
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07: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