Merged from upstream

README.md

@@ -18,6 +18,6 @@ npm install semantic-ui-nag
 
 ## Addendum
 
-This element's definitions (required class names, html structures) are available in the [Beta UI Docs](http://beta.semantic-ui.com)
+This element's definitions (required class names, html structures) are available in the [UI Docs](http://www.semantic-ui.com)
 
-Please consider checking out [all the benefits to theming](http://learnsemantic.com/guide/expert.html) before using these stand-alone releases.
+Please consider checking out [all the benefits to theming](http://www.learnsemantic.com/guide/expert.html) before using these stand-alone releases.

RELEASE-NOTES.md

@@ -0,0 +1,5 @@
+### Version 1.1.0 - December 02, 2014
+
+- **Transition** now has ``useFailSafe`` parameter (off by default) to ensure transition callback fires even if native ``onAnimationEnd`` event does not fire due to element visibility. [Chromium Bug Report by Product Manager @ Mozilla](https://code.google.com/p/chromium/issues/detail?id=135350#c2) and [this open issue](https://code.google.com/p/chromium/issues/detail?id=437860)
+
+### Version 0.1.0 - Sep 25, 2013

bower.json

@@ -1,15 +1,32 @@
 {
   "name": "semantic-ui-nag",
   "description": "Nag - Semantic UI",
-  "homepage": "http://beta.semantic-ui.com",
+  "homepage": "http://www.semantic-ui.com",
   "author": {
     "name": "Jack Lukic",
     "web": "http://www.jacklukic.com"
   },
-  "ignore": ["docs", "node", "server", "spec", "src", "test"],
-  "keywords": ["semantic", "ui", "css3", "framework"],
-  "license": ["http://semantic-ui.mit-license.org/"],
-  "main": ["nag.js", "nag.css"],
+  "ignore": [
+    "docs",
+    "node",
+    "server",
+    "spec",
+    "src",
+    "test"
+  ],
+  "keywords": [
+    "semantic",
+    "ui",
+    "css3",
+    "framework"
+  ],
+  "license": [
+    "http://semantic-ui.mit-license.org/"
+  ],
+  "main": [
+    "nag.js",
+    "nag.css"
+  ],
   "dependencies": {
     "jquery": ">=1.8"
   }

composer.json

@@ -8,11 +8,20 @@
     "web": "http://www.jacklukic.com",
     "role": "Creator"
   }],
-  "keywords": ["semantic", "ui", "css", "framework"],
+  "keywords": [
+    "semantic",
+    "ui",
+    "css",
+    "framework"
+  ],
   "license": "MIT",
   "dependencies": {
     "jquery": "x.x.x"
   },
   "main": "nag.js",
+<<<<<<< HEAD
   "version": "1.0.0-beta"
+=======
+  "version": "1.7.2"
+>>>>>>> ae30c626331b94a2c00feb625f88561554b88113
 }

package.json

@@ -1,14 +1,18 @@
 {
   "name": "semantic-ui-nag",
+<<<<<<< HEAD
   "version": "1.0.0-beta",
+=======
+  "version": "1.7.2",
+>>>>>>> ae30c626331b94a2c00feb625f88561554b88113
   "title": "Semantic UI - Nag",
   "description": "Single component release of nag",
   "homepage": "http://www.semantic-ui.com",
   "author": "Jack Lukic <[email protected]>",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git@github.com:Semantic-Org/UI-Nag.git"
+    "url": "https://github.com/Semantic-Org/UI-Nag.git"
   },
   "bugs": {
     "url": "https://github.com/Semantic-Org/Semantic-UI/issues"