Wyatt Johnson
|
e494cbd7e8
|
Merge branch 'master' into username-displayname
|
2017-02-13 11:17:29 -07:00 |
|
Riley Davis
|
e178b2e82a
|
Merge pull request #305 from coralproject/date-spacing
add a non-breaking space in between username and pubdate
|
2017-02-13 11:08:58 -07:00 |
|
riley
|
ba51b0742f
|
remove non-breaking space and add css
|
2017-02-13 11:00:28 -07:00 |
|
Riley Davis
|
5a0af59c45
|
add a non-breaking space in between username and pubdate
|
2017-02-13 10:53:03 -07:00 |
|
Wyatt Johnson
|
b30a5d2184
|
Removed 3.4 dep
|
2017-02-13 10:49:47 -07:00 |
|
Belen Curcio
|
e2ebac7176
|
adds new mutations: setCommentStatus
|
2017-02-13 14:32:48 -03:00 |
|
Wyatt Johnson
|
4e73d7fc23
|
Switched from Circle 2.0 -> 1.0, added set -e
|
2017-02-13 10:23:11 -07:00 |
|
Wyatt Johnson
|
a2855a7343
|
Removed unused shell
|
2017-02-13 10:03:55 -07:00 |
|
Belen Curcio
|
90ed1f1056
|
Ban user with graphql, 100 refactor
|
2017-02-13 11:50:16 -03:00 |
|
Wyatt Johnson
|
af49b0f6fb
|
Fixed checkout order
|
2017-02-10 16:29:29 -07:00 |
|
Wyatt Johnson
|
184e63e4e3
|
Updated circle based on feedback
|
2017-02-10 16:28:09 -07:00 |
|
Wyatt Johnson
|
de54433c5c
|
Merge branch 'master' into username-displayname
|
2017-02-10 16:19:27 -07:00 |
|
David Jay
|
4fedb7f31e
|
Merge branch 'master' of github.com:coralproject/talk into load-more-comments
|
2017-02-10 14:34:19 -08:00 |
|
Riley Davis
|
d4e68de349
|
setting up dashboard :)
|
2017-02-10 15:32:30 -07:00 |
|
Gabriela Rodríguez Berón
|
b962d672f4
|
Merge pull request #300 from coralproject/story-137818425-tag-staff
Tag comments made by Staff with 'STAFF' tag automatically.
|
2017-02-10 13:48:41 -08:00 |
|
gaba
|
e2e40ca2b3
|
Merge branch 'master' into story-137818425-tag-staff
|
2017-02-10 13:42:50 -08:00 |
|
David Erwin
|
4db2d63ee2
|
Merge pull request #302 from coralproject/like-bugfix
fix very annoying Like bug
|
2017-02-10 16:35:20 -05:00 |
|
gaba
|
11ef12c14c
|
Adds padding and resolves when is not staff.
|
2017-02-10 13:33:57 -08:00 |
|
Belen Curcio
|
894fec9fb6
|
adding context for moderation
|
2017-02-10 17:55:51 -03:00 |
|
Riley Davis
|
a5e66e61f3
|
Merge branch 'master' into like-bugfix
|
2017-02-10 13:26:55 -07:00 |
|
Riley Davis
|
81a408a0b1
|
fix very annoying Like bug
|
2017-02-10 13:21:58 -07:00 |
|
Belen Curcio
|
bc14b908eb
|
banUsers and moderate separate streams, not found assets etc
|
2017-02-10 17:15:26 -03:00 |
|
gaba
|
498eb5eb91
|
Fix the test.
|
2017-02-10 12:06:36 -08:00 |
|
David Erwin
|
5c4daa72cb
|
Merge pull request #297 from coralproject/actions
Actions Metadata
|
2017-02-10 14:53:46 -05:00 |
|
gaba
|
c80f406b21
|
Add tests
|
2017-02-10 11:52:02 -08:00 |
|
Wyatt Johnson
|
c637be364a
|
Moved tag creation into mutator
|
2017-02-10 12:00:50 -07:00 |
|
Gabriela Rodríguez Berón
|
7325525716
|
Merge branch 'master' into story-137818425-tag-staff
|
2017-02-10 10:32:43 -08:00 |
|
gaba
|
71fcf9cd3f
|
FE for the Staff Tag. Modifed typedfs graphql.
|
2017-02-10 10:20:34 -08:00 |
|
Wyatt Johnson
|
2c2541e7be
|
Added fix for not logged in user
|
2017-02-10 11:00:12 -07:00 |
|
Riley Davis
|
27ea409e31
|
html things
|
2017-02-10 10:52:55 -07:00 |
|
Belen Curcio
|
9320ece35b
|
Merge branch 'master' of github.com:coralproject/talk into mod-queues-ql
|
2017-02-10 08:57:35 -03:00 |
|
David Jay
|
05fcc61c9c
|
Resolving bug on comment load.
|
2017-02-09 17:56:28 -08:00 |
|
David Jay
|
52099efed9
|
Updating format of returned comments in CommentBox.
|
2017-02-09 17:27:16 -08:00 |
|
David Jay
|
b4ee765437
|
Merge branch 'master' into actions
|
2017-02-09 17:14:53 -08:00 |
|
Wyatt Johnson
|
fded4f0a91
|
Added new machine type
|
2017-02-09 18:05:47 -07:00 |
|
Wyatt Johnson
|
c202042cda
|
Revert "Revert "Adjusted circle""
This reverts commit 832d1f6763.
|
2017-02-09 18:04:31 -07:00 |
|
Wyatt Johnson
|
832d1f6763
|
Revert "Adjusted circle"
This reverts commit 229ddb11f2.
|
2017-02-09 18:02:25 -07:00 |
|
David Jay
|
1272dabb4b
|
Updating frontend actions to new format.
|
2017-02-09 17:01:16 -08:00 |
|
Wyatt Johnson
|
229ddb11f2
|
Adjusted circle
|
2017-02-09 17:37:39 -07:00 |
|
Wyatt Johnson
|
7db3da5fdd
|
Added fix for facebook
|
2017-02-09 17:03:41 -07:00 |
|
Wyatt Johnson
|
3cd2b28bc2
|
Inital rename of displayName -> username
|
2017-02-09 16:48:59 -07:00 |
|
gaba
|
10937cf717
|
Tag.name as string. Debuging comment.tag in Embed stream.
|
2017-02-09 15:28:09 -08:00 |
|
gaba
|
647ae2fca0
|
Assigned by will be a string for now.
|
2017-02-09 14:25:35 -08:00 |
|
Wyatt Johnson
|
646f6040ac
|
Merge pull request #291 from coralproject/recent-items
Added new recentComments, recentReplies
|
2017-02-09 14:24:04 -07:00 |
|
Wyatt Johnson
|
91e94e8400
|
Merge branch 'master' into recent-items
|
2017-02-09 14:11:03 -07:00 |
|
gaba
|
3be4fea8ad
|
Merge branch 'master' into story-137818425-tag-staff
|
2017-02-09 12:32:26 -08:00 |
|
gaba
|
1c26e64c71
|
Adds Tags to the graphql.
|
2017-02-09 12:23:40 -08:00 |
|
Gabriela Rodríguez Berón
|
a825d29b60
|
Merge pull request #298 from coralproject/bugfix-9000
Bugfix 9000
|
2017-02-09 12:22:59 -08:00 |
|
David Erwin
|
cd7d683fe2
|
Fixing for default url case
|
2017-02-09 15:16:02 -05:00 |
|
David Erwin
|
81e050214d
|
fix js error
|
2017-02-09 15:03:29 -05:00 |
|