Commit Graph

7196 Commits

Author SHA1 Message Date
Kim Gardner ccd22ea334 Merge branch 'master' of git+ssh://github.com/coralproject/talk into refactor-configure 2017-11-28 19:40:22 +00:00
Kim Gardner 83910f7fce Merge pull request #1163 from coralproject/extendable-embed-stream-tab
Extendable embed stream tabs
2017-11-28 19:39:36 +00:00
Wyatt Johnson 28873ed961 Merge branch 'master' into refactor-configure 2017-11-28 09:46:11 -07:00
Kim Gardner c3b25d2d0a Merge branch 'master' into extendable-embed-stream-tab 2017-11-28 16:31:50 +00:00
Kim Gardner 96a375e38a Merge pull request #1183 from coralproject/bump-version-3-8-1
Version 3.8.1
2017-11-28 16:30:45 +00:00
Wyatt Johnson 417a7a3c36 added excemption as no fix available as of yet 2017-11-28 09:16:33 -07:00
Wyatt Johnson c903d8c0f9 Merge branch 'master' into bump-version-3-8-1 2017-11-28 08:44:46 -07:00
Kim Gardner d6a83201ad Merge branch 'master' into extendable-embed-stream-tab 2017-11-27 17:21:24 +00:00
Kim Gardner bbdde50858 Merge pull request #1177 from coralproject/graph-context-connectors
Graph Context Connectors
2017-11-27 17:20:48 +00:00
Kim Gardner 8730ada87c Merge branch 'master' into extendable-embed-stream-tab 2017-11-27 16:30:22 +00:00
Kim Gardner 043e722d95 Merge branch 'master' into graph-context-connectors 2017-11-27 16:30:04 +00:00
Kim Gardner fb1dc23fa9 Version 3.8.1 2017-11-27 16:28:46 +00:00
Kim Gardner e882b51ed0 Merge pull request #1172 from coralproject/update-bug-report-link
Update Report Bug link in Admin Settings
2017-11-27 16:27:40 +00:00
Kim Gardner e52a6fd9c1 Merge branch 'master' into update-bug-report-link 2017-11-27 16:15:04 +00:00
Kim Gardner 24af7b2812 Merge pull request #1180 from coralproject/autclose-firefox-bug
auto close input: fix styling bug in firefox
2017-11-27 13:17:30 +00:00
Kim Gardner 24b5a58584 Merge branch 'master' into autclose-firefox-bug 2017-11-27 13:07:10 +00:00
Kim Gardner a868cc9c67 Merge pull request #1178 from coralproject/more-padding-qbox
More padding for question box
2017-11-27 13:05:52 +00:00
Kim Gardner af83d32de1 Merge branch 'master' into more-padding-qbox 2017-11-27 12:51:50 +00:00
Kim Gardner fa82824d03 Merge pull request #1181 from coralproject/firefox-stories
Fix radiogroup not working properly in ff
2017-11-27 12:51:39 +00:00
Kim Gardner f0033a7912 Merge branch 'master' into firefox-stories 2017-11-27 12:41:14 +00:00
Kim Gardner 0924531677 Merge pull request #1182 from coralproject/sort-stories
Sort by publication_date
2017-11-27 12:40:50 +00:00
Kim Gardner 44b77597ed Merge branch 'master' into update-bug-report-link 2017-11-27 12:36:59 +00:00
Chi Vinh Le ec2bf3cb7f Sort by publication_date 2017-11-24 12:41:18 +01:00
Chi Vinh Le 37f3c11104 Fix radiogroup not working properly in ff 2017-11-24 12:29:29 +01:00
Chi Vinh Le 9359bfc322 Fix styling bug in firefox 2017-11-23 20:09:16 +01:00
Kiwi 111ebd67ba Merge branch 'master' into extendable-embed-stream-tab 2017-11-23 14:49:54 +01:00
Chi Vinh Le 7f53375c67 More padding for question box 2017-11-23 13:40:19 +01:00
Chi Vinh Le df0c016e37 Merge branch 'refactor-configure' of ssh://github.com/coralproject/talk into refactor-configure 2017-11-23 13:33:21 +01:00
Chi Vinh Le bf3fe2ab8e Merge branch 'master' into refactor-configure 2017-11-23 13:27:18 +01:00
Wyatt Johnson 9629ba2f83 added connector support 2017-11-22 14:48:34 -07:00
Kim Gardner ac7b4d56a1 Merge pull request #1174 from coralproject/show-all-comments-button
new design for show all comments button
2017-11-22 16:35:40 +00:00
Kim Gardner c29bb02b1c Merge branch 'master' into show-all-comments-button 2017-11-22 12:09:23 +00:00
Kim Gardner 8c72e32a25 Merge branch 'master' into update-bug-report-link 2017-11-22 12:09:17 +00:00
Kim Gardner 4a31bb7ba2 Merge branch 'master' into extendable-embed-stream-tab 2017-11-22 12:09:02 +00:00
Kim Gardner 3be1c94f8f Merge branch 'master' into refactor-configure 2017-11-22 12:07:26 +00:00
Kim Gardner 7fba0428bb Merge pull request #1175 from coralproject/cli-users-fix
User CLI Fix
2017-11-21 19:24:35 +00:00
Wyatt Johnson c7d433deb5 added better logic around removing users for clearning out their stale data. 2017-11-21 12:13:28 -07:00
Chi Vinh Le c990a812a4 new design for show all comments button 2017-11-21 15:59:20 +01:00
Kim Gardner 3f26a8d7ad Merge branch 'master' into extendable-embed-stream-tab 2017-11-21 12:31:45 +00:00
Kiwi 4a3e5942b0 Merge branch 'master' into refactor-configure 2017-11-21 12:58:16 +01:00
Chi Vinh Le 5360bdc8ec Add some docs 2017-11-21 12:42:17 +01:00
Chi Vinh Le 548a204665 Expose StreamConfiguration 2017-11-21 11:13:41 +01:00
Chi Vinh Le a8e8b78441 Pass updatePending and errors through slots 2017-11-21 11:08:18 +01:00
Chi Vinh Le 258788fd88 Add updatePending and errors to admin settings slots 2017-11-21 11:06:11 +01:00
Chi Vinh Le 8cc3d19819 Fix query 2017-11-21 10:35:38 +01:00
Chi Vinh Le 0de5a328ab Slot streamSettings 2017-11-20 21:11:59 +01:00
Kim Gardner 4830aec138 Update Report Bug link in Admin Settings 2017-11-20 19:59:57 +00:00
Kim Gardner 4269fd1eb9 Merge pull request #1171 from coralproject/copy-updates
Update suspend copy
2017-11-20 19:53:00 +00:00
Kim Gardner 12e61bbc66 Update suspend copy 2017-11-20 19:41:14 +00:00
Chi Vinh Le 511e71f63a Change default settings=null to settings={} 2017-11-20 20:19:58 +01:00