소스 검색

Merge branch 'develop' of https://github.com/opensheetmusicdisplay/opensheetmusicdisplay into develop

Matthias 8 년 전
부모
커밋
6ebb07a8e9
6개의 변경된 파일107개의 추가작업 그리고 50개의 파일을 삭제
  1. 4 0
      .gitignore
  2. 11 1
      .travis.yml
  3. 0 48
      CHANGELOG
  4. 89 0
      CHANGELOG.md
  5. BIN
      bin/gh_pages_deploy_key.enc
  6. 3 1
      package.json

+ 4 - 0
.gitignore

@@ -56,3 +56,7 @@ typings
 .idea/encodings.xml
 *.md
 node_modules/
+
+# Private key for GH pages deploy
+bin/gh_pages_deploy_key
+bin/gh_pages_deploy_key.pub

+ 11 - 1
.travis.yml

@@ -7,6 +7,7 @@ notifications:
   slack:
     secure: ZLC7oJ5BcdVfLX+R7Bg6NUaFrrOG5heX9t8lpCZAWtHG4Uag/z5hCAtr/pfdaoEZ4AFJ7SS0yubE3EltwoXdx/zeGlF7gV5JxjDtDyNpkqFa38XTSorP/0FYjaahecFnxUYG2oNQWTcnyeE6BMak+RQ4+ciLC1dQrzC84FNE4R28tV5SVwgM+O1JAFg67Z2Xu497tNuLG6aptyRAov6G0mo9e1oLW4apuiV4CnV+p2nMYbLEyHT5TJiQ8/c7ar7jM7Ia8bL6WGHGjOmEmy71DyWWQXBlE+RSS8uBRlF7BvGX7/fleCUa4jE5ieP+IKCENfa+9+SCE6i8YEAc8Wyfqdl/f5A7NqPDNYxWxU1w8iSM4/FJn6hJKJ3vnogAdQUlPtNYssMio2U06bkvtZ+hu961f6qcGaR10fcX8EHi1UwFDHQ+9uha+9U5vF/+EQHXAG5WGSKrpbH3CFypdJ8g3U1eW5qJn76W9Um4COSj26KI+pBTD9gZwaZCmDas0g2bECIClUKK4y1utsYf/KiJcJaIOEE+QvFNyhuXwdAmTFi8OZ784yrbXmpQZqol2ckgfvWNQZnwqY8h3A8RDhXxvbv6UbNOfE8p/BgJCRaSZAkaqU7b9+D0kSaNIWVPbPad3+Plgkg/gvyC07l8GR5+9tMysz669VQXUs2vzIMIzfA=
 deploy:
+  skip_cleanup: true
   provider: npm
   email: sebastian@haas.tech
   api_key:
@@ -16,4 +17,13 @@ deploy:
     branch: master
     repo: opensheetmusicdisplay/opensheetmusicdisplay
 after_deploy:
-  - ./bin/publish_gh_page.sh
+- eval "$(ssh-agent -s)"
+- chmod 600 bin/gh_pages_deploy_key
+- ssh-add bin/gh_pages_deploy_key
+- git config --global user.email "travis@opensheetmusicdisplay.org"
+- git config --global user.name "travis"
+- chmod +x ./bin/publish_gh_page.sh
+- ./bin/publish_gh_page.sh
+before_install:
+- openssl aes-256-cbc -K $encrypted_170846311824_key -iv $encrypted_170846311824_iv
+  -in bin/gh_pages_deploy_key.enc -out bin/gh_pages_deploy_key -d

+ 0 - 48
CHANGELOG

