Commit Graph

4030 Commits

Author SHA1 Message Date
Gabriela Rodríguez Berón 152a9417b2 Merge branch 'master' into plugin_examples 2017-04-11 13:56:27 -07:00
Kim Gardner 313e368565 Merge branch 'master' into flash-messages 2017-04-11 15:28:00 -04:00
Kim Gardner 7838347861 Merge branch 'master' into infobox-style 2017-04-11 15:23:58 -04:00
Belen Curcio 93ca0bf79d fixed flash messages 2017-04-11 16:14:02 -03:00
gaba a7493af979 Fix search box in Community Admin. 2017-04-11 11:58:19 -07:00
Belen Curcio 9335856474 Links style 2017-04-11 15:55:18 -03:00
Belen Curcio a27044b691 Ádding style for the infoBox 2017-04-11 15:49:10 -03:00
Belén Curcio a77a623e94 Merge branch 'master' into plugin_examples 2017-04-11 15:13:51 -03:00
Belen Curcio 5d81429673 Clean up 2017-04-11 14:47:39 -03:00
Belen Curcio 536b2ed371 Liniting 2017-04-11 13:46:27 -03:00
David Erwin ab74ebdc52 Merge branch 'master' into subscriptions 2017-04-11 11:58:55 -04:00
Belen Curcio aeaa9ae80f Adding preSubmit hoojs 2017-04-11 12:42:48 -03:00
Belen Curcio 014c23bb95 Support for hooks, preSubmit and postSubmit 2017-04-11 12:41:18 -03:00
Belen Curcio 6aad4411d9 Styling for plugins 2017-04-11 11:57:08 -03:00
Belen Curcio 917be12667 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-11 11:55:12 -03:00
Belen Curcio e888161fe4 off topic plugins, and examples 2017-04-11 11:23:23 -03:00
Wyatt Johnson 97e3d7220e Removed test code 2017-04-10 14:39:50 -06:00
Wyatt Johnson 7acaaadcd6 Merge branch 'master' into subscriptions 2017-04-10 14:33:08 -06:00
Chi Vinh Le b4e8648177 Adjust fetchMore for apollo 1.0 2017-04-10 21:16:07 +07:00
Belen Curcio aef0f433c9 Slots and off topic plugin 2017-04-07 14:12:51 -03:00
Belen Curcio c6189e8b3a Slots and off topic plugin 2017-04-07 14:05:23 -03:00
Riley Davis ca04db80dc Merge branch 'master' into optional-google-fonts 2017-04-07 10:42:20 -06:00
Wyatt Johnson 5a4441e309 Adjusted loaders, webpack 2017-04-06 17:42:50 -06:00
Belen Curcio 5245dfaef9 Rolling back since its not needed 2017-04-06 19:44:26 -03:00
Belen Curcio 16f15c5faf Adding todo 2017-04-06 19:05:46 -03:00
Belen Curcio 27408e1fa1 Linting and Patch 2017-04-06 18:49:12 -03:00
Wyatt Johnson c12660be3b Merge branch 'master' into subscriptions 2017-04-06 15:39:24 -06:00
Belen Curcio a2df5df58c Merge branch 'plugin' of github.com:coralproject/talk into plugin 2017-04-06 18:30:51 -03:00
Belen Curcio e1ebba5b1c Ádding PropTypes to Slot 2017-04-06 18:26:40 -03:00
Belen Curcio ad8c6cc140 Refator plugin loaders 2017-04-06 18:26:24 -03:00
Belen Curcio ae5bcf6900 getActionSummary exp 2017-04-06 18:15:02 -03:00
Belén Curcio 10836f7918 Merge branch 'master' into plugin 2017-04-06 17:04:38 -03:00
Riley Davis 9cab34da73 Merge branch 'master' into optional-google-fonts 2017-04-06 10:40:04 -06:00
Chi Vinh Le e92fdc97bb Refetch Me after facebook login 2017-04-06 22:49:20 +07:00
Wyatt Johnson 26fff5b950 Merge branch 'master' into support-lazy-assets 2017-04-06 08:21:49 -06:00
David Erwin 6f8b375519 Merge branch 'master' into stream-refetch-tweak 2017-04-06 10:03:00 -04:00
Chi Vinh Le 31cdf964f7 Simple camelCase for slot naming 2017-04-06 20:08:41 +07:00
Chi Vinh Le 025df1918d Move slot config to index 2017-04-06 20:06:38 +07:00
Chi Vinh Le 92146f326f camelCase for slot names 2017-04-06 19:55:24 +07:00
Chi Vinh Le 4d51fb276d Fix collapsing comment tree 2017-04-06 17:51:36 +07:00
Chi Vinh Le f91f2b143f Fix undefined client 2017-04-06 17:17:29 +07:00
Chi Vinh Le d32c2f5177 Fix collapsing comment tree 2017-04-06 16:44:50 +07:00
Riley Davis e4e2ff03b3 only refetch the comments if you're an admin 2017-04-05 14:41:06 -06:00
Chi Vinh Le b0effe8731 Merge with 'master' 2017-04-06 01:26:48 +07:00
Riley Davis b24ee81e34 remove Lato from google fonts 2017-04-05 12:14:51 -06:00
Chi Vinh Le 582f799b6c Revert "Merge"
This reverts commit d9835a17d3, reversing
changes made to 18d6846f4e.
2017-04-06 00:53:21 +07:00
Chi Vinh Le 9505ffdedd Revert "to Master"
This reverts commit eef64f5f1b.
2017-04-06 00:44:12 +07:00
Belen Curcio eef64f5f1b to Master 2017-04-05 12:12:33 -03:00
Belen Curcio d9835a17d3 Merge 2017-04-05 12:08:07 -03:00
Wyatt Johnson 877372814a Merge branch 'master' into support-lazy-assets 2017-04-05 08:14:31 -06:00