Merge branch 'master' into feature/examples_search-filter

# Conflicts:
#	CHANGELOG.md
#	packages/forms/examples/forms/forms.module.ts

Author: TomVanDenBroeck

CHANGELOG.md

@@ -15,11 +15,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - `forms/range-slider` Added documentation.
 - `forms/timepicker` Added documentation.
 - `forms/search-filter` Added documentation.
+- `forms/upload` Added documentation.
 - `forms/wysiwyg` Added documentation.
 - `layout/cookie-consent` Added documentation.
 - `layout/hero` Added documentation.
 - `layout/pane` Added documentation.
 - `selectable-list` Added documentation.
+- `utils/filter` Added documentation.
+- `utils/labels` Added documentation.
+- `utils/window` Added documentation.
+
+### Changed
+- `context` The ContextModule is no longer dependent on the ContextStoreModule.
+
+### Fixed
+- `upload` Updated the required styling to be in sync with the corresponding Core Branding classes.
+- `upload` Removed unnecessary module imports that caused build conflicts.
+- `layout/hero` Removed unnecessary module imports that caused build conflicts.
 
 ## [1.0.3] - 2018-09-25
 ### Added
@@ -57,7 +69,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 Initial release.
 
 
-[Unreleased]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.0

CONTRIBUTING.md

@@ -11,8 +11,9 @@ Hi! We're really excited that you are interested in contributing to ACPaaS UI. B
 
 ## Issue Reporting Guidelines
 
