merge: 'master' into feat(message)/notification-functionality

Conflicts:
	components/modal/modal.module.ts
	components/modal/modal.service.ts
	components/popup/popup.directive.ts
	components/popup/popup.module.ts
	components/sui.module.ts
	components/util/util.ts
	demo/src/app/pages/development/test/test.page.html
	demo/src/app/pages/development/test/test.page.ts
	demo/src/app/pages/modules/accordion/accordion.page.html
	demo/src/app/pages/modules/popup/popup.page.ts
	package.json
	src/collections/message/components/message.ts
	src/collections/message/message.module.ts
	src/modules/modal/classes/modal-config.ts
	src/modules/modal/components/modal.ts
	tslint.json

Author: edcarroll

.gitignore

@@ -28,19 +28,20 @@
 npm-debug.log
 testem.log
 
-# System Files
+# system files
 .DS_Store
 Thumbs.db
 
-# Non TS files
+# non TS files
 *.d.ts
 *.metadata.json
 *.js
 *.js.map
 
-# Config Files
-!*.config.js
+# build scripts
+!scripts/**/*
+!package.js
 
-# Output Files
+# output files
 demo/dist
 bundles

.npmignore

@@ -8,6 +8,7 @@ npm-debug.log
 # *.map
 # *.d.ts
 demo
+src
 
 # JetBrains
 .idea
@@ -24,4 +25,4 @@ Desktop.ini
 
 # TS Files
 *.ts
-!*.d.ts
+!*.d.ts

.travis.yml

@@ -7,4 +7,5 @@ before_install:
 
 script:
   - npm run lint
-  - npm run compile
+  - npm run compile:lib
+  - npm run test

CONTRIBUTING.md

