Branch: refs/heads/unstable
  Home:   https://github.com/PathwayCommons/factoid
  Commit: 0eb5a30da7d2d83cea1094919f439343c6437625
      
https://github.com/PathwayCommons/factoid/commit/0eb5a30da7d2d83cea1094919f439343c6437625
  Author: Max Franz <[email protected]>
  Date:   2019-06-11 (Tue, 11 Jun 2019)

  Changed paths:
    M package-lock.json
    M package.json

  Log Message:
  -----------
  0.5.0


  Commit: 2b0f95904bdfc6b7db4566895e8334920620afcd
      
https://github.com/PathwayCommons/factoid/commit/2b0f95904bdfc6b7db4566895e8334920620afcd
  Author: Jeffrey <[email protected]>
  Date:   2019-06-11 (Tue, 11 Jun 2019)

  Changed paths:
    M Dockerfile
    M README.md
    M ci.sh
    A docker/.env
    A docker/backup_volumes.sh
    A docker/docker-compose.yml
    A docker/restore_volumes.sh
    M package-lock.json
    M package.json
    M public/icon.svg
    R src/client/components/debug-document-seeder.js
    R src/client/components/debug.js
    R src/client/components/demo-input.js
    R src/client/components/document-renamer.js
    M src/client/components/document-seeder-example.js
    M src/client/components/document-seeder.js
    R src/client/components/document-wizard-stepper.js
    M src/client/components/editor/cy/stylesheet.js
    M src/client/components/editor/index.js
    M src/client/components/element-info/entity-assoc-display.js
    M src/client/components/element-info/entity-info.js
    M src/client/components/element-info/interaction-info.js
    R src/client/components/example-document.js
    M src/client/components/highlighter.js
    M src/client/components/home.js
    R src/client/components/interval-highlighter.js
    M src/client/components/main-menu.js
    R src/client/components/my-factoids.js
    R src/client/components/organism-toggle.js
    R src/client/components/reach-interval-highlighter.js
    M src/client/components/tasks.js
    M src/client/router.js
    M src/config.js
    M src/model/document/document.js
    M src/model/element/entity.js
    M src/model/element/interaction-type/binding.js
    M src/model/element/interaction-type/interaction-type.js
    M src/model/element/interaction-type/interaction.js
    M src/model/element/interaction-type/modification.js
    M src/model/element/interaction-type/transcription-translation.js
    M src/model/organism.js
    M src/server/email-transport.js
    M src/server/index.js
    A src/server/routes/api/document/filters.js
    M src/server/routes/api/document/index.js
    M src/server/routes/api/document/reach.js
    M src/server/routes/api/element-association/aggregate.js
    A src/server/routes/api/element-association/grounding-search.js
    M src/server/routes/api/element-association/index.js
    M src/styles/app.css
    R src/styles/debug-document-seeder.css
    R src/styles/debug.css
    R src/styles/demo-input.css
    R src/styles/document-view-chooser.css
    R src/styles/document-wizard-stepper.css
    M src/styles/editor/editor.css
    R src/styles/example-document.css
    M src/styles/help.css
    M src/styles/home.css
    R src/styles/image/author-workflow.svg
    A src/styles/image/curve-menten.svg
    R src/styles/image/form-option-preview.png
    R src/styles/image/hero-splash-0.png
    R src/styles/image/hero-splash-1.png
    R src/styles/image/hero-splash.jpg
    R src/styles/image/how-it-works-detailed.png
    R src/styles/image/how-it-works.png
    A src/styles/image/infographic-authors.svg
    R src/styles/image/infographic-factoid.svg
    R src/styles/image/logo-full.svg
    R src/styles/image/logo-no-slogan.svg
    M src/styles/image/logo.svg
    M src/styles/index.css
    M src/styles/main-menu.css
    R src/styles/my-factoids.css
    R src/styles/organism-toggle.css
    M src/styles/popover/tippy.css
    R src/styles/reach-interval-highlighter.css
    M src/views/index.html
    M test/document.js
    M test/syncher.js

  Log Message:
  -----------
  Merge pull request #501 from PathwayCommons/0.5.0-release

0.5.0 release


  Commit: 17d0a1ede47be0cb26a2650207088db0f58b7edf
      
https://github.com/PathwayCommons/factoid/commit/17d0a1ede47be0cb26a2650207088db0f58b7edf
  Author: Max Franz <[email protected]>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M package-lock.json
    M package.json

  Log Message:
  -----------
  0.5.1


  Commit: e87af79ab471ac974e1ac7986b498d6ca62e7d9e
      
