[Commits] [fluid-project/floeproject.org] 7a535a: FLOE-438: Set up for new news item

GitHub noreply at github.com
Mon Nov 16 21:50:25 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/floeproject.org
  Commit: 7a535a89f8d2cba65b395d238bcecc8eeab5ecc6
      https://github.com/fluid-project/floeproject.org/commit/7a535a89f8d2cba65b395d238bcecc8eeab5ecc6
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M index.html
    M news/index.html

  Log Message:
  -----------
  FLOE-438: Set up for new news item


  Commit: 456d46c3687031f2e7e62e451001e02ac5a025a9
      https://github.com/fluid-project/floeproject.org/commit/456d46c3687031f2e7e62e451001e02ac5a025a9
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M index.html
    A news/2015-11-12-phet.html
    M news/index.html

  Log Message:
  -----------
  FLOE-438: Add a news item about the PhET work.


  Commit: 03bb540868b4a2a593c4d818836e60df2d48f5cb
      https://github.com/fluid-project/floeproject.org/commit/03bb540868b4a2a593c4d818836e60df2d48f5cb
  Author: jhung <jhung at ocadu.ca>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M index.html
    A news/2015-11-12-phet.html
    M news/index.html

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLOE-438' into FLOE-438


  Commit: 0ee9c73ac6385ef99b3a9ffa229077add484723b
      https://github.com/fluid-project/floeproject.org/commit/0ee9c73ac6385ef99b3a9ffa229077add484723b
  Author: jhung <jhung at ocadu.ca>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M index.html
    M news/2015-11-12-phet.html

  Log Message:
  -----------
  FLUID-438: updated index and news article.


  Commit: 3d39e13cf77d7564b5f6a93cb71040e55c97bf9f
      https://github.com/fluid-project/floeproject.org/commit/3d39e13cf77d7564b5f6a93cb71040e55c97bf9f
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M index.html

  Log Message:
  -----------
  Merge branch 'master' into FLOE-438


  Commit: fc9372b9e81e38c55854c92dccbd413e3724b1d4
      https://github.com/fluid-project/floeproject.org/commit/fc9372b9e81e38c55854c92dccbd413e3724b1d4
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M index.html
    M news/2015-11-12-phet.html

  Log Message:
  -----------
  Merge remote-tracking branch 'jon/FLOE-438' into FLOE-438


  Commit: d595b4347710c35a7c38fe3a9a9479f85ec0353e
      https://github.com/fluid-project/floeproject.org/commit/d595b4347710c35a7c38fe3a9a9479f85ec0353e
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M index.html
    R news/2015-11-12-phet.html
    A news/2015-11-16-phet.html
    M news/index.html

  Log Message:
  -----------
  FLOE-438: Tweaks to PhET news item


  Commit: 29a11ae1f555961d1976f9f302a66f84d49e3d0b
      https://github.com/fluid-project/floeproject.org/commit/29a11ae1f555961d1976f9f302a66f84d49e3d0b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M index.html
    M news/2014-04-21-metadata-search.html
    M news/2015-11-16-phet.html
    M news/index.html

  Log Message:
  -----------
  FLOE-438: Fix link, other tweaks


  Commit: 9a4f940e4aa7889b96a395ea3a1ea6f1fff9b373
      https://github.com/fluid-project/floeproject.org/commit/9a4f940e4aa7889b96a395ea3a1ea6f1fff9b373
  Author: jhung <jhung at ocadu.ca>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M index.html
    M news/2014-04-21-metadata-search.html
    A news/2015-11-16-phet.html
    M news/index.html

  Log Message:
  -----------
  Merge pull request #38 from acheetham/FLOE-438

FLOE-438: News item about the PhET work


Compare: https://github.com/fluid-project/floeproject.org/compare/0d6d914bc5f3...9a4f940e4aa7


More information about the Commits mailing list