Wyatt Johnson
1dcf297a45
added email fixes
2018-01-11 10:58:43 -07:00
Kim Gardner
92b506c85a
Merge pull request #1270 from coralproject/suspect-label
...
Fix suspect label
2018-01-11 12:17:38 -05:00
Kiwi
f89a5013d2
Merge branch 'next' into suspect-label
2018-01-11 11:20:04 +01:00
Chi Vinh Le
89c929f970
Fix suspect label
2018-01-11 11:16:30 +01:00
Wyatt Johnson
14dd9acd3b
changed copy for error
2018-01-10 16:49:40 -07:00
okbel
d055e0b28b
Feature Button
2018-01-10 17:51:21 -03:00
okbel
1f6d38c4ad
Updating copy
2018-01-10 17:43:55 -03:00
okbel
eef2578e61
ignore user box over flow, fixed
2018-01-10 17:41:18 -03:00
okbel
7127aeaa87
Icon User Drawer
2018-01-10 17:35:50 -03:00
Wyatt Johnson
acc2e00c54
Merge pull request #1264 from coralproject/reply
...
Hide reply button when comment stream is closed
2018-01-10 11:55:05 -07:00
Belén Curcio
7d6fd69a3b
Merge branch 'next' into reply
2018-01-10 15:53:39 -03:00
Wyatt Johnson
1e372b583a
Merge pull request #1265 from coralproject/lodash-size-opt
...
Use lodash with es modules
2018-01-10 10:40:35 -07:00
Kiwi
1b373b5af4
Merge branch 'next' into lodash-size-opt
2018-01-10 18:39:57 +01:00
Kiwi
9d8867be9d
Merge branch 'next' into reply
2018-01-10 18:39:45 +01:00
Wyatt Johnson
fb7ff249b8
Merge pull request #1266 from coralproject/circle-next
...
Circle + Docker next
2018-01-10 10:38:56 -07:00
Wyatt Johnson
bbdd69b2a0
removed debug...
2018-01-10 10:34:11 -07:00
Wyatt Johnson
3687fc1702
adjusted build script to build the next branch and release it
2018-01-10 10:31:43 -07:00
Chi Vinh Le
caf2b88ee8
Fix typo
2018-01-10 18:29:03 +01:00
okbel
2ef3e29e7d
Merge branch 'reply' of github.com:coralproject/talk into reply
...
* 'reply' of github.com:coralproject/talk: (193 commits)
Add some margin to loadmore
typo
updated tests
updated tests
Fully implement SetUsername
removed snakecase
fix to optional required param
Use correct mutation and show errors
refactored mailer service with lodash!
Fix live status updates
Move ChangeUsername to the appropiate tab
Fix change username not displaying errors
Remove defunct refetch detection workaround
Rename UnBan and UnSuspend
hardened configuration
user cli patches
don't apply configuration from dotfiles during testing
applied rename to graph mutation edges
reintroduced the errors.ErrSameUsernameProvided
fixed wrong query logic
...
2018-01-10 14:08:58 -03:00
Kiwi
6a3be92a4c
Merge branch 'next' into reply
2018-01-10 18:08:12 +01:00
okbel
845c99de10
Updated tests
2018-01-10 13:57:16 -03:00
okbel
9c7b6e007a
Merge branch 'reply' of github.com:coralproject/talk into reply
...
* 'reply' of github.com:coralproject/talk:
Small grammar fixes
refactor to cleanup
extracted asset url
extracted more funcs
extracted events from opts
Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs
Adding doNotStore
Translation update to make it more appropriate.
Translation for hide off topic comments
2018-01-10 13:55:07 -03:00
okbel
4c3d3fb4b0
Updated tests
2018-01-10 13:54:43 -03:00
Chi Vinh Le
7036aa5bad
Use lodash with es modules
2018-01-10 17:54:06 +01:00
Belén Curcio
1898941097
Merge branch 'master' into reply
2018-01-10 12:31:10 -03:00
okbel
24f7405065
remove uncommitted
2018-01-10 12:29:47 -03:00
okbel
e1ead8f500
Adding e2e for the stream - open and closed asset features
2018-01-10 11:43:34 -03:00
okbel
5db8209182
Removing replyButton in Stream is closed
2018-01-10 11:21:24 -03:00
okbel
9c75f3fa59
Adding missing proptypes
2018-01-10 11:03:33 -03:00
Chi Vinh Le
bdcc9273f1
Add some margin to loadmore
2018-01-10 12:22:23 +01:00
Kim Gardner
63bd6309d3
Merge branch 'master' into next
2018-01-09 17:22:47 -05:00
Kim Gardner
bf76f0453b
Merge pull request #1261 from coralproject/losowsky-patch-1
...
Small grammar fixes
2018-01-09 17:04:01 -05:00
Kim Gardner
00677148b9
Merge branch 'master' into losowsky-patch-1
2018-01-09 16:53:15 -05:00
Wyatt Johnson
7bdfb55a1c
Merge pull request #1260 from coralproject/embed-events
...
Embed events
2018-01-09 14:53:04 -07:00
Andrew Losowsky
c43051c6dd
Small grammar fixes
2018-01-09 16:20:32 -05:00
Wyatt Johnson
20453dfddd
refactor to cleanup
2018-01-09 14:13:02 -07:00
Wyatt Johnson
20f9bba845
Merge branch 'master' into embed-events
2018-01-09 11:25:22 -07:00
Wyatt Johnson
25e29cb79a
extracted asset url
2018-01-09 11:01:10 -07:00
Wyatt Johnson
7f25f46ac0
extracted more funcs
2018-01-09 10:51:43 -07:00
Wyatt Johnson
d3c1286d1a
extracted events from opts
2018-01-09 10:47:58 -07:00
Kim Gardner
13bf20daf0
Merge pull request #1259 from coralproject/fix-set-username
...
Make Facebook login work again in next
2018-01-09 12:39:20 -05:00
Kim Gardner
e61c09f017
Merge branch 'next' into fix-set-username
2018-01-09 11:52:29 -05:00
Kim Gardner
395793445c
Merge branch 'master' into next
2018-01-09 11:52:20 -05:00
Kim Gardner
abc6cf6366
Merge pull request #1258 from coralproject/toxic-update
...
Adding doNotStore param to our Toxic Comments Plugin
2018-01-09 11:51:59 -05:00
Kim Gardner
eb33eb72d1
Merge branch 'master' into toxic-update
2018-01-09 11:44:44 -05:00
Kim Gardner
1a39635c0e
Merge pull request #1257 from larrylizhao/feature/RefineTranslation
...
Feature/refine translation
2018-01-09 11:43:23 -05:00
Kiwi
13347a6baf
Merge branch 'next' into fix-set-username
2018-01-09 15:07:56 +01:00
okbel
ff016e22fe
Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs
2018-01-09 10:42:28 -03:00
okbel
579644c910
Adding doNotStore
2018-01-09 10:34:24 -03:00
okbel
54b504eb8e
typo
2018-01-09 10:24:58 -03:00