Skip to content

Commit

Permalink
Merge pull request #3036 from apinf/develop
Browse files Browse the repository at this point in the history
Merging develop to master for release 0.51.0
  • Loading branch information
marla-singer authored Oct 11, 2017
2 parents 9ff97ef + e530d67 commit a511cf9
Show file tree
Hide file tree
Showing 137 changed files with 3,017 additions and 1,803 deletions.
File renamed without changes.
31 changes: 31 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Closes #<issue-number>

## Changes
Describe your changes here as a bulleted list:
- change one
- change two

## Developer checklist
This checklist is to be completed by the PR developer:

- [ ] Alternative solutions were compared/discussed before writing code
- [ ] trade-offs with this solution are considered acceptable
- [ ] Code in this PR adheres to the [project styleguide](CONTRIBUTING.md)
- [ ] This pull request does not decrease project test coverage
- [ ] If the code changes existing database collection(s), migration has been written
- [ ] If UI texts are added or changed, all texts are internationalized

## Reviewer checklist
Reviewed by: @username1

This list is to be completed by the pull request reviewer:
- [ ] Code works as described/expected
- [ ] Code seems to be error free
- [ ] no browser console errors visible
- [ ] no server console errors visible
- [ ] passes CI build
- [ ] Code is written in a way that promotes maintainability
- [ ] easy to understand
- [ ] well organized
- [ ] follows project coding standards and conventions
- [ ] well documented
24 changes: 13 additions & 11 deletions .meteor/packages
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Meteor packages used by this project, one per line.
#
# 'meteor add' and 'meteor remove' will edit this file for you,
# 'meteor add' and 'meteor remove' will edit this fill for you,
# but you can also edit it by hand.

