 Wyatt Johnson
|
f4b9191476
|
Added author_id to comment count query
|
2017-05-16 14:20:20 -06:00 |
|
|
Riley DavisandGitHub
|
4ca5c4bc09
|
Merge branch 'master' into user-detail-ui
|
2017-05-16 13:54:13 -06: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 |
|
|
riley
|
c7e9fe3f5f
|
update backend with the can() method
|
2017-05-16 10:50:09 -06:00 |
|
|
Wyatt Johnson
|
e90ce7f4c3
|
fixed merge issue
|
2017-05-16 10:20:16 -06:00 |
|
|
riley
|
62e8e4c5c5
|
change how constants are exposed
|
2017-05-16 10:15:43 -06:00 |
|
|
Wyatt Johnson
|
3e2ed222ed
|
Merge branch 'trust-merge' into user-detail-ui
|
2017-05-16 09:53:35 -06:00 |
|
|
riley
|
7896b3f33b
|
merge master
|
2017-05-16 09:43:49 -06: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 |
|
|
gaba
|
35c941d4d0
|
Add missing translations from commentbox.
|
2017-05-15 16:17:53 -07:00 |
|
|
gaba
|
61856c3cf6
|
Use timeago.
|
2017-05-15 16:04:10 -07:00 |
|
|
riley
|
4d3788e4c9
|
saving my place so i dont have too many threads
|
2017-05-15 16:25:32 -06:00 |
|
|
Wyatt Johnson
|
50db2d1dda
|
Initial merge of trust functionality
|
2017-05-15 15:28:57 -06:00 |
|
|
gaba
|
c0c6dd6252
|
The merge got back some code to the coral-framework.
|
2017-05-15 14:23:56 -07:00 |
|
|
Belen Curcio
|
c59346eb0a
|
tags, and assignedby nul
|
2017-05-15 18:13:45 -03:00 |
|
|
Belen Curcio
|
d02412a734
|
Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags
|
2017-05-15 18:11:30 -03:00 |
|
|
Belen Curcio
|
c3d02a14a0
|
Updated queries and hasRoles
|
2017-05-15 18:11:14 -03:00 |
|
|
gaba
|
423cb3cade
|
Merge branch 'master' into i18n-refactor
|
2017-05-15 14:02:34 -07:00 |
|
|
Kim GardnerandGitHub
|
297dee6da8
|
Merge pull request #587 from coralproject/edit-changes
Edit Consistency
|
2017-05-15 16:47:33 -04:00 |
|
|
gaba
|
54e103b55a
|
Change a few translations that had wrong key.
|
2017-05-15 13:44:46 -07:00 |
|
|
Belen Curcio
|
2b7f545c2d
|
lint
|
2017-05-15 17:31:53 -03:00 |
|
|
gaba
|
0ead2cb610
|
Adds sign in translations.
|
2017-05-15 13:25:09 -07: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
|
820ffb14c1
|
Merge branch 'master' into 142993479-tags
|
2017-05-15 16:55:47 -03:00 |
|
|
gaba
|
f32eac4eab
|
Lint YAML and notations
|
2017-05-15 12:53:28 -07: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 |
|
|
Belén CurcioandGitHub
|
3eea5e1a8a
|
Merge branch 'master' into 142993479-tags
|
2017-05-15 14:53:54 -03: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 |
|