 Wyatt Johnson
|
de54433c5c
|
Merge branch 'master' into username-displayname
|
2017-02-10 16:19:27 -07:00 |
|
|
gaba
|
e2e40ca2b3
|
Merge branch 'master' into story-137818425-tag-staff
|
2017-02-10 13:42:50 -08:00 |
|
|
gaba
|
498eb5eb91
|
Fix the test.
|
2017-02-10 12:06:36 -08:00 |
|
|
gaba
|
c80f406b21
|
Add tests
|
2017-02-10 11:52:02 -08:00 |
|
|
Wyatt Johnson
|
3cd2b28bc2
|
Inital rename of displayName -> username
|
2017-02-09 16:48:59 -07:00 |
|
|
Wyatt Johnson
|
fb9bedc57b
|
Added new action rep, refactored mutations
|
2017-02-08 17:41:11 -07:00 |
|
|
gaba
|
1176a94bec
|
Update tests
|
2017-02-07 15:36:10 -08:00 |
|
|
Gabriela Rodríguez Berón
|
5b609ceb86
|
Merge branch 'master' into story-138524853-domain-whitelist
|
2017-02-07 14:20:48 -08:00 |
|
|
gaba
|
3effd11ad2
|
Adding test.
|
2017-02-07 13:57:46 -08:00 |
|
|
David Jay
|
652170735b
|
Merge branch 'master' into username-ban
|
2017-02-06 18:14:13 -08:00 |
|
|
Riley Davis
|
8c8a8eb3b8
|
define more propTypes. add a second button so tests work
|
2017-02-06 16:23:00 -07:00 |
|
|
Riley Davis
|
fe6d6f611d
|
pause suddenly not a function?
|
2017-02-06 14:59:23 -07:00 |
|
|
Riley Davis
|
93ee5bfc4a
|
just throwing stuff at the wall to see what sticks
|
2017-02-06 14:42:40 -07:00 |
|
|
Riley Davis
|
3a145e9927
|
add a pause to see if anything changes
|
2017-02-06 14:22:37 -07:00 |
|
|
David Jay
|
1901592780
|
Switching displayname edit after facebook auth to account endpoint.
|
2017-02-06 11:07:35 -08:00 |
|
|
David Jay
|
cb78e8d563
|
Merge branch 'master' into username-ban
|
2017-02-06 10:23:14 -08:00 |
|
|
Benjamin Goering
|
5614b9781e
|
Merge branch 'master' into 20170203_futureproof_embed_code
|
2017-02-04 03:31:33 +08:00 |
|
|
Benjamin Goering
|
f9cfdd07a5
|
update e2e tests to find iframe using selector that works with coral-embed
|
2017-02-04 03:25:15 +08:00 |
|
|
David Jay
|
c784de6e95
|
Updating e2e tests.
|
2017-02-03 11:15:10 -08:00 |
|
|
David Jay
|
d92c2d9744
|
Updating user queue routes.
|
2017-02-03 10:18:29 -08:00 |
|
|
David Jay
|
feb0860ba1
|
Merge branch 'master' of github.com:coralproject/talk into username-ban
|
2017-02-02 12:29:29 -05:00 |
|
|
Riley Davis
|
bb798b8b02
|
Merge branch 'master' into story-134624635
|
2017-02-02 10:05:17 -07:00 |
|
|
gaba
|
d53dc09aed
|
Merge branch 'master' into story-134624635
|
2017-02-02 08:16:50 -08:00 |
|
|
Belén Curcio
|
7fe6002219
|
Merge branch 'master' into hide-pending-sometimes
|
2017-02-02 12:28:17 -03:00 |
|
|
Belén Curcio
|
b4a03a5133
|
Merge branch 'master' into design-pass-tweaks
|
2017-02-02 07:55:41 -03:00 |
|
|
David Jay
|
97c3ebc3e0
|
Whitelisting usernames once they have been approved.
|
2017-02-01 20:55:45 -05:00 |
|
|
David Jay
|
5831a6f927
|
Merge branch 'master' of github.com:coralproject/talk into username-ban
|
2017-02-01 20:00:54 -05:00 |
|
|
David Jay
|
d703cc2168
|
Prompting user to update name when banned.
|
2017-02-01 19:53:37 -05:00 |
|
|
David Jay
|
5dca1611bc
|
Moving account endpoint tests to account.
|
2017-02-01 15:58:07 -05:00 |
|
|
David Jay
|
b2430eaf60
|
Adding displayname editing and appropriate toggle.
|
2017-02-01 15:55:33 -05:00 |
|
|
Riley Davis
|
22c0ed686f
|
rename everything to Pre-Mod from Pending. hide the pre-mod tab sometimes.
|
2017-02-01 13:33:29 -07:00 |
|
|
gaba
|
f4d672ddcf
|
Merge branch 'master' into story-134624635
|
2017-02-01 10:42:00 -08:00 |
|
|
David Jay
|
e24b953f51
|
Merge branch 'master' into emailus-veritas
|
2017-02-01 12:06:57 -05:00 |
|
|
gaba
|
097934dee5
|
Merge branch 'master' into story-134624635
|
2017-01-31 15:00:14 -08:00 |
|
|
gaba
|
282c7dc4f5
|
Removes duplicate func and adds tests.
|
2017-01-31 14:04:31 -08:00 |
|
|
David Jay
|
20bdf648d7
|
Merge branch 'e2e-port-fix' of github.com:coralproject/talk into e2e-port-fix
|
2017-01-31 15:40:09 -05:00 |
|
|
David Jay
|
5d185e7aca
|
Updating port in globals.
|
2017-01-31 15:21:21 -05:00 |
|
|
Riley Davis
|
e63e1f3428
|
Merge branch 'master'
Conflicts:
errors.js
test/routes/api/auth/index.js
|
2017-01-31 12:05:16 -07:00 |
|
|
Riley Davis
|
56ddc49386
|
resend verify email
|
2017-01-31 12:04:19 -07:00 |
|
|
Wyatt Johnson
|
91cd2e9e86
|
Fixes #266
|
2017-01-30 18:21:36 -07:00 |
|
|
Belen Curcio
|
f5dc5ed8b7
|
Test updated
|
2017-01-30 15:53:29 -03:00 |
|
|
David Jay
|
b674ff45c0
|
Addressing errors with replies in e2e.
|
2017-01-27 17:29:23 -05:00 |
|
|
David Jay
|
1da61784b4
|
Fixing bugs around settings in e2e.
|
2017-01-27 16:10:47 -05:00 |
|
|
Wyatt Johnson
|
71647d5233
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 16:47:52 -07:00 |
|
|
David Jay
|
f06edec6a2
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-26 16:38:43 -05:00 |
|
|
David Erwin
|
3d08d1f54f
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 16:30:14 -05:00 |
|
|
David Jay
|
2e34f726eb
|
Updating tests to reflect graphql changes.
|
2017-01-26 14:41:03 -05:00 |
|
|
David Jay
|
aa83aea849
|
Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-25 17:17:04 -05:00 |
|
|
David Jay
|
31abe57cb2
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
|
2017-01-25 17:15:12 -05:00 |
|
|
Belen Curcio
|
b3eb3e3c43
|
Updated tests for Comment History
|
2017-01-25 11:44:51 -03:00 |
|