 StephanieDClark
|
1bf2053cb8
|
Add isReply to commentInputDetailArea api
|
2017-06-01 11:01:57 -07:00 |
|
|
Kim Gardner
|
1fe6c79d88
|
Merge pull request #627 from coralproject/bump-version-1-8-0
Bump version in prep for 1.8.0 release
v1.8.0
|
2017-06-01 12:42:31 -04:00 |
|
|
Kim Gardner
|
8b3c1b275d
|
Merge branch 'master' into bump-version-1-8-0
|
2017-06-01 12:24:34 -04:00 |
|
|
Kim Gardner
|
c76e71ce31
|
Merge pull request #629 from coralproject/dec-inc-total-comment-count
Increase/Decrease totalCommentCount after mutation
|
2017-06-01 11:59:11 -04:00 |
|
|
Kim Gardner
|
b8015506df
|
Merge branch 'master' into dec-inc-total-comment-count
|
2017-06-01 11:54:49 -04:00 |
|
|
Kim Gardner
|
06e6730f04
|
Merge pull request #628 from coralproject/fix-translation-comment-count
Fix translation bug in CommentCount
|
2017-06-01 11:54:01 -04:00 |
|
|
Chi Vinh Le
|
fa08450185
|
Increase/Decrease totalCommentCount after mutation
|
2017-06-01 22:39:05 +07:00 |
|
|
Chi Vinh Le
|
d9acbbad96
|
Fix translation bug in CommentCount
|
2017-06-01 22:37:25 +07:00 |
|
|
David Erwin
|
4951527883
|
Merge pull request #626 from coralproject/pagination-refactor
Pagination refactor
|
2017-06-01 10:24:26 -04:00 |
|
|
Chi Vinh Le
|
33eff78a64
|
Always request comment id
|
2017-06-01 19:49:53 +07:00 |
|
|
Chi Vinh Le
|
5245755d49
|
Add some comments
|
2017-06-01 19:41:08 +07:00 |
|
|
Chi Vinh Le
|
ebdd586d1e
|
Fix mutation funkiness on permlink view
|
2017-06-01 18:47:07 +07:00 |
|
|
Chi Vinh Le
|
9a2b6b3ae1
|
Merge branch 'master' into pagination-refactor
|
2017-06-01 17:15:42 +07:00 |
|
|
Kim Gardner
|
9bd75a5670
|
Bump version in prep for 1.8.0 release
|
2017-05-31 16:55:14 -04:00 |
|
|
Kim Gardner
|
4ce0431fba
|
Merge pull request #623 from coralproject/add-trust-to-readme
Add trust to readme
|
2017-05-31 15:43:50 -04:00 |
|
|
Kim Gardner
|
93d8e0015b
|
Remove space
|
2017-05-31 15:29:51 -04:00 |
|
|
Kim Gardner
|
ac8e723e75
|
Copy changes
|
2017-05-31 15:29:50 -04:00 |
|
|
Kim Gardner
|
c172260d74
|
Fix link
|
2017-05-31 15:29:49 -04:00 |
|
|
Kim Gardner
|
2a3941552d
|
Update README with Trust info
|
2017-05-31 15:29:41 -04:00 |
|
|
Kim Gardner
|
dd9e3247d2
|
Merge pull request #622 from coralproject/hide-comment-box-perm
Hide comment box during perm view
|
2017-05-31 15:12:41 -04:00 |
|
|
Chi Vinh Le
|
b402f70f38
|
Hide comment box during perm view
|
2017-06-01 01:34:32 +07:00 |
|
|
Chi Vinh Le
|
30d4562383
|
Refactor pagination
|
2017-06-01 01:18:41 +07:00 |
|
|
Kim Gardner
|
93be1a91be
|
Merge pull request #608 from coralproject/integrate-admin-graphql-framework
Integrate admin into GraphQL framework
|
2017-05-30 18:04:10 -04:00 |
|
|
Chi Vinh Le
|
109f4b2c0f
|
Handle mutation errors
|
2017-05-31 00:44:16 +07:00 |
|
|
Kiwi
|
4f8ef88bd0
|
Merge branch 'master' into integrate-admin-graphql-framework
|
2017-05-31 00:24:06 +07:00 |
|
|
Kiwi
|
3160f6ae9e
|
Merge pull request #604 from coralproject/graphql-errors-handling
Support response errors in the graphql framework
|
2017-05-31 00:21:14 +07:00 |
|
|
Kiwi
|
15a11dca4d
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-30 20:48:58 +07:00 |
|
|
Kiwi
|
d28ba0028d
|
Merge branch 'master' into integrate-admin-graphql-framework
|
2017-05-30 20:48:53 +07:00 |
|
|
Kiwi
|
f42dd884c0
|
Merge pull request #617 from coralproject/forget-password-ports
Allow domains with ports
|
2017-05-30 20:48:42 +07:00 |
|
|
Kiwi
|
4a0785f6fe
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-30 20:18:32 +07:00 |
|
|
Kiwi
|
336e0373cd
|
Merge branch 'master' into integrate-admin-graphql-framework
|
2017-05-30 20:16:09 +07:00 |
|
|
David Erwin
|
bbed3e2a7f
|
Merge branch 'master' into forget-password-ports
|
2017-05-30 08:56:07 -04:00 |
|
|
David Erwin
|
c894e8eb1d
|
Merge pull request #616 from coralproject/fix-redirect-uri
Use correct redirect url
|
2017-05-30 08:55:44 -04:00 |
|
|
Chi Vinh Le
|
68f6c8acb6
|
No shared store between popup and embed
|
2017-05-30 01:08:45 +07:00 |
|
|
Chi Vinh Le
|
1acf58182f
|
Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
client/coral-admin/src/containers/Community/Loading.js
client/coral-admin/src/containers/Community/Table.js
client/coral-admin/src/containers/Streams/Stories.js
client/coral-admin/src/index.js
client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
client/coral-admin/src/routes/Community/components/People.js
client/coral-admin/src/routes/Configure/components/Configure.js
client/coral-admin/src/routes/Configure/components/Domainlist.js
client/coral-admin/src/routes/Configure/components/EmbedLink.js
client/coral-admin/src/routes/Configure/components/ModerationSettings.js
client/coral-admin/src/routes/Configure/components/StreamSettings.js
client/coral-admin/src/routes/Configure/components/TechSettings.js
client/coral-admin/src/routes/Configure/components/Wordlist.js
client/coral-admin/src/routes/Dashboard/components/CountdownTimer.js
client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
client/coral-admin/src/routes/Install/components/Steps/FinalStep.js
client/coral-admin/src/routes/Install/components/Steps/InitialStep.js
client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
client/coral-admin/src/routes/Install/components/translations.json
client/coral-admin/src/routes/Moderation/components/Moderation.js
client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
client/coral-admin/src/routes/Stories/components/Stories.js
client/coral-embed-stream/src/index.js
|
2017-05-29 23:06:40 +07:00 |
|
|
Chi Vinh Le
|
04ef1c5be5
|
Use new translation service
|
2017-05-29 22:45:56 +07:00 |
|
|
Chi Vinh Le
|
a598bca12b
|
Allow domains with ports
|
2017-05-29 22:10:16 +07:00 |
|
|
Kiwi
|
810f337d8d
|
Merge branch 'master' into fix-redirect-uri
|
2017-05-29 22:06:33 +07:00 |
|
|
Kiwi
|
c314054143
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-29 22:00:49 +07:00 |
|
|
Chi Vinh Le
|
bd5e272f00
|
Use correct redirect url
|
2017-05-29 22:00:27 +07:00 |
|
|
Kiwi
|
bdbc7c5ff2
|
Merge pull request #586 from coralproject/i18n-refactor
Refactor i18n
|
2017-05-29 21:59:52 +07:00 |
|
|
Chi Vinh Le
|
2d398fe452
|
Change not authorized error message
|
2017-05-29 20:36:21 +07:00 |
|
|
Chi Vinh Le
|
0b7432b75e
|
Merge branch 'master' into i18n-refactor
Conflicts:
client/coral-sign-in/components/FakeComment.js
client/coral-sign-in/components/UserBox.js
|
2017-05-29 20:23:27 +07:00 |
|
|
Chi Vinh Le
|
9a6532ecea
|
Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
client/coral-embed-stream/src/index.js
|
2017-05-29 20:09:03 +07:00 |
|
|
Kiwi
|
f3f6633e99
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-29 19:42:26 +07:00 |
|
|
David Erwin
|
93f8a81678
|
Merge pull request #607 from coralproject/unified-docs
Unified docs
|
2017-05-27 09:59:08 -04:00 |
|
|
Kim Gardner
|
b13d3adce0
|
Merge branch 'master' into unified-docs
|
2017-05-26 17:00:53 -04:00 |
|
|
Kim Gardner
|
d213a4a26e
|
Merge pull request #613 from coralproject/minor-stream-style-changes
Stream and mod queue style fixes
|
2017-05-26 17:00:09 -04:00 |
|
|
Kim Gardner
|
82d442d95b
|
Merge branch 'master' into minor-stream-style-changes
|
2017-05-26 16:53:55 -04:00 |
|
|
Kim Gardner
|
1dcd254519
|
Merge branch 'master' into unified-docs
|
2017-05-26 16:53:36 -04:00 |
|