Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Meteor 1.5.2 #74

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
packages/npm-container/.npm
/node_modules
5 changes: 5 additions & 0 deletions ui/.meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ notices-for-facebook-graph-api-2
1.2.0-meteor-platform-split
1.2.0-cordova-changes
1.2.0-breaking-changes
1.3.0-split-minifiers-package
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
36 changes: 18 additions & 18 deletions ui/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

less
[email protected]
[email protected]
iron:router
jquery
react
jquery@1.11.10
react@15.0.1
react-template-helper
steeve:reactive-cookie
meteorhacks:npm
mizzao:timesync


npm-container
standard-minifiers
meteor-base
mobile-experience
mongo
[email protected]
[email protected]
[email protected]
blaze-html-templates
session
tracker
logging
reload
random
ejson
session@1.1.7
tracker@1.1.3
logging@1.1.17
reload@1.1.11
random@1.0.10
ejson@1.0.14
spacebars
check
check@1.2.5
keypress:keypress
momentjs:moment
twbs:bootstrap
[email protected]
[email protected]
[email protected]
dynamic-import
2 changes: 1 addition & 1 deletion ui/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.2.0.2
METEOR@1.5.2
179 changes: 92 additions & 87 deletions ui/.meteor/versions
Original file line number Diff line number Diff line change
@@ -1,89 +1,94 @@
[email protected]
[email protected]_1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
cosmos:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
[email protected]
keypress:[email protected]
[email protected]
[email protected]_3
[email protected]
[email protected]
[email protected]
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
[email protected]
[email protected]
mizzao:[email protected]
[email protected]
[email protected]
momentjs:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]_1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]_7
[email protected]_7
[email protected]_6
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
mizzao:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
momentjs:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
steeve:[email protected]
[email protected]
[email protected]
[email protected]
twbs:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
tmeasday:[email protected]
[email protected]
twbs:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
18 changes: 18 additions & 0 deletions ui/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"dependencies": {
"babel-runtime": "^6.23.0",
"extend": "^3.0.0",
"meteor-node-stubs": "^0.2.6",
"moment": "^2.18.1",
"react": "^15.4.2",
"react-addons-create-fragment": "^15.4.2",
"react-addons-css-transition-group": "^15.4.2",
"react-addons-linked-state-mixin": "^15.4.2",
"react-addons-perf": "^15.4.2",
"react-addons-pure-render-mixin": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-addons-transition-group": "^15.4.2",
"react-addons-update": "^15.4.2",
"react-dom": "^15.4.2"
}
}
4 changes: 0 additions & 4 deletions ui/packages.json

This file was deleted.

9 changes: 0 additions & 9 deletions ui/packages/npm-container/index.js

This file was deleted.

30 changes: 0 additions & 30 deletions ui/packages/npm-container/package.js

This file was deleted.

5 changes: 2 additions & 3 deletions ui/server/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

extend = Meteor.npmRequire("extend");
moment = Meteor.npmRequire('moment');
import extend from "extend";
import moment from "moment";

TaskAttempts = new Mongo.Collection("task_attempts");

Expand Down