-- Use the [#acpaas-ui channel](https://dgpls.slack.com/messages/C4M60PQJF) on slack to ask questions about using ACPaaS UI.
-- Use the [#acpaas-ui-dev channel](https://dgpls.slack.com/messages/C4S2D7KTK) on slack to discuss changes to the ACPaaS UI code itself.
+- If you're not yet a member of our DigAnt Café slack community, you can easily [join here](https://digantcafe-slack.digipolis.be).
+- Use the [#acpaas-ui channel](https://digantcafe.slack.com/messages/CDDLYJU65/) on slack to ask questions about using ACPaaS UI.
+- Use the [#acpaas-ui-ngx channel][acpaas-ui-ngx] on slack to discuss changes to the ACPaaS UI code itself.
 - Use [GitHub Issues][github-issues] to report bugs, request features, ask policy questions or propose policy changes.
 
 > Note: policy questions are about the way ACPaaS UI is developed and released, or about its architecture. We use github issues to have a public archive of these discussions.
@@ -89,10 +90,12 @@ $ npm run styleguide
 
 ACPaaS UI is supplied as a single library on NPM [@acpaas-ui/ngx-components](https://www.npmjs.com/package/@acpaas-ui/ngx-components), although related components (e.g. the [smart widgets](https://github.com/digipolisantwerp/smart-widgets)) may be packaged independently.
 
-It is released at least once a month, and more often if there are high priority changes. If your PR has been merged but not yet released, and it is high priority, please ping the [#acpaas-ui-dev channel](https://dgpls.slack.com/messages/C4S2D7KTK) to ask for an out-of-band release. (Before you do so, check the [dev guide](./guidelines/DEV_GUIDE.md#development-snapshots) for ways to use it without an official release.)
+It is released at least once a month, and more often if there are high priority changes. If your PR has been merged but not yet released, and it is high priority, please ping the [#acpaas-ui-ngx channel][acpaas-ui-ngx] to ask for an out-of-band release. (Before you do so, check the [dev guide](./guidelines/DEV_GUIDE.md#development-snapshots) for ways to use it without an official release.)
 
 The project follows [Semantic Versioning](https://semver.org/). The latest stable major version is developed on the `master` branch. For other major versions there are separate `vX-dev` branches. For more info on the exact versioning policy, see the [versioning guide](./guidelines/VERSIONING.md).
 
 A [changelog](CHANGELOG.md) is provided for your convenience.
 
 > Maintainers: see the [release guide](./guidelines/RELEASE.md) for guidance on releases and versioning.
+
+[acpaas-ui-ngx]: https://digantcafe.slack.com/messages/CDF95H5B7/

README.md

@@ -76,7 +76,7 @@ This library contains the following components:
 
 ## Questions
 
-For questions and support please ask a question on the [#acpaas-ui slack channel][acpaas-ui-slack].
+For questions and support please ask a question on the [#acpaas-ui slack channel][acpaas-ui-slack]. If you're not yet a member of our DigAnt Café slack community, you can easily [join here](https://digantcafe-slack.digipolis.be).
 
 If you stumble across a bug or missing feature, feel free to [report an issue][acpaas-ui-angular-issues]. Please fill out the issue template completely when [opening an issue][acpaas-ui-angular-issues]. This will help us get to your issue sooner.
 
@@ -98,7 +98,7 @@ Copyright (c) 2016-present, Digipolis
 
 <!-- Generic Links -->
 [acpaas-ui]: https://acpaas-ui.digipolis.be
-[acpaas-ui-slack]: https://dgpls.slack.com/messages/C4M60PQJF
+[acpaas-ui-slack]: https://digantcafe.slack.com/messages/CDDLYJU65/
 [flexboxgrid]: https://github.com/a-ui/core_flexboxgrid_scss
 
 <!-- Travis -->

angular.json

@@ -765,7 +765,7 @@
               "project": "packages/utils/ng-package.prod.json"
             },
             "examples": {
-              "project": "packages/avatar/ng-package.examples.json"
+              "project": "packages/utils/ng-package.examples.json"
             }
           }
         },

guidelines/ISSUES.md

@@ -2,7 +2,7 @@
 
 Dear maintainer,
 
-To ensure issues are handled correctly and timely, it is paramount to review the issues list at regular intervals. These guidelines are for your convenience to help assess and resolve issues. All maintainers are kindly asked to pitch in and help keep a clean issues list.
+To ensure issues are handled correctly and timely, it is paramount that the issues list is reviewed at regular intervals. These guidelines are for your convenience to help assess and resolve issues. All maintainers are kindly asked to pitch in and help keep a clean issues list.
 
 - [Issue Handling Guidelines](#issue-handling-guidelines)
     - [Issue labels](#issue-labels)
@@ -33,7 +33,8 @@ At regular intervals review the open issues list and **verify for every issue**:
     - The label `verified` is applied when a maintainer has reproduced it or verified it is reproduceable.
     - Feel free to try reproducing yourself.
 - Features and verified bug reports are on some team's roadmap, assigned to a developer, or marked as `help wanted`. (See the guidelines below for assigning.)
-    - And issues with label `help wanted` that are good for first-time contributors have the label `good first issue`.
+    - Issues with label `help wanted` that are good for first-time contributors should have the label `good first issue`.
+    - For issues assigned to a person or team managed in JIRA, a corresponding JIRA issue should be created and linked to from the issue's description or comments.
 - Issues that are blocked on additional information have a `missing info` label and a comment asking the appropriate person for the information.
     - If the submitter does not respond in a few weeks, you can ping them or close the issue as `invalid`.
 - Issues of type `policy` are assigned to someone for resolving.
@@ -50,7 +51,7 @@ For types `bug` and `feature`:
 For type `policy`:
 
 - Look for an appropriate maintainer to help resolve this question and assign to them.
-- Link to the issue in the [#acpaas-ui-dev](https://dgpls.slack.com/messages/C4S2D7KTK) slack channel if it needs broader discussion.
+- Link to the issue in the [#acpaas-ui-ngx](https://digantcafe.slack.com/messages/CDF95H5B7/) slack channel if it needs broader discussion. If you're not yet a member of our DigAnt Café slack community, you can easily [join here](https://digantcafe-slack.digipolis.be).
 
 Contributors are expected to keep an eye on their assigned issues and work towards resolving them. If this is not possible, the maintainers should help find someone else to assign the issue to.