1961 Commits

Author	SHA1	Message	Date
Riley Davis	d1729e5115	camel_case	2017-04-20 12:44:25 -06:00
Belén Curcio	fc4b821f05	Merge branch 'master' into action-summary-fix	2017-04-20 15:04:09 -03:00
Chi Vinh Le	8fc2d5e8aa	Merge branch 'login-popup' of ssh://github.com/coralproject/talk into login-popup	2017-04-21 00:54:45 +07:00
Chi Vinh Le	f0e584f0b3	Restore login flow in ProfileContainer	2017-04-21 00:52:45 +07:00
Chi Vinh Le	6df2103da3	Remove obsolete offset and styling	2017-04-21 00:45:00 +07:00
Chi Vinh Le	f3f1cc53fe	Fix safari popup resizing	2017-04-21 00:27:26 +07:00
Belen Curcio	c47047c3ff	Classes	2017-04-20 14:23:44 -03:00
Belen Curcio	c9207fd620	Merge branch 'login-popup' of github.com:coralproject/talk into login-popup	2017-04-20 14:19:04 -03:00
Belen Curcio	09cb518049	Merge branch 'master' of github.com:coralproject/talk into login-popup	2017-04-20 14:18:40 -03:00
Chi Vinh Le	5b7750f7a5	Reuse same store and action flows	2017-04-20 23:48:30 +07:00
Riley Davis	50774f1922	remove null checks	2017-04-20 10:04:28 -06:00
Chi Vinh Le	b12d4ef4a2	WIP	2017-04-20 21:30:24 +07:00
Chi Vinh Le	348c01ae80	Fix linting errors	2017-04-20 20:58:45 +07:00
Chi Vinh Le	1b95fbd852	Remove SignInContainer from admin	2017-04-20 20:34:36 +07:00
Chi Vinh Le	3bf2187688	Fix crashing admin when using framework	2017-04-20 18:45:55 +07:00
Kiwi	b7ffbdb762	Merge branch 'master' into action-label-fix	2017-04-20 16:48:12 +07:00
Riley Davis	ffdec225c7	fix RespectButton component code	2017-04-19 22:02:57 -06:00
Riley Davis	59fbff3caf	fix how FlagActionSummaries works in the embed	2017-04-19 21:15:03 -06:00
Belen Curcio	6155a46e71	Sign up popup	2017-04-19 18:10:09 -03:00
Belen Curcio	13965e1111	Adding actions, routes and login popup	2017-04-19 17:04:49 -03:00
Chi Vinh Le	3cd9e802dd	WIP	2017-04-20 00:37:45 +07:00
Riley Davis	1abafb7037	Merge branch 'master' into flag-detail	2017-04-19 11:21:55 -06:00
Riley Davis	1535f10450	Merge branch 'master' into action-label-fix	2017-04-19 11:11:21 -06:00
Chi Vinh Le	34fee9439f	Move active tab to redux	2017-04-19 23:26:26 +07:00
Riley Davis	b34cd2d4c1	Merge branch 'master' into premod-load-collapse	2017-04-19 09:50:30 -06:00
Belén Curcio	c72a5c6df9	Merge branch 'master' into action-label-fix	2017-04-19 12:05:59 -03:00
Belen Curcio	9ddc6c35fd	Action labels default.css, temporary fix	2017-04-19 11:59:07 -03:00
Chi Vinh Le	6fb2a95bf2	Move query logic to coral-embed-stream	2017-04-19 20:28:14 +07:00
Chi Vinh Le	f724353cf0	Fix collapsing UI	2017-04-19 16:38:02 +07:00
Chi Vinh Le	7698bdf930	Fix load more in premod queue	2017-04-19 16:35:53 +07:00
Chi Vinh Le	d5d424bfc5	Merge branch 'master' into embed-refactor	2017-04-19 16:16:14 +07:00
Wyatt Johnson	ecbb66e270	Fix linting	2017-04-18 15:53:15 -06:00
Wyatt Johnson	45094fd176	Optimized sub model	2017-04-18 15:48:33 -06:00
Wyatt Johnson	e1c8e75405	Merge branch 'master' into subscriptions	2017-04-18 15:43:25 -06:00
Chi Vinh Le	4ce4c74fd9	Return a value for notification actions	2017-04-19 01:09:59 +07:00
Chi Vinh Le	e9331e90d3	Add missing check	2017-04-19 01:07:49 +07:00
Chi Vinh Le	d3b81dff35	Merge branch 'master' into embed-refactor ... Conflicts: client/coral-plugin-commentbox/CommentBox.js	2017-04-19 00:18:50 +07:00
Belén Curcio	ad15b38a5d	Merge branch 'master' into plugin_examples	2017-04-18 13:46:44 -03:00
Chi Vinh Le	af5be0469f	Refactor embed	2017-04-18 23:20:39 +07:00
Chi Vinh Le	b40eed4751	Move to components folder	2017-04-18 23:14:28 +07:00
Riley Davis	673bbb61b1	Merge branch 'master' into all-comments-queue	2017-04-17 15:41:30 -06:00
riley	449a6f67f1	add some tab icons	2017-04-17 15:37:00 -06:00
Riley Davis	b5210f3727	more translations	2017-04-17 14:42:18 -06:00
Riley Davis	cc6882168b	add translations	2017-04-17 14:31:45 -06:00
Riley Davis	df859dc782	add all tab	2017-04-17 14:12:45 -06:00
Riley Davis	a5d11a05d1	Merge branch 'master' into flag-detail	2017-04-17 14:00:32 -06:00
Gabriela Rodríguez Berón	04a4918fd5	Update ConfigureStreamContainer.js	2017-04-17 12:35:29 -07:00
gaba	f66e12be18	Merge branch 'master' into 143520971-stream-settings	2017-04-17 12:07:19 -07:00
gaba	fb010bfa67	Rename settings of the state to dirtySettings and add TO DO item to be sure we refactor this next time we do a refactor.	2017-04-17 11:51:24 -07:00
Belen Curcio	e729a673a3	Merge branch 'master' of github.com:coralproject/talk into plugin_examples	2017-04-17 14:17:42 -03:00