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.

[email protected]
Expand All @@ -9,13 +9,17 @@ [email protected]
[email protected]
alanning:roles
aldeed:autoform
aldeed:autoform-bs-button-group-input
aldeed:collection2
aldeed:simple-schema
aldeed:template-extension
apinf:[email protected]
apinf:accounts-admin-ui
apinf:[email protected]
apinf:api-umbrella
apinf:autoform-bs-datepicker
apinf:[email protected]
apinf:restivus-swagger
aramk:quill
arillo:flow-router-helpers
benmgreene:moment-range
[email protected]
Expand All @@ -24,14 +28,17 @@ [email protected]
dandv:jquery-rateit
dburles:collection-helpers
deepwell:bootstrap-datepicker2
dynamic-import
[email protected]
[email protected]
[email protected]
[email protected]
fortawesome:fontawesome
froatsnook:valid-email
[email protected]
gwendall:autoform-i18n
harrison:papa-parse
[email protected]
[email protected]
juliancwirko:s-alert
juliancwirko:s-alert-stackslide
Expand All @@ -47,6 +54,7 @@ [email protected]
meteorhacks:subs-manager
michalvalasek:autoform-bootstrap-colorpicker
mizzao:sharejs-ace
mizzao:sharejs@=0.9.0
[email protected]
[email protected]
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
[email protected]
[email protected]
[email protected]
[email protected]
reywood:publish-composite
Expand All @@ -68,6 +78,7 @@ [email protected]
[email protected]
[email protected]
simple:reactive-method
softwarerero:accounts-t9n
[email protected]
[email protected]
[email protected]
Expand All @@ -84,12 +95,3 @@ useraccounts:core
useraccounts:flow-routing
vsivsi:file-collection
zimme:active-route
[email protected]
mizzao:sharejs@=0.9.0
aramk:quill
softwarerero:accounts-t9n
aldeed:autoform-bs-button-group-input
raix:rssfeed
[email protected]
[email protected]
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 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
alanning:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
[email protected].6
[email protected].9
[email protected]
apinf:[email protected]
apinf:[email protected]
apinf:[email protected]
apinf:[email protected]
apinf:[email protected]
apinf:[email protected]
apinf:[email protected]
apinf:[email protected]
aramk:[email protected]
arillo:[email protected]
Expand All @@ -29,9 +31,9 @@ [email protected]
[email protected]
benmgreene:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
Expand All @@ -41,23 +43,23 @@ cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
[email protected]
[email protected]_1
[email protected]_1
[email protected]_1
dandv:[email protected]_2
dburles:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
deepwell:[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]
Expand All @@ -76,13 +78,13 @@ [email protected]
[email protected]
[email protected]
[email protected]
juliancwirko:[email protected]
juliancwirko:[email protected]
juliancwirko:[email protected]
kadira:[email protected]
kadira:[email protected]
kadira:[email protected]
kurounin:[email protected]
kurounin:[email protected]
kurounin:[email protected]
[email protected]
[email protected]
[email protected]
Expand All @@ -91,30 +93,30 @@ [email protected]
[email protected]
matb33:[email protected]
mdg:[email protected]
[email protected]
[email protected]
[email protected]
meteorhacks:[email protected]
meteorspark:[email protected]
michalvalasek:[email protected]
[email protected]
[email protected]
[email protected]
mizzao:[email protected]
mizzao:[email protected]
mizzao:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
momentjs:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
nimble:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
olragon:[email protected]
[email protected]
Expand Down Expand Up @@ -146,18 +148,18 @@ [email protected]
simple:[email protected]
simple:[email protected]
softwarerero:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
tap:[email protected]
tap:[email protected]
templating@1.3.2
tap:i18n@1.8.2
[email protected]
[email protected]
[email protected]
[email protected]
tmeasday:[email protected]
todda00:[email protected]
[email protected]
Expand All @@ -171,6 +173,6 @@ useraccounts:[email protected]
useraccounts:[email protected]
useraccounts:[email protected]
vsivsi:[email protected]
[email protected]
[email protected]
[email protected]
zimme:[email protected]
Loading

0 comments on commit a511cf9

Please sign in to comment.