Skip to content

Commit ac7de05

Browse files
dan335dan335
committed
attempt to upgrade meteor
1 parent 7e1f6b4 commit ac7de05

File tree

53 files changed

+173
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+173
-190
lines changed

‎.meteor/.finished-upgraders

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ notices-for-facebook-graph-api-2
1717
1.5-add-dynamic-import-package
1818
1.6.2-split-underscore-from-meteor-base
1919
1.7-split-underscore-from-meteor-base
20+
1.8.3-split-jquery-from-blaze

‎.meteor/packages

+21-22
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
[email protected]
77
less
8-
random@1.1.0
9-
accounts-password
10-
email@1.2.3
11-
accounts-ui
8+
random@1.2.0
9+
accounts-password@2.2.0
10+
email@2.2.0
11+
accounts-ui@1.4.2
1212
danimal:accounts-templates
1313
danimal:hx
1414
[email protected]
1515
[email protected]
1616
momentjs:moment
1717
fortawesome:fontawesome
1818
danimal:readymanager
19-
accounts-google
20-
accounts-facebook
19+
accounts-google@1.4.0
20+
accounts-facebook@1.3.3
2121
[email protected]
2222
d3js:d3
2323
mrgalaxy:stripe
@@ -34,22 +34,22 @@ dominus-villages
3434
danimal:checkvalidnumber
3535
dominus-init
3636
dominus-armies
37-
meteor-base@1.4.0
38-
mobile-experience@1.0.5
39-
mongo@1.6.0-rc171.0
37+
meteor-base@1.5.1
38+
mobile-experience@1.1.0
39+
mongo@1.14.0
4040
[email protected]
41-
session@1.1.8
41+
session@1.2.0
4242
[email protected]
43-
logging@1.1.20
44-
reload@1.2.0
45-
[email protected].0
43+
logging@1.3.1
44+
reload@1.3.1
45+
[email protected].1
4646
[email protected]
4747
[email protected]
4848
danimal:mapmover
4949
dominus-hexmap
50-
ecmascript@0.12.0-rc171.0
50+
ecmascript@0.16.1
5151
ecmascript-collections
52-
promise@0.11.1
52+
promise@0.12.0
5353
[email protected]
5454
dominus-market
5555
dominus-manager
@@ -74,17 +74,16 @@ forum-ui-dominus
7474
forum-base
7575
danimal:userpresence
7676
dominus-popups
77-
meteorhacks:sikka
7877
dominus-battles-ui
7978
dominus-panel-rankings
8079
dominus-queue
81-
standard-minifier-css@1.4.1
82-
standard-minifier-js@2.4.0-rc171.0
83-
huttonr:bootstrap3
84-
shell-server@0.3.1
80+
standard-minifier-css@1.7.4
81+
standard-minifier-js@2.8.0
82+
huttonr:bootstrap3@3.3.6_13
83+
shell-server@0.5.0
8584
dominus-help
8685
dominus-rankings
8786
dominus-battles
88-
[email protected].2-rc171.0
89-
[email protected].1-rc171.0
87+
[email protected].3
88+
[email protected].3
9089
meteorhacks:picker

‎.meteor/release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.7.1-rc.0
1+
METEOR@2.6

‎.meteor/versions

