Branch: refs/heads/v0.13.0
  Home:   https://github.com/PathwayCommons/factoid
  Commit: c1c494f481f4a0b7eba40dc35829b59af9aa2d40
      
https://github.com/PathwayCommons/factoid/commit/c1c494f481f4a0b7eba40dc35829b59af9aa2d40
  Author: Max Franz <[email protected]>
  Date:   2020-09-11 (Fri, 11 Sep 2020)

  Changed paths:

  Log Message:
  -----------
  Merge branch 'master' into release-0.10.0

Use release-0.10.0 as-is

git merge -s ours master


  Commit: 490f28a696524e66d9ccce9c129194d82199c5bc
      
https://github.com/PathwayCommons/factoid/commit/490f28a696524e66d9ccce9c129194d82199c5bc
  Author: Jeffrey <[email protected]>
  Date:   2020-09-11 (Fri, 11 Sep 2020)

  Changed paths:
    M .gitignore
    M README.md
    M docker/docker-compose.yml
    A download/README
    M package-lock.json
    M package.json
    M src/client-env-vars.json
    M src/client/components/editor/help.js
    M src/client/components/element-info/entity-info.js
    M src/client/components/home.js
    M src/client/components/tasks.js
    M src/server/routes/api/document/export.js
    M src/server/routes/api/document/index.js
    M src/server/routes/api/document/indra.js
    M src/styles/carousel.css
    M src/styles/editor/editor.css
    M src/styles/home.css
    A src/styles/image/banner-puzzle-missing.jpg
    A src/styles/image/banner-puzzle.jpg
    A src/styles/image/layer-cake-2.png
    A src/styles/image/logo-horizontal-name-only-black.svg
    A src/styles/image/macbookgrey_front.png
    A src/styles/image/macbookpro15_front.png
    A src/styles/image/phone-explore-1.png
    A src/styles/image/phone-explore-2.png
    A src/styles/image/phone-explore-3.png
    A src/styles/image/sample-editor-screen-fade-to-white.mp4
    M src/styles/tasks.css
    M src/styles/vars.css

  Log Message:
  -----------
  Merge pull request #826 from PathwayCommons/release-0.10.0

Release 0.10.0


  Commit: 1c582583387fd56d972301bb9a82a8be81806225
      
https://github.com/PathwayCommons/factoid/commit/1c582583387fd56d972301bb9a82a8be81806225
  Author: Jeffrey <[email protected]>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M package-lock.json
    M package.json
    M src/client/components/carousel.js
    M src/client/components/element-info/entity-info.js
    M src/client/components/home.js
    M src/client/defs.js
    M src/model/document/document.js
    M src/server/routes/api/document/export.js
    M src/server/routes/api/document/index.js
    M src/styles/base.css
    M src/styles/carousel.css
    M src/styles/home.css
    A src/styles/image/banner.png
    A src/styles/image/sample-editor-screen-ras-raf.mp4

  Log Message:
  -----------
  Merge pull request #835 from PathwayCommons/v0.10.1-release

V0.10.1 release


  Commit: eef3d919966fe6893c3b007c6b0a229b2b94dcc5
      
https://github.com/PathwayCommons/factoid/commit/eef3d919966fe6893c3b007c6b0a229b2b94dcc5
  Author: Jeffrey <[email protected]>
  Date:   2020-10-05 (Mon, 05 Oct 2020)

  Changed paths:
    M package-lock.json
    M package.json
    M src/client/components/carousel.js
    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/tasks.js
    M src/model/document/document.js
    M src/model/element/interaction-type/binding.js
    M src/server/routes/api/document/export.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/update.js
    M src/server/routes/index.js
    A src/server/sitemap.js
    M src/styles/document-management.css
    R src/styles/image/card-banner.jpg
    A src/styles/image/card-banner.png
    M src/util/pubmed.js
    M src/views/index.html.ejs
    M test/pubmed/fetchPubmed.js
    A test/sitemap/docs2Sitemap.js
    A test/sitemap/docsData.json

  Log Message:
  -----------
  Merge pull request #856 from PathwayCommons/v0.11.0

Version 0.11.0


  Commit: 8fdabfd4699a8fbfcba8bc4855605da299148b88
      
https://github.com/PathwayCommons/factoid/commit/8fdabfd4699a8fbfcba8bc4855605da299148b88
  Author: Jeffrey <[email protected]>
  Date:   2020-10-13 (Tue, 13 Oct 2020)

  Changed paths:
    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/submit.js
    M src/client/components/element-info/entity-info.js
    M src/client/components/tasks.js
    M src/client/index.js
    M src/client/polyfills.js
    M src/model/document/document.js
    M src/model/element/element.js
    M src/model/element/entity.js
    M src/model/organism.js
    M src/server/routes/api/document/index.js
    M src/server/routes/api/document/indra.js
    M src/styles/carousel.css
    M src/styles/document-management.css
    M src/styles/tasks.css

  Log Message:
  -----------
  Merge pull request #872 from PathwayCommons/v0.12.0

V0.12.0


  Commit: 7c1ade50d2df87b91433501ada6d028b7cd6530e
      
https://github.com/PathwayCommons/factoid/commit/7c1ade50d2df87b91433501ada6d028b7cd6530e
  Author: Jeffrey <[email protected]>
  Date:   2020-10-14 (Wed, 14 Oct 2020)

  Changed paths:
    M Dockerfile
    M entrypoint.sh
    M package-lock.json
    M package.json

  Log Message:
  -----------
  Merge pull request #877 from PathwayCommons/v0.12.2

V0.12.2


  Commit: fc71c85eed915fc8b28a702ad2790e745b110586
      
https://github.com/PathwayCommons/factoid/commit/fc71c85eed915fc8b28a702ad2790e745b110586
  Author: Max Franz <[email protected]>
  Date:   2020-11-20 (Fri, 20 Nov 2020)

  Changed paths:

  Log Message:
  -----------
  Merge master and 0.13 branches together for a clean merge

git merge -s ours master


Compare: 
https://github.com/PathwayCommons/factoid/compare/5863744cee5f...fc71c85eed91

-- 
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/v0.13.0/586374-fc71c8%40github.com.

Reply via email to