 David Erwin
|
e96c5bbc8f
|
Merge pull request #542 from coralproject/optimise-initial-query
Only query once during initial render
|
2017-04-27 13:53:56 -04:00 |
|
|
David Erwin
|
06378209a2
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 13:49:12 -04:00 |
|
|
David Erwin
|
efda925efc
|
Merge pull request #546 from coralproject/sub-fix
Moved subscription dep to devDeps
|
2017-04-27 12:53:04 -04:00 |
|
|
David Erwin
|
6e3159c7e1
|
Merge pull request #545 from coralproject/docker-fix
Fixed Dockerfile for regression with yarn
|
2017-04-27 10:34:26 -04:00 |
|
|
David Erwin
|
64eb16c3d6
|
Merge pull request #519 from coralproject/more-fragment-matcher
more matching on the fragment
|
2017-04-27 10:17:58 -04:00 |
|
|
David Erwin
|
6972b87b0b
|
Merge branch 'master' into more-fragment-matcher
|
2017-04-27 10:10:19 -04:00 |
|
|
David Erwin
|
279ff0655f
|
Merge pull request #544 from coralproject/login-ios-safari
More reliable login support including IOS browsers
|
2017-04-27 10:03:29 -04:00 |
|
|
David Erwin
|
bb532b5eb2
|
Merge pull request #531 from coralproject/shortcuts-in-cog
shortcuts list should be accessible from the cog
|
2017-04-26 17:41:04 -04:00 |
|
|
David Erwin
|
5eb26946cb
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 17:21:34 -04:00 |
|
|
David Erwin
|
81680442f0
|
Merge branch 'master' into shortcuts-in-cog
|
2017-04-26 17:20:37 -04:00 |
|
|
David Erwin
|
c86f9877f3
|
Merge pull request #534 from coralproject/143202319-mod-queue-shortcuts
Recover the scroll.
|
2017-04-26 17:20:17 -04:00 |
|
|
David Erwin
|
1b3868edec
|
Merge branch 'master' into 143202319-mod-queue-shortcuts
|
2017-04-26 17:13:46 -04:00 |
|
|
David Erwin
|
4936003f5f
|
Merge pull request #536 from coralproject/fix-case
make Comment comment
|
2017-04-26 17:13:28 -04:00 |
|
|
David Erwin
|
5c4696ed61
|
Merge branch 'master' into fix-case
|
2017-04-26 17:08:56 -04:00 |
|
|
David Erwin
|
bf898fbaec
|
Merge pull request #460 from coralproject/subscriptions
Subscriptions
|
2017-04-26 17:05:58 -04:00 |
|
|
David Erwin
|
41065ba24a
|
Merge branch 'master' into subscriptions
|
2017-04-26 17:01:27 -04:00 |
|
|
David Erwin
|
0e77c93ae5
|
Merge pull request #521 from coralproject/user-metadata
Added user metadata
|
2017-04-26 17:01:15 -04:00 |
|
|
David Erwin
|
2756b794ee
|
Merge branch 'master' into more-fragment-matcher
|
2017-04-26 16:57:37 -04:00 |
|
|
David Erwin
|
626f5cd1e1
|
Merge branch 'master' into user-metadata
|
2017-04-26 16:56:50 -04:00 |
|
|
David Erwin
|
077daeb793
|
Merge branch 'master' into subscriptions
|
2017-04-26 16:55:32 -04:00 |
|
|
David Erwin
|
e20b6e1b25
|
Merge branch 'master' into fix-case
|
2017-04-26 13:19:50 -04:00 |
|
|
David Erwin
|
c02890af00
|
Merge pull request #526 from coralproject/query-composition
Query composition
|
2017-04-26 12:58:51 -04:00 |
|
|
David Erwin
|
85674b3ef5
|
Merge branch 'master' into query-composition
|
2017-04-26 10:09:14 -04:00 |
|
|
David Erwin
|
80f695e23d
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 09:53:19 -04:00 |
|
|
David Erwin
|
8b4c2876c7
|
Merge pull request #538 from coralproject/ios-safari-full-width
Safari IOS ignores width=100% in iframes
|
2017-04-26 09:44:01 -04:00 |
|
|
David Erwin
|
7d0aac5d4a
|
Merge pull request #532 from coralproject/fix-view-more
Fix: View More working with asset_id
|
2017-04-25 16:01:38 -04:00 |
|
|
David Erwin
|
d4c4b5a3e9
|
Merge branch 'master' into fix-view-more
|
2017-04-25 15:26:20 -04:00 |
|
|
David Erwin
|
35f01c2ecc
|
Merge pull request #516 from coralproject/remove-rejected-comments
let ApolloClient know which types are interfaces
|
2017-04-20 20:08:50 -04:00 |
|
|
David Erwin
|
0dee09dd93
|
Merge pull request #515 from coralproject/mobilify-login-popup
Mobilify login popup
|
2017-04-20 17:42:00 -04:00 |
|
|
David Erwin
|
e8c3bdc5b1
|
Merge branch 'master' into mobilify-login-popup
|
2017-04-20 17:28:54 -04:00 |
|
|
David Erwin
|
267338c851
|
Merge pull request #514 from coralproject/premod-queue-fix
Premod queue fix
|
2017-04-20 16:57:43 -04:00 |
|
|
David Erwin
|
bdd8ec3789
|
Merge pull request #505 from coralproject/default-resolve-type
Added defaultResolveType
|
2017-04-20 16:40:24 -04:00 |
|
|
David Erwin
|
1db168df8c
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:33:54 -04:00 |
|
|
David Erwin
|
1ec30854c2
|
Merge pull request #510 from coralproject/login-popup
Login Popup
|
2017-04-20 16:10:18 -04:00 |
|
|
David Erwin
|
7c38b9b54f
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:03:38 -04:00 |
|
|
David Erwin
|
00e24ce88a
|
Merge branch 'master' into login-popup
|
2017-04-20 15:15:51 -04:00 |
|
|
David Erwin
|
467a32038e
|
Merge pull request #512 from coralproject/action-summary-fix
Action summary fix - Part Deux
|
2017-04-20 15:15:38 -04:00 |
|
|
David Erwin
|
85e552cf04
|
Merge branch 'master' into action-summary-fix
|
2017-04-20 14:40:16 -04:00 |
|
|
David Erwin
|
2c5f46b3ae
|
Merge pull request #513 from coralproject/fix-ignored-user-error
Fix ignored users when not logged in
|
2017-04-20 14:39:24 -04:00 |
|
|
David Erwin
|
900cb33122
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 13:38:06 -04:00 |
|
|
David Erwin
|
6075317564
|
Merge pull request #511 from coralproject/build-fix
Added --force to rebuild native modules
|
2017-04-20 13:37:33 -04:00 |
|
|
David Erwin
|
f3f651c562
|
Merge branch 'master' into build-fix
|
2017-04-20 13:33:45 -04:00 |
|
|
David Erwin
|
cbba3acf4a
|
Merge pull request #508 from coralproject/action-label-fix
Quick fix action labels in Mobile
|
2017-04-20 13:27:37 -04:00 |
|
|
David Erwin
|
0de87af07a
|
Merge branch 'master' into login-popup
|
2017-04-20 13:25:00 -04:00 |
|
|
David Erwin
|
a873034288
|
Merge pull request #498 from coralproject/docs-update
Docs update
|
2017-04-14 17:16:26 -04:00 |
|
|
David Erwin
|
d1bc747009
|
Merge pull request #500 from coralproject/username-profanity-fix
Username Profanity Fix
|
2017-04-14 17:05:27 -04:00 |
|
|
David Erwin
|
b3ce4507a3
|
Merge pull request #476 from coralproject/metadata
MetadataService
|
2017-04-12 16:02:39 -04:00 |
|
|
David Erwin
|
c7e1943272
|
Merge branch 'master' into metadata
|
2017-04-12 15:57:24 -04:00 |
|
|
David Erwin
|
ab74ebdc52
|
Merge branch 'master' into subscriptions
|
2017-04-11 11:58:55 -04:00 |
|
|
David Erwin
|
2c8d03bd8d
|
Temporarily disable username profanity check
|
2017-04-11 11:05:55 -04:00 |
|
|
David Erwin
|
0a0f82cd5a
|
Merge pull request #464 from coralproject/optional-google-fonts
do not load google fonts in embed
|
2017-04-07 13:50:39 -04:00 |
|
|
David Erwin
|
e70cfdfd00
|
Merge pull request #459 from coralproject/support-lazy-assets
Added support for a plugin which disables lazy assets
|
2017-04-06 10:54:32 -04:00 |
|
|
David Erwin
|
58f296ef88
|
Merge branch 'support-lazy-assets' of https://github.com/coralproject/talk into support-lazy-assets
|
2017-04-06 10:49:30 -04:00 |
|
|
David Erwin
|
79d5c28d00
|
Pass asset_id in title route
|
2017-04-06 10:47:56 -04:00 |
|
|
David Erwin
|
2b23a6625f
|
Merge pull request #466 from coralproject/stream-refetch-tweak
only refetch the comments if you're an admin
|
2017-04-06 10:13:46 -04:00 |
|
|
David Erwin
|
6f8b375519
|
Merge branch 'master' into stream-refetch-tweak
|
2017-04-06 10:03:00 -04:00 |
|
|
David Erwin
|
73344fa528
|
Merge pull request #467 from coralproject/fix-collapsing-comments
Fix collapsing comment tree
|
2017-04-06 10:02:29 -04:00 |
|
|
David Erwin
|
6117dd3358
|
Merge branch 'master' into fix-collapsing-comments
|
2017-04-06 09:57:35 -04:00 |
|
|
David Erwin
|
b335cb3493
|
Document subscription plugins
|
2017-04-05 17:26:12 -04:00 |
|
|
David Erwin
|
6735296c3c
|
Abstract setupFunctions
|
2017-04-05 17:07:14 -04:00 |
|
|
David Erwin
|
bbf0839890
|
Merge pull request #465 from coralproject/graph-fix
Fixed for resolver plugin syntax
|
2017-04-05 17:00:16 -04:00 |
|
|
David Erwin
|
350d9e74f2
|
Get plugin setupFuncitons for subscriptions
|
2017-04-05 16:56:32 -04:00 |
|
|
David Erwin
|
5dbeb695a4
|
Merge pull request #463 from coralproject/facebook-auth-plugin
Facebook Auth Plugin
|
2017-04-05 15:31:53 -04:00 |
|
|
David Erwin
|
48b7a67665
|
Add comments
|
2017-04-05 11:24:52 -04:00 |
|
|
David Erwin
|
97727118dd
|
Merge pull request #461 from coralproject/report-apollo-errors
Implement apollo reporter middleware
|
2017-04-05 09:30:57 -04:00 |
|
|
David Erwin
|
74596b9e08
|
Merge branch 'master' into report-apollo-errors
|
2017-04-05 09:24:41 -04:00 |
|
|
David Erwin
|
9c3450ebad
|
Merge pull request #462 from coralproject/adjust-editorconfig
Adjust .editorconfig
|
2017-04-05 09:22:57 -04:00 |
|
|
David Erwin
|
a4ec278125
|
Merge pull request #458 from coralproject/docker-plugins
Plugin Router/Passport/Deployment
|
2017-04-04 16:56:02 -04:00 |
|
|
David Erwin
|
a22d7af8bb
|
Merge branch 'master' into change-permalink-behavior
|
2017-03-30 10:20:58 -04:00 |
|
|
David Erwin
|
1e80991614
|
Merge pull request #445 from coralproject/dynamic-email-templates
hot-load email templates during development
|
2017-03-29 15:38:42 -04:00 |
|
|
David Erwin
|
4f1f85d127
|
Merge pull request #443 from coralproject/community-flags
Community flags
|
2017-03-28 10:19:37 -04:00 |
|
|
David Erwin
|
7e65ba6371
|
Merge pull request #437 from coralproject/revert-370-story-138187767-mod-flag-names
Revert "Story 138187767 - Moderate Flag User Names"
|
2017-03-23 11:22:28 -04:00 |
|
|
David Erwin
|
903aa23f19
|
Revert "Story 138187767 - Moderate Flag User Names"
|
2017-03-23 11:18:55 -04:00 |
|
|
David Erwin
|
03aebd7840
|
Merge pull request #432 from coralproject/my-comments-ux
My Comments / Profile Tab UX
|
2017-03-23 10:57:40 -04:00 |
|
|
David Erwin
|
53ba313f57
|
Merge branch 'master' into my-comments-ux
|
2017-03-23 10:53:47 -04:00 |
|
|
David Erwin
|
da8e632fd3
|
Merge pull request #433 from coralproject/design-more
Design UX - #141430305
|
2017-03-23 10:53:32 -04:00 |
|
|
David Erwin
|
6c83b2e60d
|
Merge branch 'master' into design-more
|
2017-03-23 10:49:26 -04:00 |
|
|
David Erwin
|
ae457f1951
|
Merge branch 'master' into my-comments-ux
|
2017-03-23 10:40:00 -04:00 |
|
|
David Erwin
|
907f7173fb
|
Merge pull request #430 from coralproject/admin-ux
Admin UX
|
2017-03-23 10:39:18 -04:00 |
|
|
David Erwin
|
a01c6f0f78
|
Merge branch 'master' into admin-ux
|
2017-03-23 09:04:36 -04:00 |
|
|
David Erwin
|
49e4486b75
|
Merge pull request #426 from coralproject/no-reply-closed-streams
hide reply button if stream is closed
|
2017-03-22 11:08:33 -07:00 |
|
|
David Erwin
|
2016546ca3
|
Merge pull request #426 from coralproject/no-reply-closed-streams
hide reply button if stream is closed
|
2017-03-22 10:53:15 -04:00 |
|
|
David Erwin
|
63fca6ba4c
|
Merge branch 'master' into no-reply-closed-streams
|
2017-03-22 10:45:02 -04:00 |
|
|
David Erwin
|
9cf974d098
|
Merge pull request #427 from coralproject/view-more-no-worky
Comment Stream Bugfix
|
2017-03-21 17:59:40 -04:00 |
|
|
David Erwin
|
072d332027
|
Merge branch 'master' into view-more-no-worky
|
2017-03-21 17:54:37 -04:00 |
|
|
David Erwin
|
d7adf0c792
|
Merge pull request #423 from coralproject/stream-sorting
sort the stories by date
|
2017-03-21 16:47:27 -04:00 |
|
|
David Erwin
|
481c22b7dd
|
Merge pull request #429 from coralproject/documentation-fix
Fixed plugin examples
|
2017-03-21 13:44:57 -04:00 |
|
|
David Erwin
|
9ccdaec063
|
Merge pull request #422 from coralproject/plugin-patch
Update Dockerfile
|
2017-03-20 10:47:03 -07:00 |
|
|
David Erwin
|
af93953b17
|
Merge pull request #421 from coralproject/plugins
Server Graph Plugins
|
2017-03-20 10:47:02 -07:00 |
|
|
David Erwin
|
17deea5b96
|
Merge branch 'master' into plugins
|
2017-03-20 10:47:01 -07:00 |
|
|
David Erwin
|
75cb83014b
|
Merge pull request #406 from coralproject/asset-comment-metrics
Asset comment metrics
|
2017-03-20 07:42:30 -07:00 |
|
|
David Erwin
|
abd0b51441
|
Removing log
|
2017-03-20 07:42:29 -07:00 |
|
|
David Erwin
|
c55b4d22d7
|
Language update
|
2017-03-20 07:42:29 -07:00 |
|
|
David Erwin
|
1d061ce359
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:36:23 -07:00 |
|
|
David Erwin
|
28b24ebb09
|
Fix bug in example
|
2017-03-20 07:36:17 -07:00 |
|
|
David Erwin
|
2ee6335328
|
Merge pull request #409 from coralproject/revert-version-pin
Removed the version pin
|
2017-03-20 07:33:00 -07:00 |
|
|
David Erwin
|
ebf675bf2c
|
Merge pull request #405 from coralproject/asset-comment-total-count
Added support for total comment count
|
2017-03-20 07:32:58 -07:00 |
|
|
David Erwin
|
30380ed5d7
|
Merge branch 'master' into asset-comment-total-count
|
2017-03-20 07:32:58 -07:00 |
|
|
David Erwin
|
408a74ad4d
|
Merge pull request #408 from coralproject/widen-notifications
make notifications wider
|
2017-03-20 07:32:57 -07:00 |
|
|
David Erwin
|
fe6e6fbd2f
|
Merge branch 'master' into widen-notifications
|
2017-03-20 07:32:56 -07:00 |
|