@@ -1,48 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/) 
-and this project adheres to [Semantic Versioning](http://semver.org/).
-
-## [Unreleased]
-### Added
-- Added ties
-- Added documentation for VexFlow and other graphical objects
-- Proper title display
-- Cursor on first StaffEntry by default
-- Better grunt tasks
-- Included demo for better debugging
-- Added tests for container's width
-- Small fixes for correct x-layouting
-- Support for loading MusicXML files by URL
-- Support for Promises in loading sheet music
-- Better tests for `OSMD`
-
-### Changed
-- Renamed test files according to '_Test' convention
-- Removed workaround for title labels
-- Renamed files to reflect class names
-
-### Bugs
-- Fixed bug in measure number calculation
-- Fixed a bug in calculator
-- Fixed bug with beginInstructionWidth
-- Fixed bug with response HTTP status
-
-## [0.0.1-alpha.1] - 2016-07-15
-### Added
-- Auto resize to window width
-- Preliminary MXL support from URLs
-- Tests for OSMD
-- Implemented a basic cursor object to browse the sheet
-- Public API: Rename `MusicSheetAPI` (renamed to `OSMD`)
-- Fallback title display
-- Better usage of VexFlow measure size
-- Fixed duplicated beams when redrawing
-
-## [0.0.1-alpha.0] - 2016-07-08
-### Added
-- First public pre-release
-
-[Unreleased]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.0.1-alpha.1...HEAD
-[0.0.1-alpha.1]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.0.1-alpha.0...0.0.1-alpha.1

+ 89 - 0
CHANGELOG.md

@@ -0,0 +1,89 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+### Added
+### Changed
+### Bugfixes
+
+## [0.1.0-beta.5] - 2016-09-21
+### Changed
+- Updated Github pages deployment ([645c428](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/645c42874ea1c43f62d163203d2b96aa6667accf))
+
+## [0.1.0-beta.4] - 2016-09-21
+### Changed
+- Updated Github pages deployment ([e5a8771](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/e5a877153f76d32db89c826c0d86b9b3f3c09276))
+
+## [0.1.0-beta.3] - 2016-09-21
+### Changed
+- Updated Github pages deployment ([64a332c](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/64a332c9f75fa60fb74e5f3b9dabb291ed7062e6))
+
+## [0.1.0-beta.2] - 2016-09-21
+### Changed
+- Updated Github pages deploy script ([4ac4dbb](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/4ac4dbbebf578db0eddfbaa64f90091a32e915fb))
+
+## [0.1.0-beta.1] - 2016-09-21
+### Changed
+- Changed Travis CI deploy configuration ([a550e48](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/a550e4899af03564be1e4e4ae420442044390300))
+
+## [0.1.0-beta] - 2016-09-21
+### Added
+- Brace and bracket generation using VexFlow ([fd40c22](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/fd40c22d813279ed714028250625cbbdfd5ad633))
+- Class documentation ([73d319f](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/73d319fb17b4663fcfa001343647b8b662c17cee))
+- OSMD is now usable via script tags  ([091dab9](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/091dab9d82d6c477b7e88de2d424024696d126fa))
+- Set up `loglevel` as logging framework ([c00b5a8](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/c00b5a8ee789ece21bf8e8eb02cfa4f13b498e70))
+- Support for ocatvated clefs ([567b3b3](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/567b3b3ec69fad492da68946039517804567cb25))
+- Demo is now automatically built and published to https://opensheetmusicdisplay.github.io/demo/ ([1c63f82](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/1c63f82ea5c7b0ae978f43cf1cc60675026e4060))
+- Class documentation generated with typedoc, published to https://opensheetmusicdisplay.github.io/ ([bc91091](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/bc91091099f76ea5b9145f674bfcea2f36ca6712))
+- Added ties
+- Added documentation for VexFlow and other graphical objects
+- Proper title display
+- Cursor on first StaffEntry by default
+- Better grunt tasks
+- Included demo for better debugging
+- Added tests for container's width
+- Small fixes for correct x-layouting
+- Support for loading MusicXML files by URL
+- Support for Promises in loading sheet music
+- Better tests for `OSMD`
+
+### Changed
+- Compiled files are no longer under version control ([6b01a8f](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/6b01a8f81b2762dfc702d541442108b459b486f1))
+- Renamed test files according to '_Test' convention
+- Removed workaround for title labels
+- Renamed files to reflect class names
+
+### Bugfixes
+- Measure and clef size fixes ([aa7c96d](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/aa7c96d7bf73be142d44706a3033f4e6f4467e07))
+- MusicXML reader exception due to wrong file encodings ([9af59d6](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/9af59d684a21a6d07609e4a8b72c0d39a9e32e64))
+- Fixed bug in measure number calculation
+- Fixed a bug in calculator
+- Fixed bug with beginInstructionWidth
+- Fixed bug with response HTTP status
+
+## [0.0.1-alpha.1] - 2016-07-15
+### Added
+- Auto resize to window width
+- Preliminary MXL support from URLs
+- Tests for OSMD
+- Implemented a basic cursor object to browse the sheet
+- Public API: Rename `MusicSheetAPI` (renamed to `OSMD`)
+- Fallback title display
+- Better usage of VexFlow measure size
+- Fixed duplicated beams when redrawing
+
+## [0.0.1-alpha.0] - 2016-07-08
+### Added
+- First public pre-release
+
+[Unreleased]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.5...HEAD
+[0.1.0-beta.5]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.4...0.1.0-beta.5
+[0.1.0-beta.4]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.3...0.1.0-beta.4
+[0.1.0-beta.3]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.2...0.1.0-beta.3
+[0.1.0-beta.2]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.1...0.1.0-beta.2
+[0.1.0-beta.1]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta...0.1.0-beta.1
+[0.1.0-beta]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.0.1-alpha.1...0.1.0-beta
+[0.0.1-alpha.1]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.0.1-alpha.0...0.0.1-alpha.1

BIN
bin/gh_pages_deploy_key.enc


+ 3 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensheetmusicdisplay",
-  "version": "0.0.1-alpha.1",
+  "version": "0.1.0-beta.5",
   "description": "An open source JavaScript engine for displaying MusicXML based on VexFlow.",
   "main": "dist/src/OSMD/OSMD.js",
   "typings": "dist/src/OSMD/OSMD",
@@ -12,6 +12,8 @@
   "files": [
     "dist",
     "AUTHORS",
+    "CHANGELOG.md",
+    "README.md",
     "karma.conf.js",
     "src",
     "test",