Merge trigger.io

Author: Andres Olave

CHANGELOG.md

@@ -1,5 +1,7 @@
 Please read the contributing guide on the ionic website: http://ionicframework.com/contribute/
 
+Please do not manually create issues on GitHub.
+
 ### Creating an Issue
 
 If you have a question on how something works, or its expected functionality, you might want to visit the [Ionic Forum](http://forum.ionicframework.com/) first.

CODENAMES

@@ -1,11 +1,11 @@
-[![Build Status](https://circleci.com/gh/driftyco/ionic.png?circle-token=7388822b8691078560c4f057d8eb0df0e8d7f1b5)](https://circleci.com/gh/driftyco/ionic)
+[![Circle CI](https://circleci.com/gh/driftyco/ionic.svg?style=svg)](https://circleci.com/gh/driftyco/ionic)
 
 
 [![Issues Ready](https://badge.waffle.io/driftyco/ionic.png?label=ready&title=Ready)](https://waffle.io/driftyco/ionic)
 
 The best place to start with Ionic is our [documentation page](http://ionicframework.com/docs/).
 
-Ionic currently best supports iOS 6+ and Android 4.1+, with scaled-down support for Android 2.3.
+Ionic currently best supports iOS 7+ and Android 4.1+.
 
 # What is Ionic?
 
@@ -66,25 +66,7 @@ For most cases, you'll need AngularJS as well.  This is bundled in `js/angular/`
 
 ## Authors
 
-**Max Lynch**
-
-+ <https://twitter.com/maxlynch>
-+ <https://github.com/mlynch>
-
-**Ben Sperry**
-
-+ <https://twitter.com/benjsperry>
-+ <https://github.com/bensperry>
-
-**Adam Bradley**
-
-+ <https://twitter.com/adamdbradley>
-+ <https://github.com/adamdbradley>
-
-**Andrew Joslin**
-
-+ <https://twitter.com/andrewtjoslin>
-+ <https://github.com/ajoslin>
+Originally created by [Adam Bradley](http://twitter.com/adamdbradley), [Ben Sperry](http://twitter.com/benjsperry), and [Max Lynch](http://twitter.com/maxlynch), Ionic has seen hundreds of great [contributors](https://github.com/driftyco/ionic/graphs/contributors) from around the world, including Ionic Team Members [Andrew Joslin](http://twitter.com/andrewtjoslin), [Perry Govier](http://twitter.com/perrygovier), and [Mike Hartington](http://twitter.com/mhartington).
 
 ## Development
 
@@ -120,7 +102,7 @@ For most cases, you'll need AngularJS as well.  This is bundled in `js/angular/`
 
 ### Commit Conventions
 
-* Uses http://github.com/ajoslin/conventional-changelog conventions
+* Uses these [commit conventions](http://github.com/ajoslin/conventional-changelog)
 
 ### Pushing New Release of Ionic
 

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 {
   "name": "ionic",
-  "version": "1.0.0-beta.14",
-  "codename": "lanthanum-leopard",
+  "version": "1.0.0-rc.0",
+  "codename": "neodymium-newt",
   "homepage": "https://github.com/driftyco/ionic",
   "authors": [
     "Max Lynch <[email protected]>",
@@ -48,9 +48,14 @@
     "js/ionic.js"
   ],
   "dependencies": {
-    "angular": "~1.3.5",
-    "angular-animate": "~1.3.5",
-    "angular-sanitize": "~1.3.5",
-    "angular-ui-router": "0.2.10"
+    "angular": "1.3.13",
+    "angular-animate": "1.3.13",
+    "angular-aria": "1.3.13",
+    "angular-messages": "1.3.13",
+    "angular-mocks": "1.3.13",
+    "angular-resource": "1.3.13",
+    "angular-sanitize": "1.3.13",
+    "angular-scenario": "1.3.13",
+    "angular-ui-router": "0.2.13"
   }
 }

README.md

@@ -1,7 +1,7 @@
 {
     "repo": "driftyco/ionic",
     "development": {},
-    "version": "1.0.0-beta.14",
+    "version": "1.0.0-rc.0",
     "styles": [
       "dist/css/ionic.css"
     ],

bower.json

@@ -1,5 +1,3 @@
-magnesium-mongoose
-neodymium-newt
 osmium-ostrich
 palladium-platypus
 radium-raccoon

component.json

@@ -39,6 +39,7 @@ module.exports = {
     'js/ionic.js',
 
     // Utils
+    'js/utils/delegateService.js',
     'js/utils/dom.js',
     'js/utils/events.js',
     'js/utils/gestures.js',
@@ -57,6 +58,7 @@ module.exports = {
     'js/views/listView.js',
     'js/views/modalView.js',
     'js/views/sideMenuView.js',
+    'js/views/sliderView.js',
     'js/views/toggleView.js'
   ],
 

config/CODENAMES

@@ -58,10 +58,38 @@
   </li>
 
 
-  <!-- Events -->
+  <!-- Form Inputs -->
+  <li class="menu-section">
+    <a href="{{ page.versionHref }}/api/directive/ionCheckbox/" class="api-section">
+       Form Inputs
+    </a>
+    <ul>
+      <li>
+        <a href="{{ page.versionHref }}/api/directive/ionCheckbox/">
+           ion-checkbox
+        </a>
+      </li>
+
+      <li>
+        <a href="{{ page.versionHref }}/api/directive/ionRadio/">
+           ion-radio
+        </a>
+      </li>
+
+      <li>
+        <a href="{{ page.versionHref }}/api/directive/ionToggle/">
+           ion-toggle
+        </a>
+      </li>
+
+    </ul>
+  </li>
+
+
+  <!-- Gesture and Events -->
   <li class="menu-section">
     <a href="{{ page.versionHref }}/api/directive/onHold/" class="api-section">
-      Events
+      Gestures and Events
     </a>
     <ul>
       <li>
@@ -74,6 +102,11 @@
           on-tap
         </a>
       </li>
+      <li>
+        <a href="{{ page.versionHref }}/api/directive/onDoubleTap/">
+          on-double-tap
+        </a>
+      </li>
       <li>
         <a href="{{ page.versionHref }}/api/directive/onTouch/">
           on-touch
@@ -134,44 +167,6 @@
           on-swipe-left
         </a>
       </li>
-    </ul>
-  </li>
-
-
-  <!-- Form Inputs -->
-  <li class="menu-section">
-    <a href="{{ page.versionHref }}/api/directive/ionCheckbox/" class="api-section">
-       Form Inputs
-    </a>
-    <ul>
-      <li>
-        <a href="{{ page.versionHref }}/api/directive/ionCheckbox/">
-           ion-checkbox
-        </a>
-      </li>
-
-      <li>
-        <a href="{{ page.versionHref }}/api/directive/ionRadio/">
-           ion-radio
-        </a>
-      </li>
-
-      <li>
-        <a href="{{ page.versionHref }}/api/directive/ionToggle/">
-           ion-toggle
-        </a>
-      </li>
-
-    </ul>
-  </li>
-
-
-  <!-- Gesture -->
-  <li class="menu-section">
-    <a href="{{ page.versionHref }}/api/service/$ionicGesture/" class="api-section">
-      Gesture
-    </a>
-    <ul>
       <li>
         <a href="{{ page.versionHref }}/api/service/$ionicGesture/">
           $ionicGesture
@@ -547,6 +542,21 @@
   </li>
 
 
+  <!-- Spinner -->
+  <li class="menu-section">
+    <a href="{{ page.versionHref }}/api/directive/ionSpinner/" class="api-section">
+      Spinner
+    </a>
+    <ul>
+      <li>
+        <a href="{{ page.versionHref }}/api/directive/ionSpinner/">
+          ion-spinner
+        </a>
+      </li>
+    </ul>
+  </li>
+
+
   <!-- Tabs -->
   <li class="menu-section">
     <a href="{{ page.versionHref }}/api/directive/ionTabs/" class="api-section">