7162 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Belen Curcio	f461d27810	Merge branch 'master' of github.com:coralproject/talk into user-status	2017-11-10 10:46:53 -03:00
Belen Curcio	fbc5a9d74b	moderate	2017-11-10 10:45:26 -03:00
Belen Curcio	6ff4994d0d	lodash.camelcase	2017-11-10 10:33:55 -03:00
Belen Curcio	c793a840ea	Merge branch 'user-status' of github.com:coralproject/talk into user-status	2017-11-10 10:27:28 -03:00
Belen Curcio	ebda51dc0f	Adding suspension test	2017-11-10 10:26:54 -03:00
Belen Curcio	b0573749ee	Adding classes and missingproptypes	2017-11-10 10:26:34 -03:00
Chi Vinh Le	933903de2f	Remove IE 64bit from ci until they fix the keyboard input issues	2017-11-10 14:05:43 +01:00
Kim Gardner	4373c382e1	Merge pull request #1151 from coralproject/feature/fix-email-config-docs ... Fix incorrect email configuration in docs	2017-11-10 12:02:22 +00:00
Kim Gardner	af6787bc0f	Merge branch 'master' into feature/fix-email-config-docs	2017-11-10 11:37:15 +00:00
Chi Vinh Le	dd1fbf30ca	Add navigateAndLogin	2017-11-10 10:51:30 +01:00
Chi Vinh Le	a5aa59e255	Merge branch 'master' into user-status	2017-11-10 10:09:29 +01:00
Kiwi	19b8d0a6ea	Merge pull request #1150 from coralproject/e2e-v2 ... e2e v2	2017-11-10 10:08:27 +01:00
Chi Vinh Le	bcf8370359	Temporarily enable bs testing on this branch	2017-11-10 10:04:22 +01:00
Wyatt Johnson	0da0b1a37e	Merge branch 'master' into feature/fix-email-config-docs	2017-11-09 16:23:24 -07:00
Wyatt Johnson	401d8a423d	added emails for status changes	2017-11-09 16:07:46 -07:00
Chi Vinh Le	31ee8139b6	Use visible were suitable and wait for drawer to dissappear	2017-11-09 23:32:03 +01:00
Wyatt Johnson	51977dcf54	Merge branch 'master' into bump-version-3-8-0	2017-11-09 15:10:24 -07:00
Wyatt Johnson	d80401a49b	Merge branch 'next' into user-status-refactor	2017-11-09 14:59:47 -07:00
Wyatt Johnson	cb768d3190	Merge branch 'master' into next	2017-11-09 14:59:32 -07:00
Chi Vinh Le	0b18bb06e7	More tests	2017-11-09 22:31:53 +01:00
Chi Vinh Le	9abb3d30da	e2e fixes	2017-11-09 22:04:32 +01:00
Chi Vinh Le	f0839c57df	Change to allowed name	2017-11-09 21:52:08 +01:00
Chi Vinh Le	b2929e9a83	Fail fast	2017-11-09 21:51:41 +01:00
Chi Vinh Le	ca7b790962	Return this	2017-11-09 21:51:31 +01:00
Chi Vinh Le	42a477ae41	Fix firefox popup bug e2e	2017-11-09 21:51:03 +01:00
Chi Vinh Le	53461df287	Increase wait for iframe time	2017-11-09 19:30:22 +01:00
Kiwi	9b18a78ce0	Merge branch 'master' into user-status	2017-11-09 19:20:06 +01:00
Chi Vinh Le	da35f39baf	Set resolution	2017-11-09 19:19:47 +01:00
Chi Vinh Le	e885178dfc	Refactor 2	2017-11-09 19:03:01 +01:00
Kim Gardner	24e8aab0fe	Merge branch 'master' into e2e-v2	2017-11-09 17:09:56 +00:00
Kim Gardner	44d6ad340d	Merge pull request #1156 from coralproject/queue-fix ... Queue fix for custom assets	2017-11-09 17:09:25 +00:00
Chi Vinh Le	63b6315435	Refactor #1	2017-11-09 17:50:47 +01:00
Kiwi	95ca43ff8c	Merge branch 'master' into e2e-v2	2017-11-09 16:23:20 +01:00
Chi Vinh Le	55e4aed511	Merge branch 'master' into user-status	2017-11-09 15:53:42 +01:00
Kim Gardner	6d5adc8f54	Bump version number to 3.8.0	2017-11-09 13:19:05 +00:00
Kim Gardner	247e05383e	One more fix	2017-11-09 11:23:48 +00:00
Kim Gardner	3988fb9e93	Merge branch 'feature/fix-email-config-docs' of git+ssh://github.com/coralproject/talk into feature/fix-email-config-docs	2017-11-09 11:20:07 +00:00
Kim Gardner	7d524efaad	Merge branch 'master' into feature/fix-email-config-docs	2017-11-09 11:19:57 +00:00
Kim Gardner	d7a88cdc2a	Fix config key	2017-11-09 11:18:58 +00:00
Wyatt Johnson	77c927ac59	added migration, migration tests 🎉	2017-11-08 16:35:38 -07:00
Wyatt Johnson	18f5b0cc5e	queue fix for sometimes null settings	2017-11-08 14:24:48 -07:00
Wyatt Johnson	0257e09a40	Merge branch 'next' into user-status-refactor	2017-11-08 13:52:48 -07:00
Wyatt Johnson	61df0e1eeb	Merge branch 'master' into next	2017-11-08 13:49:21 -07:00
Wyatt Johnson	1b7f78b562	user queries	2017-11-08 13:40:46 -07:00
Kiwi	2df18f07cb	Merge pull request #1140 from coralproject/user-pending ... Users with PENDING status should not be allowed to post & E2E for User Status	2017-11-08 19:27:41 +01:00
Chi Vinh Le	786e85686d	Fix invalid regexp for ie	2017-11-08 18:57:06 +01:00
Belen Curcio	9a651880a2	Updated login	2017-11-08 14:00:01 -03:00
Belen Curcio	82e01eac00	Merge branch 'master' of github.com:coralproject/talk into user-status	2017-11-08 13:56:48 -03:00
Wyatt Johnson	9e84c72148	added more mutations	2017-11-08 09:41:38 -07:00
Belen Curcio	5efdc9865f	refacotr	2017-11-08 12:59:08 -03:00