Commit Graph

5546 Commits

Author SHA1 Message Date
Kim Gardner d947e103fc Merge branch 'master' into pre-responsive-admin-cleanup 2017-08-10 10:57:40 +01:00
IAmSamHankins ca422f0109 mod queue nav styling adjust 2017-08-09 10:23:03 -05:00
IAmSamHankins c62e7328c5 adjustments to top navigation and logo 2017-08-09 10:15:52 -05:00
Kim Gardner ca069317e9 Merge pull request #839 from coralproject/fix-bug-plugin-config
Pass config to plugins
2017-08-09 11:30:45 +01:00
Kim Gardner 7c7799d2c0 Merge branch 'master' into fix-bug-plugin-config 2017-08-09 11:10:24 +01:00
Kim Gardner 8d30129f47 Merge pull request #840 from coralproject/emit-events-view-more
Emit events when viewing new comments or replies
2017-08-09 11:09:35 +01:00
Kim Gardner a9ec160f95 Merge branch 'master' into emit-events-view-more 2017-08-09 10:52:59 +01:00
Kim Gardner b10ed4e43e Merge pull request #842 from coralproject/paginate-my-comments
Paginate my comments in profile tab
2017-08-09 10:51:31 +01:00
Kim Gardner 1e00d75e3c Merge branch 'master' into paginate-my-comments 2017-08-09 10:26:18 +01:00
Kim Gardner 66b3d4ab00 Merge pull request #843 from coralproject/docs-fix
Docs Fixes
2017-08-09 10:25:54 +01:00
Kim Gardner 1ab662efda Merge branch 'master' into docs-fix 2017-08-09 10:15:40 +01:00
Wyatt Johnson d100128843 Merge pull request #836 from erikreyna/expose-comment-container-class
expose talk-stream-comment-container class
2017-08-09 13:23:36 +10:00
Wyatt Johnson 89e7f54a32 Merge branch 'master' into expose-comment-container-class 2017-08-09 11:24:18 +10:00
Wyatt Johnson e14d380d66 Merge pull request #834 from coralproject/update-my-comments
Update my comments after posting
2017-08-09 11:24:06 +10:00
Wyatt Johnson fd87ef3b85 Merge branch 'master' into update-my-comments 2017-08-09 09:58:44 +10:00
Wyatt Johnson b260945822 Merge pull request #833 from coralproject/view-more-history
Support load more in user history
2017-08-09 09:58:29 +10:00
Wyatt Johnson 1521ec43eb Merge branch 'master' into view-more-history 2017-08-09 09:39:53 +10:00
Wyatt Johnson 5ebdfa8c23 Merge pull request #837 from erikreyna/expose-avatar-container-class
expose talk-stream-comment-avatar class
2017-08-09 09:39:38 +10:00
Wyatt Johnson 6913fe05ae fixes #841 2017-08-09 09:38:09 +10:00
Kiwi 9f1bce1221 Merge branch 'master' into update-my-comments 2017-08-08 17:55:22 +02:00
Kiwi 528c2a9491 Merge branch 'master' into view-more-history 2017-08-08 17:55:17 +02:00
Kiwi 948d362c40 Merge branch 'master' into expose-avatar-container-class 2017-08-08 17:54:52 +02:00
Kiwi 30842362cf Merge branch 'master' into expose-comment-container-class 2017-08-08 17:54:46 +02:00
Chi Vinh Le 976bd1e9ad Paginate my comments in profile tab 2017-08-08 22:39:24 +07:00
Chi Vinh Le 7bdd28cb9c Emit ui.AllCommentsPane.viewNewComments and ui.Comment.showMoreReplies 2017-08-08 20:48:52 +07:00
Kiwi c9f2c27a69 Merge branch 'master' into fix-bug-plugin-config 2017-08-08 15:08:00 +02:00
Chi Vinh Le c4a91d225e Pass config also to withTags 2017-08-08 19:57:23 +07:00
Chi Vinh Le d1fc5668fb Pass config to plugins 2017-08-08 19:50:59 +07:00
Wyatt Johnson aad245fcbf Merge pull request #835 from coralproject/fix-bugs-action-summaries
Fix bugs action summaries
2017-08-08 15:45:44 +10:00
Wyatt Johnson 49ad48d70f Merge branch 'master' into fix-bugs-action-summaries 2017-08-08 15:40:21 +10:00
Wyatt Johnson 800fd63549 Merge pull request #832 from coralproject/more-css-classes
More css classes
2017-08-08 15:40:10 +10:00
Erik Reyna 1e8d2ce3a6 expose talk-stream-comment-avatar class 2017-08-07 14:11:51 -04:00
Erik Reyna a22d0f7536 expose talk-stream-comment-container class 2017-08-07 14:00:53 -04:00
IAmSamHankins 53cac48e3b resizing of the comment component 2017-08-07 11:53:39 -05:00
IAmSamHankins 27216cbfdb hierarchy for asset search title 2017-08-07 10:32:21 -05:00
IAmSamHankins ddadd6c5d3 adjustments/fixes to approved rejected widths 2017-08-07 10:26:42 -05:00
Chi Vinh Le 10936d9f41 Sort not by count 2017-08-07 18:23:44 +07:00
Chi Vinh Le 1d5f1e676f Sort aggregation 2017-08-07 18:12:25 +07:00
Chi Vinh Le c2f8f41e59 Support rendering system flags 2017-08-07 18:12:07 +07:00
Wyatt Johnson 567f8bf94e adjusted wrapResponse function 2017-08-07 14:54:11 +10:00
IAmSamHankins 11b2bc265a comment tag/marker updates for size 2017-08-04 13:50:14 -04:00
IAmSamHankins 76b125f042 adjustments to comment queue counters 2017-08-04 13:42:19 -04:00
Chi Vinh Le d2a2f94531 Merge branch 'view-more-history' of ssh://github.com/coralproject/talk into view-more-history 2017-08-04 23:30:10 +07:00
Chi Vinh Le 0df4fd1e37 Adjust styling 2017-08-04 23:24:40 +07:00
Chi Vinh Le 5ceda4f2d2 Update my comments after posting 2017-08-04 22:35:26 +07:00
Kiwi 0523a1f828 Merge branch 'master' into view-more-history 2017-08-04 17:07:57 +02:00
Chi Vinh Le 12d3273d3d Support load more in user history 2017-08-04 22:02:44 +07:00
Kim Gardner e6330cd8c3 Merge branch 'master' into more-css-classes 2017-08-04 07:04:43 -04:00
Kim Gardner bc67bc7b78 Merge pull request #831 from coralproject/secrets-fixes
Improvements and fixes to JWT configuration
2017-08-04 07:04:32 -04:00
Kim Gardner a91a2d3fa3 Merge branch 'master' into secrets-fixes 2017-08-04 06:55:06 -04:00