Commit Graph

3858 Commits

Author SHA1 Message Date
okbel 2684ac4933 missing brackets 2018-01-15 13:14:24 -03:00
okbel 1f0e9da5d0 Merge branch 'formatting' of github.com:coralproject/talk into formatting
* 'formatting' of github.com:coralproject/talk:
  prettier
  End of line
  More syncs
  Fix deselect bug of action menu in ff
2018-01-15 13:00:07 -03:00
okbel bfa2f6edb9 Updates 2018-01-15 12:59:39 -03:00
Wyatt Johnson 25c178b267 Merge branch 'master' into formatting 2018-01-12 17:23:35 -07:00
okbel 77d83e04d5 Wrong name 2018-01-12 15:53:32 -03:00
okbel 86c4d70daf Adding changes to the comments on the User Drawer Detail 2018-01-12 15:51:49 -03:00
okbel e256b0da8a Adding format to admin comment - CommentFormatter 2018-01-12 15:47:09 -03:00
Chi Vinh Le 1ccd36e9e9 prettier 2018-01-12 14:07:05 +01:00
Chi Vinh Le 9762f34324 End of line 2018-01-12 11:45:52 +01:00
Chi Vinh Le 9ce14acc9a More syncs 2018-01-12 11:23:29 +01:00
Wyatt Johnson c19a6c8b10 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-11 20:25:18 -07:00
Wyatt Johnson 0abc2ca243 replaced eslint:recommended with prettier 2018-01-11 20:00:34 -07:00
Kim Gardner 9b4dcd8d32 Merge branch 'next' into account-history 2018-01-11 15:34:50 -05:00
Kim Gardner f51eda4f5e Merge branch 'next' into flags-enh 2018-01-11 15:24:24 -05:00
Kim Gardner f340cdd4b7 Merge branch 'next' into selected-bug 2018-01-11 15:10:09 -05:00
Kim Gardner f2e63b7621 Merge branch 'next' into fix-scrollbars 2018-01-11 14:41:32 -05:00
Kiwi 8cdc881f3d Merge branch 'next' into flags-enh 2018-01-11 18:47:05 +01:00
Belén Curcio 9187231737 Merge branch 'next' into account-history 2018-01-11 14:45:23 -03:00
okbel 2bc60b1211 fixes 2018-01-11 14:44:53 -03:00
Chi Vinh Le 90f1ef050b Change Flags to Reports and make a bit bigger 2018-01-11 18:41:53 +01:00
Kim Gardner eb5b736484 Merge branch 'next' into fix-no-status-history 2018-01-11 12:27:37 -05:00
Chi Vinh Le 2269c91244 Restore shortcut functionality 2018-01-11 16:54:54 +01:00
Chi Vinh Le 210b0ab907 Only show scrollbars when necessary 2018-01-11 16:05:20 +01:00
Chi Vinh Le 1337873adf Remove unwanted scroll in configure 2018-01-11 16:05:02 +01:00
Chi Vinh Le 11b38f7ea0 Fix no status history error 2018-01-11 13:55:09 +01:00
Kiwi f89a5013d2 Merge branch 'next' into suspect-label 2018-01-11 11:20:04 +01:00
Chi Vinh Le 89c929f970 Fix suspect label 2018-01-11 11:16:30 +01:00
Wyatt Johnson d35d0e354e Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 15:35:27 -07:00
okbel 7127aeaa87 Icon User Drawer 2018-01-10 17:35:50 -03:00
Belén Curcio 7d6fd69a3b Merge branch 'next' into reply 2018-01-10 15:53:39 -03:00
Wyatt Johnson 75d1bb2f22 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 10:40:52 -07:00
Kiwi 6a3be92a4c Merge branch 'next' into reply 2018-01-10 18:08:12 +01:00
Chi Vinh Le 7036aa5bad Use lodash with es modules 2018-01-10 17:54:06 +01:00
Belén Curcio 1898941097 Merge branch 'master' into reply 2018-01-10 12:31:10 -03:00
okbel e1ead8f500 Adding e2e for the stream - open and closed asset features 2018-01-10 11:43:34 -03:00
okbel 5db8209182 Removing replyButton in Stream is closed 2018-01-10 11:21:24 -03:00
okbel 9c75f3fa59 Adding missing proptypes 2018-01-10 11:03:33 -03:00
Belén Curcio 25ac66ec59 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 10:46:48 -03:00
Chi Vinh Le bdcc9273f1 Add some margin to loadmore 2018-01-10 12:22:23 +01:00
Kiwi dca85ad127 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 12:19:58 +01:00
Chi Vinh Le 36f7c31a03 Fix deselect bug of action menu in ff 2018-01-10 12:16:28 +01:00
Kim Gardner 63bd6309d3 Merge branch 'master' into next 2018-01-09 17:22:47 -05:00
Wyatt Johnson 20453dfddd refactor to cleanup 2018-01-09 14:13:02 -07:00
Wyatt Johnson 25e29cb79a extracted asset url 2018-01-09 11:01:10 -07:00
Wyatt Johnson 7f25f46ac0 extracted more funcs 2018-01-09 10:51:43 -07:00
Wyatt Johnson d3c1286d1a extracted events from opts 2018-01-09 10:47:58 -07:00
Kiwi 13347a6baf Merge branch 'next' into fix-set-username 2018-01-09 15:07:56 +01:00
Chi Vinh Le a2eb474a5c Fully implement SetUsername 2018-01-09 12:25:44 +01:00
Chi Vinh Le a40b287226 Use correct mutation and show errors 2018-01-08 18:52:54 +01:00
Chi Vinh Le c3a5da3ae6 Fix live status updates 2018-01-08 16:00:20 +01:00