https://github.com/PathwayCommons/factoid/commit/e87af79ab471ac974e1ac7986b498d6ca62e7d9e
  Author: Max Franz <[email protected]>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M docker/.env
    M docker/docker-compose.yml

  Log Message:
  -----------
  Merge origin/unstable into 0.5.1-release


  Commit: 388efb162444972a102bbf86201d2bb6b2c2b349
      
https://github.com/PathwayCommons/factoid/commit/388efb162444972a102bbf86201d2bb6b2c2b349
  Author: Jeffrey <[email protected]>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M docker/.env
    M docker/docker-compose.yml
    M package-lock.json
    M package.json

  Log Message:
  -----------
  Merge pull request #503 from PathwayCommons/0.5.1-release

0.5.1 release


  Commit: 45d83238ac51ffccc4f67d98b1a28684de436e45
      
https://github.com/PathwayCommons/factoid/commit/45d83238ac51ffccc4f67d98b1a28684de436e45
  Author: Max Franz <[email protected]>
  Date:   2020-01-09 (Thu, 09 Jan 2020)

  Changed paths:

  Log Message:
  -----------
  Merge branch 'merge-master-0.6.0' into unstable


  Commit: a82288b0c42bf7e6bcd61b5b7a108ff390262155
      
https://github.com/PathwayCommons/factoid/commit/a82288b0c42bf7e6bcd61b5b7a108ff390262155
  Author: Jeffrey <[email protected]>
  Date:   2020-01-09 (Thu, 09 Jan 2020)

  Changed paths:
    M .eslintrc.json
    M .nvmrc
    M .stylelintrc.json
    M .travis.yml
    M Dockerfile
    M README.md
    M ci.sh
    M docker/.env
    A docker/Dockerfile-rethinkdb
    R docker/backup_volumes.sh
    A docker/cron-database-dump.sh
    M docker/docker-compose.yml
    A docker/dump_rethinkdb.sh
    A docker/restore_rethinkdb.sh
    R docker/restore_volumes.sh
    A entrypoint.sh
    M package-lock.json
    M package.json
    A private/res/banner-bottom-black.jpg
    A private/res/banner.jpg
    R private/res/icon.idraw
    R private/res/icon.svg
    A private/res/icon_biofactoid_circle.svg
    A private/res/icon_biofactoid_filled.svg
    A private/res/icon_biofactoid_outline.svg
    R private/res/infographic-factoid.idraw
    A private/res/logo-horizontal-with-text.svg
    A private/res/logo-no-tagline.svg
    A private/res/logos.pdf
    A private/res/logos.svg
    A private/res/shield_harvard.png
    A private/res/shield_ohsu.png
    A private/res/shield_uoft.png
    R public/icon.png
    R public/icon.svg
    A src/client-env-vars.json
    M src/client/client-util/file.js
    M src/client/client-util/index.js
    M src/client/components/animate.js
    M src/client/components/copy-field.js
    M src/client/components/data-component.js
    M src/client/components/dirty-component.js
    M src/client/components/document-linkout.js
    A src/client/components/document-management-components.js
    A src/client/components/document-management.js
    M src/client/components/document-seeder-example.js
    M src/client/components/document-seeder.js
    M src/client/components/editor/buttons.js
    M src/client/components/editor/cy/automove.js
    A src/client/components/editor/cy/compound-dnd.js
    M src/client/components/editor/cy/cxtmenu.js
    M src/client/components/editor/cy/defs.js
    M src/client/components/editor/cy/doc.js
    M src/client/components/editor/cy/edgehandles.js
    M src/client/components/editor/cy/index.js
    M src/client/components/editor/cy/layout.js
    M src/client/components/editor/cy/on-key.js
    M src/client/components/editor/cy/stylesheet.js
    M src/client/components/editor/cy/tippy.js
    M src/client/components/editor/cy/viewport.js
    M src/client/components/editor/defs.js
    R src/client/components/editor/help.js
    M src/client/components/editor/index.js
    M src/client/components/editor/undo-remove.js
    M src/client/components/element-info/chemical-formula.js
    M src/client/components/element-info/element-info.js
    M src/client/components/element-info/entity-assoc-display.js
    M src/client/components/element-info/entity-info.js
    M src/client/components/element-info/interaction-info.js
    M src/client/components/element-info/participant-info.js
    M src/client/components/element-info/progression-stepper.js
    M src/client/components/element-info/progression.js
    R src/client/components/form-editor/entity-form.js
    R src/client/components/form-editor/index.js
    R src/client/components/form-editor/interaction-form.js
    M src/client/components/highlighter.js
    M src/client/components/home.js
    M src/client/components/main-menu.js
    M src/client/components/notification/base.js
    M src/client/components/notification/corner.js
    M src/client/components/notification/index.js
    M src/client/components/notification/inline.js
    M src/client/components/notification/list.js
    M src/client/components/notification/notification.js
    M src/client/components/notification/panel.js
    M src/client/components/notification/popover.js
    M src/client/components/page-not-found.js
    M src/client/components/popover/popover.js
    M src/client/components/popover/tooltip.js
    A src/client/components/share.js
    R src/client/components/tasks.js
    M src/client/components/toggle.js
    M src/client/debug.js
    M src/client/defs.js
    M src/client/index.js
    M src/client/logger.js
    M src/client/polyfills.js
    M src/client/router.js
    M src/config.js
    M src/model/document/document.js
    M src/model/document/index.js
    M src/model/element-cache.js
    M src/model/element-set.js
    A src/model/element/complex.js
    M src/model/element/element-type.js
    M src/model/element/element.js
    M src/model/element/entity-type.js
    M src/model/element/entity.js
    M src/model/element/factory.js
    M src/model/element/index.js
    M src/model/element/interaction-type/binding.js
    M src/model/element/interaction-type/biopax-type.js
    M src/model/element/interaction-type/demethylation.js
    M src/model/element/interaction-type/dephosphorylation.js
    M src/model/element/interaction-type/deubiquitination.js
    M src/model/element/interaction-type/enum.js
    M src/model/element/interaction-type/index.js
    M src/model/element/interaction-type/interaction-type.js
    M src/model/element/interaction-type/interaction.js
    M src/model/element/interaction-type/methylation.js
    M src/model/element/interaction-type/modification.js
    M src/model/element/interaction-type/phosphorylation.js
    M src/model/element/interaction-type/transcription-translation.js
    M src/model/element/interaction-type/ubiquitination.js
    M src/model/element/interaction.js
    M src/model/element/participant-type.js
    M src/model/empty-element-cache.js
    M src/model/event-emitter-mixin.js
    M src/model/organism.js
    M src/model/syncher.js
    M src/server/db.js
    M src/server/email-transport.js
    M src/server/index.js
    M src/server/logger.js
    M src/server/routes/api/document/filters.js
    M src/server/routes/api/document/index.js
    M src/server/routes/api/document/null.js
    A src/server/routes/api/document/pubmed/demoPubmedArticle.js
    A src/server/routes/api/document/pubmed/fetchPubmed.js
    A src/server/routes/api/document/pubmed/index.js
    A src/server/routes/api/document/pubmed/searchPubmed.js
    M src/server/routes/api/document/reach.js
    R src/server/routes/api/element-association/aggregate.js
    R src/server/routes/api/element-association/chebi.js
    M src/server/routes/api/element-association/grounding-search.js
    M src/server/routes/api/element-association/index.js
    M src/server/routes/api/element-association/pc.js
    R src/server/routes/api/element-association/pubchem.js
    R src/server/routes/api/element-association/search-string-conversion.js
    R src/server/routes/api/element-association/uniprot.js
    M src/server/routes/api/index.js
    M src/server/routes/index.js
    M src/server/routes/socket.io.js
    M src/server/routes/style-demo.js
    M src/styles/base.css
    M src/styles/custom-icons.css
    A src/styles/document-management.css
    R src/styles/document-renamer.css
    M src/styles/editor/editor.css
    M src/styles/editor/undo-remove.css
    M src/styles/element-info/entity-info.css
    M src/styles/element-info/interaction-info.css
    M src/styles/help.css
    M src/styles/home.css
    A src/styles/image/banner.jpg
    A src/styles/image/card-banner.jpg
    R src/styles/image/curve-menten.svg
    A src/styles/image/example-doc-1.png
    A src/styles/image/example-doc-2.png
    A src/styles/image/home-figure-1.jpg
    A src/styles/image/home-figure-2.jpg
    A src/styles/image/home-figure-3.jpg
    A src/styles/image/icon-twitter-white.svg
    A src/styles/image/icon-twitter.svg
    R src/styles/image/infographic-authors.svg
    A src/styles/image/logo-horizontal-no-text.svg
    A src/styles/image/logo-horizontal-text-only-white.svg
    A src/styles/image/logo-horizontal-text-only-yellow.svg
    A src/styles/image/logo-horizontal-text-only.svg
    A src/styles/image/logo-horizontal-with-text.svg
    A src/styles/image/logo-no-circle.svg
    A src/styles/image/logo.png
    M src/styles/image/logo.svg
    A src/styles/image/mol-cell-logo.svg
    R src/styles/image/network-option-preview.png
    R src/styles/image/steps-figure.svg
    A src/styles/image/uni-logos.png
    A src/styles/image/welcome-aboard-1.svg
    A src/styles/image/welcome-aboard-2.svg
    A src/styles/image/welcome-aboard-3.svg
    R src/styles/image/workflow-detailed.svg
    M src/styles/index.css
    M src/styles/main-menu.css
    A src/styles/share.css
    R src/styles/tasks.css
    M src/styles/vars.css
    M src/util/assert.js
    M src/util/cache.js
    M src/util/cy.js
    M src/util/dom.js
    A src/util/email.js
    M src/util/index.js
    M src/util/is.js
    M src/util/memoize.js
    M src/util/obj.js
    M src/util/promise.js
    A src/util/pubmed.js
    M src/util/strings.js
    R src/views/index.html
    A src/views/index.html.ejs
    M test/document.js
    M test/element.js
    M test/entity.js
    M test/interaction.js
    M test/mock/cache.js
    M test/mock/socket.js
    A test/pubmed/fetchPubmed.js
    A test/pubmed/pmid_29440426.xml
    A test/pubmed/pmid_30078747.xml
    A test/pubmed/pmid_30115697.xml
    A test/pubmed/pmid_31511694.xml
    A test/pubmed/pmid_9417067.xml
    A test/pubmed/searchPubmed.js
    A test/pubmed/searchPubmedData.js
    M test/syncher.js
    M test/util/conf.js
    M test/util/socket-io.js
    M test/util/table.js
    M test/util/when.js
    M webpack.config.js

  Log Message:
  -----------
  Merge pull request #608 from PathwayCommons/merge-master-0.6.0

