Skip to content

Commit

Permalink
deps: Upgrade and move winchan.js from static/third to npm
Browse files Browse the repository at this point in the history
- Remove `winchan.js` from `static/third` and fetch it from `npm`.
- Upgrade `winchan` to 0.2.0.
- Bump up the `PROVISION_VERSION` to 4.0.

Fixes zulip#1709.

first 4.00
  • Loading branch information
refeed committed Jan 11, 2017
1 parent 49cb9b0 commit 9feebf4
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 278 deletions.
5 changes: 0 additions & 5 deletions docs/THIRDPARTY
Expand Up @@ -196,11 +196,6 @@ Copyright: 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters
License: Expat
Comment: https://github.com/jashkenas/underscore/blob/master/LICENSE

Files: static/third/winchan/*
Copyright: 2012 Lloyd Hilaiel
License: Expat
Comment: https://github.com/mozilla/winchan

Files: static/third/xdate/*
Copyright: 2010 C. F., Wong
License: Expat
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -15,6 +15,7 @@
"jquery-validation": "1.15.1",
"plotly.js": "1.19.2",
"webpack": "1.12.2",
"winchan": "0.2.0",
"zxcvbn": "4.4.1"
},
"devDependencies": {
Expand Down
271 changes: 0 additions & 271 deletions static/third/winchan/winchan.js

This file was deleted.

2 changes: 1 addition & 1 deletion version.py
@@ -1,2 +1,2 @@
ZULIP_VERSION = "1.4.1+git"
PROVISION_VERSION = '3.2'
PROVISION_VERSION = '4.0'
2 changes: 1 addition & 1 deletion zproject/settings.py
Expand Up @@ -768,8 +768,8 @@ def get_secret(key):
'third/lazyload/lazyload.js',
'third/spectrum/spectrum.js',
'third/string-prototype-codepointat/codepointat.js',
'third/winchan/winchan.js',
'third/sockjs/sockjs-0.3.4.js',
'node_modules/winchan/winchan.js',
'third/handlebars/handlebars.runtime.js',
'third/marked/lib/marked.js',
'templates/compiled.js',
Expand Down

0 comments on commit 9feebf4

Please sign in to comment.