From a1a0e351c16c90fadc775826aad9b27f0c39caae Mon Sep 17 00:00:00 2001 From: Steve Heffernan Date: Thu, 12 Jan 2012 12:58:02 -0800 Subject: [PATCH 1/4] Set up zenflow workflow management config. --- .gitignore | 3 ++- .zenflow | 10 ++++++++++ CHANGELOG.md | 7 +++++++ VERSION.yml | 3 +++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .zenflow create mode 100644 CHANGELOG.md create mode 100644 VERSION.yml diff --git a/.gitignore b/.gitignore index 46796ff8f..d31b48e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store dist/* dev.html -projects \ No newline at end of file +projects +.zenflow-log \ No newline at end of file diff --git a/.zenflow b/.zenflow new file mode 100644 index 000000000..8b2409c72 --- /dev/null +++ b/.zenflow @@ -0,0 +1,10 @@ +--- +confirm_review: true +backup_remote: false +release_branch: stable +project: videojs +qa_branch: false +staging_branch: false +development_branch: master +remote: origin +confirm_staging: false diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..7ba07f236 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +-------------------------------------------------------------------------------- + ^ ADD NEW CHANGES ABOVE ^ +-------------------------------------------------------------------------------- + +CHANGELOG +========= + diff --git a/VERSION.yml b/VERSION.yml new file mode 100644 index 000000000..7c86f7f6f --- /dev/null +++ b/VERSION.yml @@ -0,0 +1,3 @@ +major: 3 +minor: 0 +patch: 2 From ee740c619fc24bfc66109acbebf60e0e7ddbb646 Mon Sep 17 00:00:00 2001 From: Steve Heffernan Date: Thu, 12 Jan 2012 13:05:06 -0800 Subject: [PATCH 2/4] Added description of events. --- docs/api.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api.md b/docs/api.md index 2486f7093..032d38735 100644 --- a/docs/api.md +++ b/docs/api.md @@ -226,6 +226,7 @@ You can also remove the listeners later. ### Event Types +List of player events you can add listeners for. From 1d65860227509a2de284d981c7f20b8f22952b4e Mon Sep 17 00:00:00 2001 From: Steve Heffernan Date: Thu, 12 Jan 2012 13:29:23 -0800 Subject: [PATCH 3/4] Bumping version to 3.0.3. --- VERSION.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.yml b/VERSION.yml index 7c86f7f6f..1d064dd08 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,3 +1,4 @@ +--- major: 3 +patch: 3 minor: 0 -patch: 2 From dff355dda9d62ff2c9a0fffe971a2956a5d79511 Mon Sep 17 00:00:00 2001 From: Steve Heffernan Date: Thu, 12 Jan 2012 13:30:59 -0800 Subject: [PATCH 4/4] Adding line to CHANGELOG: Added line to docs to test zenflow --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ba07f236..fc7e9af1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,5 @@ CHANGELOG ========= +---- 3.0.3 / 2012-01-12 / doc-change ------------------------------------------- +* Added line to docs to test zenflow
NameDescription