Merge unstable into master for 0.6.0


  Commit: 868bc81496bbbe29f909553868fe39bcbb0cf0f4
      
https://github.com/PathwayCommons/factoid/commit/868bc81496bbbe29f909553868fe39bcbb0cf0f4
  Author: Max Franz <[email protected]>
  Date:   2020-02-25 (Tue, 25 Feb 2020)

  Changed paths:
    M src/client/components/home.js

  Log Message:
  -----------
  lint


  Commit: 5b001c07688994868c12085d0bbea521837fbb5b
      
https://github.com/PathwayCommons/factoid/commit/5b001c07688994868c12085d0bbea521837fbb5b
  Author: Max Franz <[email protected]>
  Date:   2020-02-25 (Tue, 25 Feb 2020)

  Changed paths:
    M package-lock.json
    M package.json

  Log Message:
  -----------
  0.7.0


  Commit: 8d1ed98c5eb1eb1182c09258ee635cf516c491a2
      
https://github.com/PathwayCommons/factoid/commit/8d1ed98c5eb1eb1182c09258ee635cf516c491a2
  Author: Jeffrey <[email protected]>
  Date:   2020-02-25 (Tue, 25 Feb 2020)

  Changed paths:
    M README.md
    M package-lock.json
    M package.json
    M src/client/components/document-management-components.js
    M src/client/components/document-management.js
    M src/client/components/editor/index.js
    M src/client/components/home.js
    A src/client/components/tasks.js
    M src/config.js
    M src/model/document/document.js
    M src/server/index.js
    M src/server/routes/api/document/index.js
    M src/server/routes/api/document/pubmed/fetchPubmed.js
    M src/server/routes/api/document/pubmed/index.js
    M src/server/routes/api/document/pubmed/searchPubmed.js
    M src/server/routes/index.js
    M src/styles/animations.css
    M src/styles/base.css
    M src/styles/document-management.css
    M src/styles/editor/editor.css
    M src/styles/help.css
    M src/styles/home.css
    M src/styles/image/banner.jpg
    M src/styles/image/home-figure-1.jpg
    A src/styles/image/logo-horizontal-name-only-white.svg
    A src/styles/image/uni-logos-bw.png
    M src/styles/image/welcome-aboard-3.svg
    A src/styles/image/welcome-aboard-4.svg
    M src/styles/index.css
    A src/styles/tasks.css
    M src/util/email.js
    M src/util/pubmed.js
    A src/views/404.ejs
    R src/views/404.html
    M test/pubmed/fetchPubmed.js

  Log Message:
  -----------
  Merge pull request #644 from PathwayCommons/v0.7.0-release

V0.7.0 release


  Commit: f7b1d4cf02b2e9f89946a00595c0541e6c8a19d5
      
https://github.com/PathwayCommons/factoid/commit/f7b1d4cf02b2e9f89946a00595c0541e6c8a19d5
  Author: Max Franz <[email protected]>
  Date:   2020-03-26 (Thu, 26 Mar 2020)

  Changed paths:

  Log Message:
  -----------
  Merge unstable and master together for 0.8.0

Ref : Tag & release 0.8.0: patch release for next steps with Mol. Cell #695

Merge branch 'master' into unstable

git merge -s ours master


Compare: 
https://github.com/PathwayCommons/factoid/compare/eabe3be3fc43...f7b1d4cf02b2

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/cytoscape-cvs/PathwayCommons/factoid/push/refs/heads/unstable/eabe3b-f7b1d4%40github.com.

Reply via email to