accounts-base@1.3.2
Expand All @@ -9,13 +9,17 @@ accounts-password@1.4.0
accounts-ui@1.1.9
alanning:roles
aldeed:autoform
aldeed:autoform-bs-button-group-input
aldeed:collection2
aldeed:simple-schema
aldeed:template-extension
apinf:accounts-admin-ui@0.3.1
apinf:accounts-admin-ui
apinf:accounts-fiware@0.1.1
apinf:api-umbrella
apinf:autoform-bs-datepicker
apinf:fiware@0.1.1
apinf:restivus-swagger
aramk:quill
arillo:flow-router-helpers
benmgreene:moment-range
blaze-html-templates@1.0.4
Expand All @@ -24,14 +28,17 @@ check@1.2.5
dandv:jquery-rateit
dburles:collection-helpers
deepwell:bootstrap-datepicker2
dynamic-import
ecmascript@0.8.2
ejson@1.0.14
email@1.2.3
fastclick@1.0.13
fortawesome:fontawesome
froatsnook:valid-email
github-config-ui@1.0.0
gwendall:autoform-i18n
harrison:papa-parse
http@1.2.12
jquery@1.11.10
juliancwirko:s-alert
juliancwirko:s-alert-stackslide
Expand All @@ -47,6 +54,7 @@ meteor-base@1.1.0
meteorhacks:subs-manager
michalvalasek:autoform-bootstrap-colorpicker
mizzao:sharejs-ace
mizzao:sharejs@=0.9.0
mobile-experience@1.0.4
mongo@1.2.0
nimble:restivus@=0.8.11
Expand All @@ -57,9 +65,11 @@ percolate:migrations
percolate:synced-cron
pfafman:filesaver
raix:handlebar-helpers
raix:rssfeed
raix:ui-dropped-event
rajit:bootstrap3-datepicker
random@1.0.10
reactive-dict@1.1.9
reactive-var@1.0.11
reload@1.1.11
reywood:publish-composite
Expand All @@ -68,6 +78,7 @@ service-configuration@1.0.11
session@1.1.7
shell-server@0.2.4
simple:reactive-method
softwarerero:accounts-t9n
spacebars@1.0.12
spiderable@1.0.14-release-testing.0
standard-minifier-css@1.3.4
Expand All @@ -84,12 +95,3 @@ useraccounts:core
useraccounts:flow-routing
vsivsi:file-collection
zimme:active-route
github-config-ui@1.0.0
mizzao:sharejs@=0.9.0
aramk:quill
softwarerero:accounts-t9n
aldeed:autoform-bs-button-group-input
raix:rssfeed
http@1.2.12
reactive-dict@1.1.9
dynamic-import
42 changes: 22 additions & 20 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@ accounts-base@1.3.2
accounts-github@1.3.0
accounts-oauth@1.1.15
accounts-password@1.4.0
accounts-ui@1.1.9
accounts-ui-unstyled@1.2.1
accounts-ui@1.1.9
alanning:roles@1.2.16
aldeed:autoform@5.8.1
aldeed:autoform-bs-button-group-input@1.0.3
aldeed:collection2@2.10.0
aldeed:autoform@5.8.1
aldeed:collection2-core@1.2.0
aldeed:collection2@2.10.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3
aldeed:template-extension@4.1.0
allow-deny@1.0.6
allow-deny@1.0.9
amplify@1.0.0
apinf:accounts-admin-ui@0.3.2
apinf:accounts-fiware@0.1.1
apinf:api-umbrella@1.4.1
apinf:autoform-bs-datepicker@1.1.2
apinf:create-role-if-undefined@0.1.1
apinf:first-admin@0.1.2
apinf:fiware@0.1.1
apinf:restivus-swagger@0.4.0
aramk:quill@0.1.1
arillo:flow-router-helpers@0.5.2
Expand All @@ -29,9 +31,9 @@ babel-runtime@1.0.1
base64@1.0.10
benmgreene:moment-range@2.10.6
binary-heap@1.0.10
blaze@2.3.2
blaze-html-templates@1.1.2
blaze-tools@1.0.10
blaze@2.3.2
boilerplate-generator@1.2.0
caching-compiler@1.1.9
caching-html-compiler@1.1.2
Expand All @@ -41,23 +43,23 @@ cfs:filesystem@0.1.2
cfs:http-methods@0.0.32
cfs:storage-adapter@0.2.3
check@1.2.5
coffeescript@1.12.7_1
coffeescript-compiler@1.12.7_1
coffeescript@1.12.7_1
dandv:jquery-rateit@1.0.22_2
dburles:collection-helpers@1.1.0
ddp@1.3.0
ddp-client@2.1.0
ddp-common@1.2.9
ddp-rate-limiter@1.0.7
ddp-server@2.0.0
ddp@1.3.0
deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
diff-sequence@1.0.7
dynamic-import@0.1.1
ecmascript@0.8.2
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.3
ecmascript-runtime-server@0.4.1
ecmascript-runtime@0.4.1
ecmascript@0.8.2
ejson@1.0.14
email@1.2.3
es5-shim@4.6.15
Expand All @@ -76,13 +78,13 @@ htmljs@1.0.11
http@1.2.12
id-map@1.0.9
jquery@1.11.10
juliancwirko:s-alert@3.2.0
juliancwirko:s-alert-stackslide@3.1.3
juliancwirko:s-alert@3.2.0
kadira:blaze-layout@2.3.0
kadira:dochead@1.5.0
kadira:flow-router@2.12.1
kurounin:pagination@1.0.21
kurounin:pagination-blaze@1.0.2
kurounin:pagination@1.0.21
launch-screen@1.1.1
less@2.7.9
livedata@1.0.18
Expand All @@ -91,30 +93,30 @@ logging@1.1.17
markdown@1.0.12
matb33:collection-hooks@0.8.4
mdg:validation-error@0.5.1
meteor@1.7.1
meteor-base@1.1.0
meteor@1.7.1
meteorhacks:subs-manager@1.6.4
meteorspark:util@0.2.0
michalvalasek:autoform-bootstrap-colorpicker@0.1.0
minifier-css@1.2.16
minifier-js@2.1.3
minimongo@1.3.0
mizzao:sharejs@0.9.0
mizzao:sharejs-ace@1.4.1
mizzao:sharejs@0.9.0
mobile-experience@1.0.4
mobile-status-bar@1.0.14
modules@0.10.0
modules-runtime@0.8.0
modules@0.10.0
momentjs:moment@2.18.1
mongo@1.2.0
mongo-dev-server@1.0.1
mongo-id@1.0.6
mongo-livedata@1.0.12
mongo@1.2.0
nimble:restivus@0.8.11
npm-bcrypt@0.9.3
npm-mongo@2.2.30
oauth@1.1.13
oauth2@1.1.11
oauth@1.1.13
observe-sequence@1.0.16
olragon:uri-js@1.13.1
ordered-dict@1.0.9
Expand Down Expand Up @@ -146,18 +148,18 @@ showdown@1.0.8
simple:json-routes@2.1.0
simple:reactive-method@1.0.2
softwarerero:accounts-t9n@1.3.11
spacebars@1.0.15
spacebars-compiler@1.1.3
spacebars@1.0.15
spiderable@1.0.14-release-testing.0
srp@1.0.10
standard-minifier-css@1.3.4
standard-minifier-js@2.1.1
tap:i18n@1.8.2
tap:i18n-ui@0.8.0
templating@1.3.2
tap:i18n@1.8.2
templating-compiler@1.3.2
templating-runtime@1.3.2
templating-tools@1.1.2
templating@1.3.2
tmeasday:publish-counts@0.8.0
todda00:friendly-slugs@0.6.0
tracker@1.1.3
Expand All @@ -171,6 +173,6 @@ useraccounts:bootstrap@1.14.2
useraccounts:core@1.14.2
useraccounts:flow-routing@1.14.2
vsivsi:file-collection@1.3.8
webapp@1.3.18
webapp-hashing@1.0.9
webapp@1.3.18
zimme:active-route@2.3.2
Loading

0 comments on commit a511cf9

Please sign in to comment.