wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-02 17:06:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,940 Commits 10 Branches 125 Tags
66202d1fd614aab33ecedea985d3cf22b6cd11aa
Commit Graph

3872 Commits

Author SHA1 Message Date
Kim Gardner 66202d1fd6 Merge branch 'master' into fix-false-spinner 2018-01-22 10:51:49 -05:00
Chi Vinh Le 15d0ecbe51 Don't show spinner on fetchMore 2018-01-22 14:34:30 +01:00
Tibo Beijen 468a1683ce Small lintin fix. 2018-01-22 11:22:12 +01:00
Kim Gardner 6f55189658 Merge branch 'master' into master 2018-01-18 12:08:07 -05:00
Wyatt Johnson 716a61aa5c Merge branch 'master' into master 2018-01-18 09:38:42 -07:00
Wyatt Johnson 127f0c1e20 Merge branch 'master' into close-asset-now 2018-01-18 09:38:24 -07:00
Kim Gardner 2345daf783 Merge branch 'master' into locale-local-storage 2018-01-18 11:21:20 -05:00
Kim Gardner 3255b8d23b Merge branch 'master' into close-asset-now 2018-01-18 10:52:37 -05:00
Wyatt Johnson ac62cbf348 added new closeAsset mutation and support in UI 2018-01-17 16:04:32 -07:00
Wyatt Johnson c612902779 fixed styles 2018-01-17 13:41:02 -07:00
Wyatt Johnson 3938b7883f introduced some locale fixes 2018-01-17 13:24:54 -07:00
Wyatt Johnson af40a85071 Merge branch 'master' into master 2018-01-16 15:58:58 -07:00
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
Tibo Beijen bf77ddc49b Merge branch 'master' into master 2018-01-12 13:54:31 +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
Bart Stroeken e5c3474455 dutch translation was not added yet without adding it to i18n.js - and refined a few translations. 2018-01-11 11:56:30 +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