[galaxyproject/galaxy] 128a31: Use OSX-compatible sed syntax
Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 128a3174ebc425dfe750767eef40374d0b282448 https://github.com/galaxyproject/galaxy/commit/128a3174ebc425dfe750767eef403... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/Makefile Log Message: ----------- Use OSX-compatible sed syntax Commit: 3e0e96657d765f4023bb6801ace2e96a1ffc4505 https://github.com/galaxyproject/galaxy/commit/3e0e96657d765f4023bb6801ace2e... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/admin/index.rst M doc/source/admin/webhooks.rst M doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst Log Message: ----------- add work on release notes 16.10, improve docs for webhooks Conflicts: doc/source/releases/16.10.rst doc/source/releases/16.10_announce.rst Commit: 739fb59cba5b7747a32e685a3632f96effad4c11 https://github.com/galaxyproject/galaxy/commit/739fb59cba5b7747a32e685a3632f... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/admin/webhooks.rst Log Message: ----------- fix the fix Commit: 5784a838a554f8dcf9e132e26be01240a37a3e65 https://github.com/galaxyproject/galaxy/commit/5784a838a554f8dcf9e132e26be01... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/releases/16.10.rst Log Message: ----------- fix bad merge Commit: 83de83e7edc230d7f9841a6d9770d87d0c89d06f https://github.com/galaxyproject/galaxy/commit/83de83e7edc230d7f9841a6d9770d... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/admin/index.rst M doc/source/admin/webhooks.rst M doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst Log Message: ----------- Merge pull request #3282 from martenson/release_16.10 [16.10] work on release notes 16.10 Commit: e3fbbc52b999f9e25e7b02c4edf44ddd43a63622 https://github.com/galaxyproject/galaxy/commit/e3fbbc52b999f9e25e7b02c4edf44... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M doc/source/releases/16.10_announce.rst Log Message: ----------- add small touches to release notes Commit: c01e25ddf8854e20a96040b3c8616136ec517574 https://github.com/galaxyproject/galaxy/commit/c01e25ddf8854e20a96040b3c8616... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M doc/source/releases/16.10_announce.rst Log Message: ----------- missing articles Commit: 2cbf9a9138b6fb89d06f41398539908a5df4585e https://github.com/galaxyproject/galaxy/commit/2cbf9a9138b6fb89d06f413985399... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M doc/source/releases/16.10_announce.rst Log Message: ----------- Merge pull request #3284 from martenson/notes-tinies [16.10] add small touches to release notes Commit: 13ae374f84926e71b3dde7080d8d74ad443916e3 https://github.com/galaxyproject/galaxy/commit/13ae374f84926e71b3dde7080d8d7... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M doc/Makefile A doc/fix_schema_rst.sh Log Message: ----------- Move sed commands to a script to resolve interferences with Make which happen only under OSX Commit: ca99753590abf62df2c34e80a87b1ae2ec3424e2 https://github.com/galaxyproject/galaxy/commit/ca99753590abf62df2c34e80a87b1... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M doc/Makefile A doc/fix_schema_rst.sh Log Message: ----------- Merge pull request #3281 from nsoranzo/release_16.10_fix_doc_Makefile [16.10] Use OSX-compatible sed syntax Commit: 95305a3ee2bfbe4f9a54d7918f37d12735851b9d https://github.com/galaxyproject/galaxy/commit/95305a3ee2bfbe4f9a54d7918f37d... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M doc/Makefile A doc/fix_schema_rst.sh M doc/source/admin/index.rst M doc/source/admin/webhooks.rst M doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst Log Message: ----------- Merge branch 'release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/d478cc41a673...95305a3ee2bf
participants (1)
-
GitHub