 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 |
|
|
David Jay
|
f0bb9db892
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-27 15:21:47 -05:00 |
|
|
David Jay
|
9d15a0448a
|
Adding settings init to pree2e script.
|
2017-01-27 15:21:18 -05:00 |
|
|
David Jay
|
f09d9d0a8b
|
Merge branch 'master' into e2e-env-fix
|
2017-01-27 14:10:59 -05:00 |
|
|
David Jay
|
801d18639b
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-27 14:09:29 -05:00 |
|
|
David Jay
|
fcf22ef4f9
|
Adding selenium settings and fixing bug in moderation approval.
|
2017-01-27 14:07:34 -05:00 |
|
|
Wyatt Johnson
|
d829d2541f
|
Added new env var for e2e reports
|
2017-01-27 11:20:45 -07:00 |
|
|
Wyatt Johnson
|
ebc928c6f2
|
Merge pull request #267 from coralproject/lodash-dep
Lodash Import
|
2017-01-27 11:03:59 -07:00 |
|
|
Belen Curcio
|
55a8b4984a
|
only importing isEqual
|
2017-01-27 14:58:36 -03:00 |
|
|
David Erwin
|
087b1a7bd7
|
Merge pull request #264 from coralproject/postmod-default
Update default setting to POST moderation
|
2017-01-27 11:16:36 -05:00 |
|
|
Wyatt Johnson
|
0096de6e79
|
Merge branch 'master' into postmod-default
|
2017-01-27 09:11:51 -07:00 |
|
|
Kim Gardner
|
88d718e7c9
|
Merge pull request #265 from coralproject/remove-avatar
Remove avatar from user cards
|
2017-01-27 10:32:12 -05:00 |
|
|
David Erwin
|
c8c160a551
|
Remove avatar from user cards
|
2017-01-27 10:16:09 -05:00 |
|
|
Wyatt Johnson
|
5d1fd61425
|
Merge branch 'master' into e2e-env-fix
|
2017-01-27 08:04:34 -07:00 |
|
|
Wyatt Johnson
|
9fbde9c023
|
Update init.js
|
2017-01-27 08:04:00 -07:00 |
|
|
David Erwin
|
744fce4563
|
Set settings model as well
|
2017-01-27 10:01:58 -05:00 |
|
|
David Erwin
|
c071484357
|
Removing test artifiacts
|
2017-01-27 09:48:41 -05:00 |
|
|
David Erwin
|
0a80205095
|
Update default setting to POST moderation
|
2017-01-27 09:45:35 -05:00 |
|
|
David Erwin
|
fbc5a6660a
|
Merge pull request #263 from coralproject/moderate-bio
Marking correct user as "Pending" on user flags.
|
2017-01-27 09:25:02 -05:00 |
|
|
Wyatt Johnson
|
71647d5233
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 16:47:52 -07:00 |
|
|
David Jay
|
e7587d9a41
|
Merge branch 'master' into moderate-bio
|
2017-01-26 17:46:20 -05:00 |
|
|
David Jay
|
02ece80227
|
Marking correct user as Pending on user flags.
|
2017-01-26 17:42:45 -05:00 |
|
|
David Erwin
|
74d78b76a5
|
Merge pull request #219 from coralproject/moderate-bio
Moderate bio or username
|
2017-01-26 17:09:44 -05:00 |
|
|
David Jay
|
d4c9bdb6fd
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-26 16:52:12 -05:00 |
|
|
David Jay
|
b8ff2b6763
|
Resetting chrome version to 2.25 in nightwatch.
|
2017-01-26 16:51:03 -05:00 |
|
|
Wyatt Johnson
|
fa985acd14
|
Update circle.yml
|
2017-01-26 14:45:02 -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 Jay
|
b6d8a90084
|
Updating style of UserActions and moving ActionButton to its own component.
|
2017-01-26 16:36:43 -05:00 |
|
|
David Erwin
|
3d08d1f54f
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 16:30:14 -05:00 |
|
|
David Erwin
|
b35336d1ed
|
Merge pull request #260 from coralproject/hide-premod-links
Hiding premod links
|
2017-01-26 16:28:48 -05:00 |
|
|
David Erwin
|
f42b8f324a
|
Merge branch 'master' into hide-premod-links
|
2017-01-26 16:24:06 -05:00 |
|
|
David Erwin
|
30583cd93f
|
Merge pull request #261 from coralproject/collapse-replies
Collapse replies
|
2017-01-26 16:21:07 -05:00 |
|
|
David Erwin
|
2086bd7b72
|
Merge branch 'master' into collapse-replies
|
2017-01-26 16:17:23 -05:00 |
|
|
David Erwin
|
fe62c1a739
|
Merge pull request #257 from coralproject/refresh-data-fix
Cleanup and more GraphQL features
|
2017-01-26 16:15:55 -05:00 |
|
|
David Jay
|
06331d3c07
|
Updating bio moderation to graphQL architecture.
|
2017-01-26 15:31:15 -05:00 |
|
|
Riley Davis
|
2ad27ef6f9
|
add a cancel button to the reply box
|
2017-01-26 13:21:23 -07:00 |
|
|
Riley Davis
|
3cbe8bb7ac
|
Stream now tracks what reply box is open
|
2017-01-26 12:45:14 -07:00 |
|
|
David Jay
|
963fc1f091
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-26 14:41:41 -05:00 |
|
|
David Jay
|
2e34f726eb
|
Updating tests to reflect graphql changes.
|
2017-01-26 14:41:03 -05:00 |
|
|
David Erwin
|
afb246b173
|
Hiding premod links
|
2017-01-26 10:46:01 -05:00 |
|
|
Wyatt Johnson
|
48cc82b039
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 07:59:01 -07:00 |
|
|
Belen Curcio
|
88169526c3
|
Missing semicolon
|
2017-01-26 10:50:53 -03:00 |
|
|
Belen Curcio
|
4a54c571ed
|
Open Stream and Closed Stream status
|
2017-01-26 10:45:50 -03:00 |
|
|
Belen Curcio
|
853981e21f
|
Working configure tab and refresh data. Adding uncontrolled components, deleting state
|
2017-01-26 10:19:49 -03:00 |
|
|
Belen Curcio
|
74bef18098
|
user checker
|
2017-01-26 09:34:47 -03:00 |
|
|
Belen Curcio
|
64ed10845b
|
Merge
|
2017-01-25 21:59:42 -03:00 |
|
|
David Erwin
|
0b73f18eb3
|
Merge pull request #258 from coralproject/streams-by-asset-id
Streams by asset
|
2017-01-25 17:48:41 -05:00 |
|
|
David Erwin
|
1a065ffa51
|
Merge branch 'streams-by-asset-id' of https://github.com/coralproject/talk into streams-by-asset-id
|
2017-01-25 17:45:09 -05:00 |
|
|
David Erwin
|
c4256fd27b
|
Ditch console logs
|
2017-01-25 17:44:21 -05:00 |
|