 Chi Vinh Le
|
0040bc4c01
|
Remove remaining debug msgs
|
2017-05-19 02:12:27 +07:00 |
|
|
Chi Vinh Le
|
0588a8ab66
|
Use async / await :-)
|
2017-05-19 02:07:38 +07:00 |
|
|
Chi Vinh Le
|
859a0b1fbe
|
Make until arg required
|
2017-05-19 02:03:36 +07:00 |
|
|
Chi Vinh Le
|
d995cdde07
|
Make email message required
|
2017-05-19 02:01:47 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Chi Vinh Le
|
492b973206
|
Add 1 extra suspension minute
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
2bdf413b88
|
Integrate into embed stream
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
76e87f4c34
|
Move previous suspendUser feature to rejectUsername
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
056ff427a5
|
Merge branch 'master' into suspend-user
|
2017-05-17 21:50:28 +07:00 |
|
|
Chi Vinh Le
|
71c743dda7
|
Extend backend to support new suspend feature
|
2017-05-17 20:05:18 +07:00 |
|
|
KiwiandGitHub
|
c21e500e58
|
Merge pull request #593 from coralproject/readd-last-comment
Readd lastComment field to asset resolver
|
2017-05-17 01:35:07 +07:00 |
|
|
Chi Vinh Le
|
7d858c7b3f
|
Readd lastComment field to asset resolver
|
2017-05-17 01:25:06 +07:00 |
|
|
Chi Vinh Le
|
97121382c7
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
client/coral-admin/src/containers/ModerationQueue/components/Comment.js
client/coral-framework/utils/index.js
package.json
|
2017-05-16 21:02:33 +07:00 |
|
|
Belén CurcioandGitHub
|
e561819c8d
|
Merge pull request #592 from coralproject/invalidate-old-data
Invalidate old user data
|
2017-05-16 08:57:32 -03:00 |
|
|
Chi Vinh Le
|
c7e0577708
|
Merge branch 'master' into invalidate-old-data
|
2017-05-16 18:17:45 +07:00 |
|
|
Chi Vinh Le
|
2ab8cc9481
|
Allow Apollo to invalidate old user data
|
2017-05-16 18:17:43 +07:00 |
|
|
KiwiandGitHub
|
acdc00af18
|
Merge pull request #591 from coralproject/refetch-profile-only-after-login
Only refetch for login on `My Profile`.
|
2017-05-16 18:12:54 +07:00 |
|
|
Belén CurcioandGitHub
|
f9cf5fb744
|
Merge branch 'master' into refetch-profile-only-after-login
|
2017-05-16 07:57:20 -03:00 |
|
|
Chi Vinh Le
|
e1b80c3317
|
Only refetch for login
|
2017-05-16 17:50:17 +07:00 |
|
|
Belén CurcioandGitHub
|
f37c1c3b5d
|
Merge pull request #590 from coralproject/auth-login-fixes
Auth login fixes
|
2017-05-16 07:42:32 -03:00 |
|
|
Chi Vinh Le
|
ec19618052
|
Readd login fixes
|
2017-05-16 17:26:53 +07:00 |
|
|
Chi Vinh Le
|
81f51b69ec
|
Clear token before dispatching logout action
|
2017-05-16 17:13:19 +07:00 |
|
|
Belén CurcioandGitHub
|
084bd6710f
|
Merge pull request #589 from coralproject/fix
Updated Lock File
|
2017-05-16 00:14:02 -03:00 |
|
|
Belen Curcio
|
df843a23dd
|
updated loc
|
2017-05-16 00:09:33 -03:00 |
|
|
Kim GardnerandGitHub
|
95e770aff8
|
Merge pull request #588 from coralproject/fix
Fix for FB login.
|
2017-05-15 22:57:30 -04:00 |
|
|
Belen Curcio
|
d3252b8c87
|
Done :)
|
2017-05-15 23:47:29 -03:00 |
|
|
Belen Curcio
|
1eada688fe
|
Prettier
|
2017-05-15 23:23:22 -03:00 |
|
|
Belen Curcio
|
4b6e562492
|
Missing "" to send strings instead of objects
|
2017-05-15 23:22:36 -03:00 |
|
|
Kim GardnerandGitHub
|
297dee6da8
|
Merge pull request #587 from coralproject/edit-changes
Edit Consistency
|
2017-05-15 16:47:33 -04:00 |
|
|
Belen Curcio
|
2b7f545c2d
|
lint
|
2017-05-15 17:31:53 -03:00 |
|
|
Belen Curcio
|
b789a8e107
|
Removing kiwis fix since this was fixed in auth tokens branch
|
2017-05-15 17:23:57 -03:00 |
|
|
Belen Curcio
|
b2e5c0452a
|
The merge conficts
|
2017-05-15 17:13:48 -03:00 |
|
|
Belén CurcioandGitHub
|
afa3123829
|
Merge pull request #578 from coralproject/auth-tokens
JWT Auth
|
2017-05-15 16:51:10 -03:00 |
|
|
Wyatt Johnson
|
5aca83993b
|
fixed build process
|
2017-05-15 13:35:51 -06:00 |
|
|
Wyatt Johnson
|
8ff0c3db51
|
Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens
|
2017-05-15 13:14:10 -06:00 |
|
|
Chi Vinh Le
|
74e1436ae4
|
Use correct error key
|
2017-05-16 01:09:33 +07:00 |
|
|
Chi Vinh Le
|
def35f0a93
|
Fix login issues
|
2017-05-16 00:55:12 +07:00 |
|
|
Chi Vinh Le
|
06001763ff
|
Remove unused files
|
2017-05-16 00:52:37 +07:00 |
|
|
Belen Curcio
|
75aa8d79df
|
linting
|
2017-05-15 14:50:26 -03:00 |
|
|
Belen Curcio
|
843c3a16c8
|
Admin share same network interface, and unifying actions
|
2017-05-15 14:48:12 -03:00 |
|
|
KiwiandGitHub
|
963827204e
|
Merge branch 'master' into edit-changes
|
2017-05-15 23:22:30 +07:00 |
|
|
Belen Curcio
|
4e86e4197c
|
handling logout
|
2017-05-15 13:13:28 -03:00 |
|
|
Belen Curcio
|
5dae7bf4ac
|
Merge branch 'master' of github.com:coralproject/talk into auth-tokens
|
2017-05-15 13:12:11 -03:00 |
|
|
Belen Curcio
|
48370db09a
|
Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens
|
2017-05-15 13:11:32 -03:00 |
|
|
Chi Vinh Le
|
a9207428fe
|
Calculate "until"
|
2017-05-15 23:07:46 +07:00 |
|
|
Wyatt Johnson
|
9bee31198e
|
Added logout routes
|
2017-05-15 10:03:09 -06:00 |
|
|
Kim GardnerandGitHub
|
2a95c1eee2
|
Merge pull request #583 from coralproject/hooks-docs
[DOCS] - Hooks and Reactions
|
2017-05-15 11:55:41 -04:00 |
|
|
Belen Curcio
|
57ced201eb
|
WebStorage events
|
2017-05-15 12:52:54 -03:00 |
|
|
Belen Curcio
|
370cdf8c09
|
Ádding middlewares to our network interface
|
2017-05-15 12:51:07 -03:00 |
|
|
Kim GardnerandGitHub
|
cb64d599fe
|
Merge branch 'master' into hooks-docs
|
2017-05-15 11:50:46 -04:00 |
|