@@ -15,7 +15,7 @@ Please read and follow the [Code of Conduct](https://github.com/edcarroll/ng2-se
 
 ## Bug, Question or Problem?
 
-For any usage questions you have, you can join [Gitter](https://gitter.im/ng2-semantic-ui/usage-queries) to ask for help.
+For any usage questions you have, you can join [Gitter](https://gitter.im/ng2-semantic-ui/Lobby) to ask for help.
 
 If you've found a bug, please submit an issue. Even better would be submitting a Pull Request with a fix.
 
@@ -37,7 +37,7 @@ and help you to craft the change so that it is successfully accepted into the pr
 
 Before you submit an issue, please search the issue tracker, as an issue for your problem may already exist and the discussion might inform you of readily available workarounds.
 
-Ideally all issues are fixed as soon as possible, but before that can be done the bug must be confirmed. This is done by providing a minimal reproduction scenario using [http://plunkr.co](http://plunkr.co). Having a live, reproducible scenario provides a wealth of important information without needing to go back & forth to you with additional queries such as:
+Ideally all issues are fixed as soon as possible, but before that can be done the bug must be confirmed. This is done by providing a minimal reproduction scenario using [http://plunkr.co](http://plunkr.co). You can fork the [ng2-semantic-ui plunkr starter](http://plnkr.co/edit/SJMMMS8wQkwdX1HeMqiH?p=preview) and use it as a starting point. Having a live, reproducible scenario provides a wealth of important information without needing to go back & forth to you with additional queries such as:
 
 * Angular version used
 * ng2-semantic-ui version used
@@ -54,6 +54,8 @@ Before submitting a Pull Request (PR) consider the following guidelines:
 
 * Search the Github [pull requests](https://github.com/edcarroll/ng2-semantic-ui/pulls) for an open or closed PR relating to your submission (to avoid duplicating effort).
 
+* Fork a copy of the repository to your own Github account - [see Github guide](https://help.github.com/articles/working-with-forks/)
+
 * Make your changes in a new git branch:
 
     ```shell
@@ -72,7 +74,10 @@ Before submitting a Pull Request (PR) consider the following guidelines:
     $ git push origin my-fix-branch
     ```
 
-* In GitHub, send a pull request to `ng2-semantic-ui:master`.
+* In GitHub, send a pull request to `ng2-semantic-ui:master`
+  - Create a new pull request
+  - Select **compare across forks**
+  - Set your repo and fix branch as the head fork to compare.
 
 * If changes are suggested:
   - Make the required updates

README.md

@@ -1,6 +1,6 @@
 <!-- Logo -->
 <p align="center">
-  <a href="https://react.semantic-ui.com">
+  <a href="https://edcarroll.github.io/ng2-semantic-ui/">
     <img height="128" width="238" src="https://raw.githubusercontent.com/edcarroll/ng2-semantic-ui/master/demo/src/assets/logo.png">
   </a>
 </p>
@@ -15,9 +15,15 @@
   <a href="https://gitter.im/ng2-semantic-ui/Lobby">
     <img alt="Gitter" src="https://img.shields.io/gitter/room/ng2-semantic-ui/Lobby.js.svg?style=flat-square" />
   </a>
+  <a href="https://travis-ci.org/edcarroll/ng2-semantic-ui">
+    <img alt="Travis CI" src="https://img.shields.io/travis/edcarroll/ng2-semantic-ui.svg?style=flat-square" />
+  </a>
   <a href="https://www.npmjs.com/package/ng2-semantic-ui">
     <img alt="npm" src="https://img.shields.io/npm/v/ng2-semantic-ui.svg?style=flat-square" />
   </a>
+  <a href="https://www.npmjs.com/package/ng2-semantic-ui">
+    <img alt="monthly downloads" src="https://img.shields.io/npm/dm/ng2-semantic-ui.svg?style=flat-square" />
+  </a>
 </p>
 
 Semantic UI Angular Integrations, written in pure Angular - **no JQuery required**.
@@ -34,28 +40,38 @@ See the [Documentation](https://edcarroll.github.io/ng2-semantic-ui) for install
 
 ## Dependencies
 
-* [Angular](https://angular.io) (^4.1.0)
+* [Angular](https://angular.io) (^4.3.1)
 * [Semantic UI CSS](http://semantic-ui.com/) (jQuery is **not** required)
 
-## Components
-
-The current list of available components with links to their docs is below:
-
-* [Accordion](https://edcarroll.github.io/ng2-semantic-ui/#/components/accordion)
-* [Checkbox](https://edcarroll.github.io/ng2-semantic-ui/#/components/checkbox)
-* [Collapse](https://edcarroll.github.io/ng2-semantic-ui/#/components/collapse)
-* [Dimmer](https://edcarroll.github.io/ng2-semantic-ui/#/components/dimmer)
-* [Dropdown](https://edcarroll.github.io/ng2-semantic-ui/#/components/dropdown)
-* [Message](https://edcarroll.github.io/ng2-semantic-ui/#/components/message)
-* [Modal](https://edcarroll.github.io/ng2-semantic-ui/#/components/modal)
-* [Popup](https://edcarroll.github.io/ng2-semantic-ui/#/components/popup)
-* [Progress](https://edcarroll.github.io/ng2-semantic-ui/#/components/progress)
-* [Rating](https://edcarroll.github.io/ng2-semantic-ui/#/components/rating)
-* [Search](https://edcarroll.github.io/ng2-semantic-ui/#/components/search)
-* [Select](https://edcarroll.github.io/ng2-semantic-ui/#/components/select)
-* [Sidebar](https://edcarroll.github.io/ng2-semantic-ui/#/components/sidebar)
-* [Tabs](https://edcarroll.github.io/ng2-semantic-ui/#/components/tabs)
-* [Transition](https://edcarroll.github.io/ng2-semantic-ui/#/components/transition)
+## Component Support
+
+|           Icon          |                                      Description                                    |
+|-------------------------|-------------------------------------------------------------------------------------|
+| :white_check_mark:      | Component supported by ng2-semantic-ui.                                             |
+| :rocket:                | Semantic UI plugin supported by ng2-semantic-ui (not in Semantic UI Core).          |
+| :ballot_box_with_check: | Component supported natively by [Semantic UI](https://semantic-ui.com/) (CSS only). |
+| :x:                     | Component currently unavailable.                                                    |
+| :no_entry_sign:         | Component not applicable to Angular.                                                |
+
+|              Elements              |            Collections             |                   Views                  |              Modules              |              Behaviors              |
+|------------------------------------|------------------------------------|------------------------------------------|-----------------------------------|-------------------------------------|
+| :ballot_box_with_check: Button     | :ballot_box_with_check: Breadcrumb | :ballot_box_with_check: Advertisment     | :white_check_mark: Accordion      | :no_entry_sign: API                 |
+| :ballot_box_with_check: Container  | :ballot_box_with_check: Form       | :ballot_box_with_check: Card             | :white_check_mark: Checkbox       | :no_entry_sign: Form Validation     |
+| :ballot_box_with_check: Divider    | :ballot_box_with_check: Grid       | :ballot_box_with_check: Comment          | :rocket: Collapse                 | :rocket: Localization               |
+| :ballot_box_with_check: Flag       | :ballot_box_with_check: Menu       | :ballot_box_with_check: Feed             | :rocket: Datepicker               | :x: Visibiltiy                      |
+| :ballot_box_with_check: Header     | :white_check_mark: Message         | :ballot_box_with_check: Item             | :white_check_mark: Dimmer         |                                     |
+| :ballot_box_with_check: Icon       | :rocket: Pagination                | :ballot_box_with_check: Statistic        | :white_check_mark: Dropdown       |                                     |
+| :ballot_box_with_check: Image      | :ballot_box_with_check: Table      |                                          | :x: Embed                         |                                     |
+| :ballot_box_with_check: Input      |                                    |                                          | :white_check_mark: Modal          |                                     |
+| :ballot_box_with_check: Label      |                                    |                                          | :white_check_mark: Popup          |                                     |
+| :ballot_box_with_check: List       |                                    |                                          | :white_check_mark: Progress       |                                     |
+| :ballot_box_with_check: Loader     |                                    |                                          | :white_check_mark: Rating         |                                     |
+| :ballot_box_with_check: Rail       |                                    |                                          | :white_check_mark: Search         |                                     |
+| :ballot_box_with_check: Reveal     |                                    |                                          | :x: Shape                         |                                     |
+| :ballot_box_with_check: Segment    |                                    |                                          | :white_check_mark: Sidebar        |                                     |
+| :ballot_box_with_check: Step       |                                    |                                          | :x: Sticky                        |                                     |
+|                                    |                                    |                                          | :white_check_mark: Tab            |                                     |
+|                                    |                                    |                                          | :white_check_mark: Transition     |                                     |
 
 ## Want to help?
 
@@ -75,6 +91,25 @@ To run the demo app (you must have [Angular-CLI](https://github.com/angular/angu
 $ ng serve
 ```
 
+## Testing
+
+To run the unit tests suite:
+```bash
+$ npm run test
+```
+
+To run the unit test suit in watch mode (the whole suite is re-executed every code/test change):
+```bash
+$ npm run test:w
+```
+
+To generate code coverage report:
+```bash
+$ npm run test:cov
+```
+this will generate a folder `coverage` with the HTML report
+
+
 ## License
 
 MIT © [Edward Carroll](https://github.com/edcarroll)

angular-cli.json

@@ -1,6 +1,6 @@
 {
   "project": {
-    "version": "1.0.0-beta.31",
+    "version": "1.0.0",
     "name": "ng2-semantic-ui"
   },
   "apps": [
@@ -13,7 +13,9 @@
       ],
       "index": "index.html",
       "main": "main.ts",
+      "test": "../../src/test.ts",
       "tsconfig": "tsconfig.json",
+      "testTsconfig": "../../src/tsconfig.spec.json",
       "prefix": "demo",
       "mobile": false,
       "styles": [
@@ -37,7 +39,7 @@
   },
   "test": {
     "karma": {
-      "config": "./karma.conf.js"
+      "config": "./src/karma.conf.ts"
     }
   },
   "defaults": {