Skip to content

Commit 583e3a3

Browse files
authored
Merge pull request #1398 from apinf/develop
Merging develop to master for sprint release 28
2 parents 9bb3e66 + d49d36e commit 583e3a3

File tree

467 files changed

+33267
-46286
lines changed

Some content is hidden

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

467 files changed

+33267
-46286
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.meteor/local
2+
packages/*/.build*
3+
packages/*/.npm*

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@ settings.json
66
.idea/
77
uploads/
88
mup.json
9+
docker/api-umbrella/config/api-umbrella.yml
10+
docker/apinf/env
11+
docker/ssl/env
12+
node_modules/
13+
packages
914
node_modules

.meteor/.finished-upgraders

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ notices-for-facebook-graph-api-2
1010
1.2.0-meteor-platform-split
1111
1.2.0-cordova-changes
1212
1.2.0-breaking-changes
13+
1.3.0-split-minifiers-package
14+
1.3.5-remove-old-dev-bundle-link
15+
1.4.0-remove-old-dev-bundle-link

.meteor/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
dev_bundle
12
local

.meteor/packages

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,94 +3,83 @@
33
# 'meteor add' and 'meteor remove' will edit this file for you,
44
# but you can also edit it by hand.
55

6-
less
7-
accounts-base
8-
accounts-password
6+
less@2.7.4
7+
accounts-base@1.2.9
8+
accounts-password@1.2.12
99
aldeed:autoform
1010
alanning:roles
1111
aldeed:collection2
1212
aldeed:simple-schema
1313
fortawesome:fontawesome
1414
raix:handlebar-helpers
15-
cfs:standard-packages
16-
cfs:gridfs
15+
# cfs:standard-packages
16+
# cfs:gridfs
1717
aldeed:template-extension
1818
yogiben:helpers
1919
iron:router
2020
yogiben:autoform-modals
2121
yogiben:pretty-email
22-
yogiben:autoform-map
2322
multiply:iron-router-progress
24-
manuelschoebel:ms-seo
25-
spiderable
26-
accounts-ui
23+
24+
2725
jparker:gravatar
2826
tap:i18n
2927
useraccounts:bootstrap
30-
service-configuration
28+
service-configuration@1.0.10
3129
juliancwirko:s-alert
3230
juliancwirko:s-alert-stackslide
33-
momentjs:moment
3431
zimme:iron-router-active
3532
matb33:collection-hooks
3633
dburles:collection-helpers
3734
reywood:publish-composite
3835
natestrauser:animate-css
3936
meteorhacks:subs-manager
40-
fastclick
41-
timmyg:wow
42-
tsega:skrollr
43-
accounts-github
44-
bruz:github-api
45-
chart:chart
37+
38+
4639
percolate:synced-cron
4740
twbs:bootstrap
48-
reactive-var
49-
meteorhacks:npm
41+
5042
aldeed:tabular
5143
benmgreene:moment-range
52-
email
44+
email@1.1.16
5345
zimme:active-route
54-
mfactory:admin-lte
5546
cfs:filesystem
56-
dapearce:material-icons
5747
mrt:flash-messages
58-
frenchbread:dynatable
59-
brylie:api-umbrella
60-
bevanhunt:leaflet
61-
brylie:leaflet-heat
62-
pfafman:filesaver
63-
mizzao:sharejs-ace
6448
raix:ui-dropped-event
6549
brylie:accounts-admin-ui
6650
brylie:first-user-admin
67-
npm-container
68-
standard-minifiers
69-
meteor-base
70-
mobile-experience
71-
mongo
72-
blaze-html-templates
73-
session
74-
jquery
75-
tracker
76-
logging
77-
reload
78-
random
79-
ejson
80-
spacebars
81-
check
51+
52+
53+
54+
55+
56+
57+
58+
59+
60+
61+
62+
63+
8264
useraccounts:iron-routing
8365
pahans:inline-help
8466
dandv:jquery-rateit
85-
zenorocha:clipboard
86-
yogiben:autoform-file
67+
# yogiben:autoform-file
8768
harrison:papa-parse
88-
simple:json-routes
8969
olragon:uri-js
9070
forwarder:autoform-wizard
91-
frenchbread:elastic-rest
9271
universe:reactive-queries
93-
ecmascript
72+
ecmascript@0.5.7
9473
simple:reactive-method
9574
sacha:spin
9675
tap:i18n-ui
76+
kadira:dochead
77+
gwendall:autoform-i18n
78+
forwarder:autoform-wizard-iron-router
79+
peppelg:bootstrap-3-modal
80+
apinf:api-umbrella
81+
82+
83+
vsivsi:file-collection
84+
deepwell:bootstrap-datepicker2
85+
pfafman:filesaver

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.2.1
1+
METEOR@1.4.0.1

0 commit comments

Comments
 (0)