 Riley Davis
|
0bef413a3a
|
saving my place
|
2017-02-14 15:20:28 -07:00 |
|
|
Riley Davis
|
5e2c1a9d4f
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/translations.json
|
2017-02-14 12:03:54 -07:00 |
|
|
David Erwin
|
daec809d87
|
Merge pull request #307 from coralproject/external-css-file
Configure override css file
|
2017-02-14 13:58:05 -05:00 |
|
|
David Erwin
|
ce2213549b
|
Merge branch 'master' into external-css-file
|
2017-02-14 13:40:22 -05:00 |
|
|
David Erwin
|
d2c9b4b7a7
|
Merge pull request #310 from coralproject/close-time-bug
fix Configure in admin
|
2017-02-14 13:40:07 -05:00 |
|
|
Riley Davis
|
53e3147290
|
properly save settings to server
|
2017-02-14 11:29:40 -07:00 |
|
|
Riley Davis
|
fe1aaba9ed
|
revert state shape to what it was before
|
2017-02-14 11:05:39 -07:00 |
|
|
Wyatt Johnson
|
d987b33d99
|
Merge branch 'master' into flag-widget
|
2017-02-14 09:00:12 -07:00 |
|
|
David Erwin
|
d1749e0f35
|
Merge branch 'master' into external-css-file
|
2017-02-14 09:59:37 -05:00 |
|
|
David Erwin
|
b85950140b
|
Merge pull request #309 from coralproject/install-missing
Missing reducer in Talk Installer
|
2017-02-14 09:59:16 -05:00 |
|
|
Belen Curcio
|
f07900b294
|
Missing reducer
|
2017-02-14 11:44:22 -03:00 |
|
|
Riley Davis
|
86d0e59147
|
add translation to input label
|
2017-02-13 16:09:06 -07:00 |
|
|
Riley Davis
|
183d2e1ea0
|
Merged branch master into external-css-file
|
2017-02-13 16:04:00 -07:00 |
|
|
Riley Davis
|
0234112ad0
|
enable configuration for linking override stylesheets
|
2017-02-13 16:03:49 -07:00 |
|
|
David Erwin
|
586d3c4c8a
|
Merge pull request #304 from coralproject/mod-queues-ql
Moderation Queue
|
2017-02-13 17:40:26 -05:00 |
|
|
Wyatt Johnson
|
51cbf79f30
|
Changed fragment
|
2017-02-13 15:33:10 -07:00 |
|
|
Belen Curcio
|
8953182329
|
merge
|
2017-02-13 19:14:27 -03:00 |
|
|
Belen Curcio
|
51be47b62e
|
added flag functionality
|
2017-02-13 19:09:26 -03:00 |
|
|
David Erwin
|
b30ace74b4
|
Merge pull request #299 from coralproject/username-displayname
Inital rename of displayName -> username
|
2017-02-13 17:07:56 -05:00 |
|
|
Belen Curcio
|
37ba14f3b5
|
breaking big words
|
2017-02-13 18:27:26 -03:00 |
|
|
Belen Curcio
|
519298b980
|
Design Pass
|
2017-02-13 18:12:37 -03:00 |
|
|
Belen Curcio
|
732ef9b8bd
|
Adding moderationList for the tests
|
2017-02-13 16:24:12 -03:00 |
|
|
Belen Curcio
|
72156a01b8
|
Merge branch 'mod-queues-ql' of github.com:coralproject/talk into mod-queues-ql
|
2017-02-13 16:14:48 -03:00 |
|
|
Belen Curcio
|
0403c46c6c
|
Adding errors response
|
2017-02-13 16:13:03 -03:00 |
|
|
Belen Curcio
|
594b87208a
|
GraphQL Review and Responses
|
2017-02-13 16:00:55 -03:00 |
|
|
Belén Curcio
|
12acbeee45
|
Merge branch 'master' into mod-queues-ql
|
2017-02-13 15:23:43 -03:00 |
|
|
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 |
|
|
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 |
|