7162 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Riley Davis	eda15538fe	add kiwi's and wyatt's changes	2017-04-20 10:02:09 -06:00
Wyatt Johnson	50219922d5	Switched to lock at node 7.8	2017-04-20 09:35:49 -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	51b866cd65	Merge branch 'master' into default-resolve-type	2017-04-20 16:55:04 +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
Wyatt Johnson	53f7ab86c0	Merge branch 'master' into build-fix	2017-04-19 18:16:12 -06:00
Wyatt Johnson	4ac71c884b	added --force to rebuild native modules	2017-04-19 18:10:16 -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
Riley Davis	7b4e8ef204	Merge pull request #499 from coralproject/flag-detail ... Flag detail	2017-04-19 13:38:01 -06: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	82927b77be	Merge pull request #507 from coralproject/premod-load-collapse ... Fix collapsing UI	2017-04-19 09:57:23 -06:00
Riley Davis	b34cd2d4c1	Merge branch 'master' into premod-load-collapse	2017-04-19 09:50:30 -06:00
Riley Davis	bd0852bf68	Merge pull request #506 from coralproject/fix-load-more-premod ... Fix load more in premod queue	2017-04-19 09:48:40 -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	0e6b0c01fd	Fix issue with ignoredUsers	2017-04-19 21:06:57 +07: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
Kiwi	1750510d34	Merge pull request #504 from coralproject/valid-notification-actions ... Return a value for notification actions	2017-04-19 16:12:40 +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
gaba	1137fca3b4	Adds Tag Model that will be apply to different models.	2017-04-18 14:03:26 -07:00
Wyatt Johnson	2eda1cb1e4	Added defaultResolveType	2017-04-18 14:50:57 -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	bfacc8f2f7	Merge pull request #479 from coralproject/plugin_examples ... Hooks and Context for Comment Plugins And Off-Topic Plugin	2017-04-18 13:52:30 -03: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
Wyatt Johnson	fd6282077f	Adjusted test to conform to new form	2017-04-17 16:05:44 -06: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