Commit Graph

5519 Commits

Author SHA1 Message Date
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
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
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
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
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
Kim Gardner 32a8d78eb8 Merge pull request #827 from coralproject/correctly-resolve-isClosed
Correctly determine the status of the asset
2017-08-04 06:54:20 -04:00
Chi Vinh Le 203707124c More css classes 2017-08-04 16:55:02 +07:00
Wyatt Johnson a39b7237e6 updates to docs 2017-08-04 16:10:08 +10:00
Wyatt Johnson 190e93c8d7 fixed comment 2017-08-04 15:57:44 +10:00
Wyatt Johnson 02a75c590f lint fix 2017-08-04 15:54:14 +10:00
Wyatt Johnson 8cdf289b13 exposed more controls on jwt and added docs 2017-08-04 15:49:37 +10:00
Wyatt Johnson e435c323ec Merge branch 'master' into correctly-resolve-isClosed 2017-08-04 14:01:49 +10:00
Wyatt Johnson f92754a700 updated docs related to secrets 2017-08-04 13:54:42 +10:00
Wyatt Johnson 5c8130bece Added guard for private key length 2017-08-04 12:58:40 +10:00
Wyatt Johnson 8ceeb4b275 Merge branch 'master' into secrets-fixes 2017-08-04 10:38:42 +10:00
Wyatt Johnson 3ec81099f7 Merge pull request #830 from coralproject/embed-upgrade
Added support for embed/stream unloading
2017-08-04 10:38:06 +10:00
Wyatt Johnson c9b82008de Fixes to secrets init 2017-08-04 10:37:47 +10:00
Chi Vinh Le 5d2b9439d8 Add some comments 2017-08-03 21:50:16 +07:00
Chi Vinh Le b8f24b952b Automatically close stream when passed closedAt date 2017-08-03 21:41:01 +07:00
Chi Vinh Le b6d284495e Merge branch 'master' into correctly-resolve-isClosed 2017-08-03 21:00:28 +07:00
Chi Vinh Le a527990413 Merge branch 'master' into correctly-resolve-isClosed 2017-08-03 20:26:32 +07:00
Wyatt Johnson 325626fecf removed all emitter listeners when we remove the stream 2017-08-03 11:33:07 +10:00
Wyatt Johnson 15c7a7cad7 Added support for embed unloading 2017-08-03 11:23:06 +10:00
Kim Gardner 8a52290793 Merge pull request #826 from coralproject/featured-adm
Feature Comments for Moderators / Admins
v3.0.0
2017-08-02 13:13:13 -04:00
Chi Vinh Le e6b7fcbd9d Show success notification 2017-08-02 23:41:26 +07:00
Chi Vinh Le 29209f968b Merge branch 'featured-adm' of ssh://github.com/coralproject/talk into featured-adm 2017-08-02 22:29:53 +07:00
Chi Vinh Le 2e974ac82f Live update unfeatured 2017-08-02 22:29:01 +07:00
Kim Gardner 948fce9efb Merge branch 'master' into featured-adm 2017-08-02 10:59:08 -04:00
Kim Gardner 61690be021 Merge pull request #829 from coralproject/namespace-portugese-translation
Namespace portugese translations
2017-08-02 10:54:27 -04:00
Chi Vinh Le da0d0349dd Implement approve and live updates 2017-08-02 21:34:48 +07:00
Chi Vinh Le b6b7570bcc Remove subscription code 2017-08-02 18:14:52 +07:00
Chi Vinh Le eb02031354 Namespace portugese translations 2017-08-02 15:21:46 +07:00