+86-90
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
1-
accounts-base@1.4.3-rc171.0
2-
[email protected].2-rc171.0
3-
accounts-google@1.3.2-rc171.0
4-
accounts-oauth@1.1.16-rc171.0
5-
accounts-password@1.5.1
6-
accounts-ui@1.3.1-rc171.0
7-
accounts-ui-unstyled@1.4.1
1+
accounts-base@2.2.1
2+
[email protected].3
3+
accounts-google@1.4.0
4+
accounts-oauth@1.4.0
5+
accounts-password@2.2.0
6+
accounts-ui@1.4.2
7+
accounts-ui-unstyled@1.6.0
88
aldeed:[email protected]
9-
[email protected].0
10-
autoupdate@1.5.0-rc171.0
11-
babel-compiler@7.2.0-rc171.0
12-
babel-runtime@1.3.0-rc171.0
13-
[email protected].11
14-
[email protected]-rc171.0
15-
blaze@2.3.3
16-
blaze-html-templates@1.1.2
17-
blaze-tools@1.0.10
18-
boilerplate-generator@1.6.0-rc171.0
19-
[email protected].0-rc171.0
20-
caching-html-compiler@1.1.3
21-
callback-hook@1.1.0
9+
[email protected].1
10+
autoupdate@1.8.0
11+
babel-compiler@7.8.0
12+
babel-runtime@1.5.0
13+
[email protected].12
14+
[email protected]
15+
blaze@2.5.0
16+
blaze-html-templates@1.2.1
17+
blaze-tools@1.1.2
18+
boilerplate-generator@1.7.1
19+
[email protected].2
20+
caching-html-compiler@1.2.0
21+
callback-hook@1.4.0
2222
[email protected]
2323
chipcastledotcom:[email protected]
24-
chuangbo:[email protected]
2524
chuangbo:[email protected]_1
2625
classcraft:[email protected]
2726
d3js:[email protected]
28-
danimal:[email protected].7
27+
danimal:[email protected].8
2928
danimal:[email protected]
3029
danimal:[email protected]
3130
danimal:[email protected]
3231
danimal:[email protected]
3332
danimal:[email protected]
3433
danimal:[email protected]
3534
[email protected]
36-
ddp-client@2.3.3
35+
ddp-client@2.5.0
3736
[email protected]
38-
ddp-rate-limiter@1.0.7
39-
ddp-server@2.2.0
37+
ddp-rate-limiter@1.1.0
38+
ddp-server@2.5.0
4039
[email protected]
41-
[email protected].0
40+
[email protected].1
4241
[email protected]
4342
[email protected]
4443
[email protected]
@@ -70,100 +69,97 @@ [email protected]
7069
[email protected]
7170
[email protected]
7271
[email protected]
73-
dynamic-import@0.5.0-rc171.0
74-
ecmascript@0.12.0-rc171.0
72+
dynamic-import@0.7.2
73+
ecmascript@0.16.1
7574
[email protected]
76-
ecmascript-runtime@0.7.0
77-
ecmascript-runtime-client@0.8.0-rc171.0
78-
ecmascript-runtime-server@0.7.1
79-
[email protected].0
80-
email@1.2.3
75+
ecmascript-runtime@0.8.0
76+
ecmascript-runtime-client@0.12.1
77+
ecmascript-runtime-server@0.11.0
78+
[email protected].1
79+
email@2.2.0
8180
[email protected]
82-
[email protected].2-rc171.0
83-
facebook-oauth@1.5.0
81+
[email protected].3
82+
facebook-oauth@1.10.0
8483
[email protected]
8584
[email protected]
86-
[email protected].0
85+
[email protected].1
8786
fongandrew:[email protected]
8887
fortawesome:[email protected]
8988
[email protected]
9089
[email protected]
9190
[email protected]
92-
[email protected].1-rc171.0
93-
google-oauth@1.2.6-rc171.0
91+
[email protected].3
92+
google-oauth@1.4.1
9493
[email protected]
95-
html-tools@1.0.11
96-
htmljs@1.0.11
97-
[email protected].1
94+
html-tools@1.1.2
95+
htmljs@1.1.1
96+
[email protected].4
9897
huttonr:[email protected]_13
9998
huttonr:[email protected]_3
100-
[email protected].0
101-
[email protected].0-rc171.0
99+
[email protected].1
100+
[email protected].1
102101
[email protected]
103-
[email protected]
104-
[email protected]
105-
[email protected]
102+
[email protected]
103+
[email protected]
106104
[email protected]
107-
logging@1.1.20
108-
[email protected].12
105+
logging@1.3.1
106+
[email protected].14
109107
mdg:[email protected]
110108
mdg:[email protected]
111-
meteor@1.9.2
112-
meteor-base@1.4.0
109+
meteor@1.10.0
110+
meteor-base@1.5.1
113111
meteorhacks:[email protected]
114112
meteorhacks:[email protected]
115-
meteorhacks:[email protected]
116113
meteorhacks:[email protected]
117-
minifier-css@1.3.1
118-
minifier-js@2.4.0-rc171.0
119-
minimongo@1.4.4
120-
mobile-experience@1.0.5
121-
mobile-status-bar@1.0.14
122-
[email protected].2
123-
modules@0.13.0-rc171.0
124-
modules-runtime@0.10.2
125-
momentjs:moment@2.22.2
126-
mongo@1.6.0-rc171.0
127-
[email protected].0
114+
minifier-css@1.6.0
115+
minifier-js@2.7.3
116+
minimongo@1.8.0
117+
mobile-experience@1.1.0
118+
mobile-status-bar@1.1.0
119+
[email protected].7
120+
modules@0.18.0
121+
modules-runtime@0.12.0
122+
momentjs:moment@2.29.1
123+
mongo@1.14.5
124+
[email protected].2
128125
[email protected]
129-
[email protected].7
126+
[email protected].8
130127
mrgalaxy:[email protected]
131-
[email protected]
132-
[email protected]
133-
[email protected]
134-
[email protected]
135-
[email protected]
136-
okgrow:[email protected]
128+
[email protected]
129+
[email protected]
130+
[email protected]
131+
[email protected]
132+
okgrow:[email protected]
137133
[email protected]
138134
percolate:[email protected]
139-
promise@0.11.1
140-
random@1.1.0
135+
promise@0.12.0
136+
random@1.2.0
141137
[email protected]
142-
[email protected]
138+
[email protected]
139+
[email protected]
143140
[email protected]
144-
reload@1.2.0
141+
reload@1.3.1
145142
[email protected]
146143
risul:[email protected]
147-
[email protected].0-rc171.0
148-
service-configuration@1.0.11
149-
session@1.1.8
144+
[email protected].1
145+
service-configuration@1.3.0
146+
session@1.2.0
150147
[email protected]
151-
[email protected]
152-
[email protected]
153-
[email protected]
154-
[email protected]
155-
[email protected]
156-
[email protected]
157-
[email protected]
148+
[email protected]
149+
[email protected]
150+
[email protected]
151+
[email protected]
152+
[email protected]
153+
[email protected]
158154
steeve:[email protected]
159-
templating@1.3.2
160-
templating-compiler@1.3.3
161-
templating-runtime@1.3.2
162-
templating-tools@1.1.2
155+
templating@1.4.1
156+
templating-compiler@1.4.1
157+
templating-runtime@1.5.0
158+
templating-tools@1.2.0
163159
[email protected]
164160
[email protected]
165161
[email protected]
166-
url@1.2.0
167-
webapp@1.7.0-rc171.0
168-
webapp-hashing@1.0.9
162+
url@1.3.2
163+
webapp@1.13.0
164+
webapp-hashing@1.1.0
169165
wizonesolutions:[email protected]

‎game/miscTemplates/welcome_screen/methods.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Meteor.methods({
22
hide_welcome_screen: function(gameId) {
3-
this.unblock();
3+
//this.unblock();
44
let find = {gameId:gameId, userId:this.userId};
55
Players.update(find, {$set: {show_welcome_screen: false}})
66
}

‎package-lock.json

+4-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"dependencies": {
77
"@babel/runtime": "^7.9.6",
88
"@sendgrid/mail": "^6.5.5",
9-
"bcrypt": "^0.8.7",
109
"core-js": "^2.5.3",
1110
"d3": "^3.5.17",
1211
"jquery": "^2.2.4",
1312
"moment": "^2.18.1",
13+
"node-bcrypt": "0.0.1",
1414
"svgexport": "^0.3.2"
1515
},
1616
"devDependencies": {},

‎packages/bootstrap3

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 64a6a885a19272c7e7656e7b48bd1daec2e91b9b

‎packages/dominus-admin/package.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Package.describe({
77
});
88

99
Package.onUse(function(api) {
10-
api.versionsFrom('1.2.1');
10+
//api.versionsFrom('1.2.1');
1111
api.use([
1212
'blaze-html-templates',
1313
'less',

0 commit comments

Comments
 (0)