Skip to content

Commit 600e1a1

Browse files
working using version 1.1.0, ahora voy a probar using 1.2.4 cono sin ksScroll on config
1 parent 2fc5d07 commit 600e1a1

File tree

266 files changed

+29618
-53119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+29618
-53119
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "HelloIonic",
33
"private": "true",
44
"devDependencies": {
5-
"ionic": "driftyco/ionic-bower#1.2.4"
5+
"ionic": "1.1.0"
66
},
77
"dependencies": {
88
"ionic-ion-header-shrink": "*",

www/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<meta charset="utf-8">
66
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
77
<title></title>
8-
<link href="lib/ionic/css/ionic.css" rel="stylesheet">
8+
<link href="lib/ionic/release/css/ionic.css" rel="stylesheet">
99
<link href="css/style.css" rel="stylesheet">
1010
<!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
1111
<link href="css/ionic.app.css" rel="stylesheet">
1212
-->
1313
<!-- ionic/angularjs js -->
14-
<script src="lib/ionic/js/ionic.bundle.js"></script>
14+
<script src="lib/ionic/release/js/ionic.bundle.js"></script>
1515
<script src="lib/ionic-ion-header-shrink/ionic.headerShrink.js"></script>
1616
<script src="lib/ionic-scroll-sista/dist/ionic.scroll.sista.js"></script>
1717
<!-- cordova script (this will be a 404 during development) -->

www/lib/ionic-ion-header-shrink/.bower.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@
2323
},
2424
"_source": "git://github.com/driftyco/ionic-ion-header-shrink.git",
2525
"_target": "*",
26-
"_originalSource": "ionic-ion-header-shrink",
27-
"_direct": true
26+
"_originalSource": "ionic-ion-header-shrink"
2827
}

www/lib/ionic-scroll-sista/.bower.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,5 @@
4949
},
5050
"_source": "git://github.com/djett41/ionic-scroll-sista.git",
5151
"_target": "^1.0.7",
52-
"_originalSource": "ionic-scroll-sista",
53-
"_direct": true
52+
"_originalSource": "ionic-scroll-sista"
5453
}

www/lib/ionic/.bower.json

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"name": "ionic",
3+
"version": "1.1.0",
4+
"codename": "xenon-xerus",
5+
"homepage": "https://github.com/driftyco/ionic",
6+
"authors": [
7+
"Max Lynch <max@drifty.com>",
8+
"Adam Bradley <adam@drifty.com>",
9+
"Ben Sperry <ben@drifty.com>"
10+
],
11+
"description": "Advanced HTML5 hybrid mobile app development framework.",
12+
"main": [
13+
"release/css/ionic.css",
14+
"release/fonts/*",
15+
"release/js/ionic.js",
16+
"release/js/ionic-angular.js"
17+
],
18+
"keywords": [
19+
"mobile",
20+
"html5",
21+
"ionic",
22+
"cordova",
23+
"phonegap",
24+
"trigger",
25+
"triggerio",
26+
"angularjs",
27+
"angular"
28+
],
29+
"license": "MIT",
30+
"private": false,
31+
"ignore": [
32+
"**/.*",
33+
"CONTRIBUTING.md",
34+
"Gruntfile.js",
35+
"component.json",
36+
"config",
37+
"examples",
38+
"package.json",
39+
"release/js/angular",
40+
"release/js/angular-ui",
41+
"scripts",
42+
"test",
43+
"js/controllers",
44+
"js/ext",
45+
"js/utils",
46+
"js/views",
47+
"js/_license.js",
48+
"js/ionic.js"
49+
],
50+
"dependencies": {
51+
"angular": "1.4.3",
52+
"angular-animate": "1.4.3",
53+
"angular-sanitize": "1.4.3",
54+
"angular-ui-router": "0.2.13"
55+
},
56+
"_release": "1.1.0",
57+
"_resolution": {
58+
"type": "version",
59+
"tag": "v1.1.0",
60+
"commit": "01bc2203a6c71953dd35db19f9b64cf6bbeb6bf6"
61+
},
62+
"_source": "git://github.com/driftyco/ionic.git",
63+
"_target": "1.1.0",
64+
"_originalSource": "ionic"
65+
}

www/lib/ionic/CHANGELOG.md

Lines changed: 1757 additions & 0 deletions
Large diffs are not rendered by default.

www/lib/ionic/LICENSE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Copyright 2015-present Drifty Co.
2+
http://drifty.com/
3+
4+
MIT License
5+
6+
Permission is hereby granted, free of charge, to any person obtaining
7+
a copy of this software and associated documentation files (the
8+
"Software"), to deal in the Software without restriction, including
9+
without limitation the rights to use, copy, modify, merge, publish,
10+
distribute, sublicense, and/or sell copies of the Software, and to
11+
permit persons to whom the Software is furnished to do so, subject to
12+
the following conditions:
13+
14+
The above copyright notice and this permission notice shall be
15+
included in all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
20+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
21+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
22+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
23+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

www/lib/ionic/README.md

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
[![Circle CI](https://circleci.com/gh/driftyco/ionic.svg?style=svg)](https://circleci.com/gh/driftyco/ionic)
2+
3+
4+
[![Issues Ready](https://badge.waffle.io/driftyco/ionic.png?label=ready&title=Ready)](https://waffle.io/driftyco/ionic)
5+
6+
The best place to start with Ionic is our [documentation page](http://ionicframework.com/docs/).
7+
8+
Ionic currently best supports iOS 7+ and Android 4.1+.
9+
10+
# What is Ionic?
11+
12+
Ionic is the open source HTML5 Mobile Framework for building amazing, cross-platform hybrid native apps with HTML, JavaScript, and CSS.
13+
14+
![Ionic GUI](http://ionicframework.com/img/gui_screen.jpg)
15+
16+
We built Ionic because we wanted a framework that focused on building hybrid native apps, rather than mobile websites. We wanted this framework to be obsessive about great design and performance. A framework that left the past behind and focused on the future where mobile devices could make HTML5 feel native.
17+
18+
It's important to realize that Ionic is not a replacement for frameworks used for building mobile web apps. There are a lot
19+
of great solutions that work well for websites, like [jQuery Mobile](http://jquerymobile.com/).
20+
21+
Ionic is also not a good solution if you need to support older generation devices. Our compatibility *starts* at iOS 6 and Android 4.1. We will never support versions earlier than those. This is a framework for the future. Learn more: [Where does the Ionic Framework fit in?](http://ionicframework.com/blog/where-does-the-ionic-framework-fit-in/)
22+
23+
## Quick Start
24+
25+
To start using ionic, you have two options: copy over the built JS and CSS files, or
26+
use the `ionic` tool ([ionic-cli](https://github.com/driftyco/ionic-cli)) which can be installed through npm: _(You may need to prefix the command with `sudo` depending on your OS and setup.)_
27+
28+
```bash
29+
$ npm install -g ionic
30+
```
31+
32+
Then, you can start a new ionic project by running:
33+
34+
```bash
35+
$ ionic start myproject
36+
```
37+
38+
### Manual Start
39+
40+
- Download the latest **stable** release from:
41+
* The `release` folder of this repository
42+
* Ionic CDN: [Latest Release](http://code.ionicframework.com/)
43+
* Using bower: `bower install ionic`
44+
- Download the **bleeding edge just-from-master release** from:
45+
* Ionic CDN: [Nightly Build](http://code.ionicframework.com/#nightly)
46+
* Using bower: `bower install driftyco/ionic-bower#master`
47+
48+
Once you have a release, use `js/ionic.js`, `js/ionic-angular.js`, and `css/ionic.css`.
49+
50+
For most cases, you'll need AngularJS as well. This is bundled in `js/angular/` and `js/angular-ui-router/`.
51+
52+
53+
## Demos
54+
55+
- [Ionic Codepen.io Demos](http://codepen.io/ionic/public-list)
56+
57+
58+
## Community
59+
60+
* Follow [@ionicframework on Twitter](https://twitter.com/ionicframework)
61+
* Subscribe to the [Ionic Newsletter](http://ionicframework.com/subscribe/)
62+
* Have a question that's not a feature request or bug report? [Discuss on the Ionic Forum](http://forum.ionicframework.com/)
63+
* Read our [Blog](http://ionicframework.com/blog/)
64+
* Have a feature request or find a bug? [Submit an issue](http://ionicframework.com/submit-issue/)
65+
66+
67+
## Authors
68+
69+
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 [Perry Govier](http://twitter.com/perrygovier), [Mike Hartington](http://twitter.com/mhartington), and [Tim Lancina](http://twitter.com/dopernicus).
70+
71+
## Development
72+
73+
* `npm install && npm install -g gulp protractor` to setup
74+
* (if you wish to run end-to-end tests): `webdriver-manager update --chrome` to install the webdriver.
75+
* `gulp` or `gulp build` to build
76+
* `gulp docs` to generate docs (read Documentation below for how to test docs locally).
77+
* `gulp build --release` to build with minification & strip debugs
78+
* `gulp watch` to watch and rebuild on change
79+
* `gulp karma` to test one-time
80+
* `gulp karma-watch` to test and re-run on source change
81+
* `gulp snapshot` to test e2e tests locally (run `gulp demos` first to generate e2e tests). Be sure to run `./node_modules/.bin/webdriver-manager update --chrome` to first install the chrome webdriver dependency.
82+
83+
### Documentation
84+
85+
* Documentation is generated into `dist/ionic-site`. To test documentation properly, follow these steps:
86+
1. Clone ionic-site into `./dist/ionic-site`
87+
- `git clone git@github.com:driftyco/ionic-site dist/ionic-site`
88+
2. Start jekyll, telling it to rebuild whenever the site changes
89+
- `cd dist/ionic-site && jekyll serve -w`
90+
3. Go back to project root and build the docs
91+
- `gulp docs [--doc-version=(versionName|nightly)]`
92+
4. Open localhost:4000 and see your changes! Re-run `gulp docs` again whenever you change something, and jekyll will update the site
93+
94+
### Demos / Kitchen Sink
95+
96+
* The demo site is generated into `dist/ionic-demo`. To test the demos, follow these steps:
97+
1. Run `gulp demos [--demo-version=(versionName|nightly)]`
98+
2. Start an http server from `dist/ionic-demo`:
99+
- `cd dist/ionic-demo && python -m SimpleHTTPServer`
100+
3. Navigate to `http://localhost:8000/{versionName|nightly}` and use the demos
101+
4. Run `gulp demos` again whenever you change the demos
102+
103+
### Commit Conventions
104+
105+
* Uses these [commit conventions](http://github.com/ajoslin/conventional-changelog)
106+
107+
### Pushing New Release of Ionic
108+
109+
- Almost all of the logic for releasing Ionic is done on the Travis server
110+
- To push a new release:
111+
1. Update package.json version to new version
112+
2. Generate changelog with `gulp changelog`
113+
3. Go through the changelog, and fix any mistakes or clarify any unclear commit messages
114+
4. Commit package.json and CHANGELOG.md and push to master
115+
- Travis will detect that this commit changed the version in package.json and push out all necessary for this new release (tags, release files, site config, ...)
116+
117+
## LICENSE
118+
119+
Ionic is licensed under the MIT Open Source license. For more information, see the LICENSE file in this repository.

www/lib/ionic/bower.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"name": "ionic",
3+
"version": "1.1.0",
4+
"codename": "xenon-xerus",
5+
"homepage": "https://github.com/driftyco/ionic",
6+
"authors": [
7+
"Max Lynch <max@drifty.com>",
8+
"Adam Bradley <adam@drifty.com>",
9+
"Ben Sperry <ben@drifty.com>"
10+
],
11+
"description": "Advanced HTML5 hybrid mobile app development framework.",
12+
"main": [
13+
"release/css/ionic.css",
14+
"release/fonts/*",
15+
"release/js/ionic.js",
16+
"release/js/ionic-angular.js"
17+
],
18+
"keywords": [
19+
"mobile",
20+
"html5",
21+
"ionic",
22+
"cordova",
23+
"phonegap",
24+
"trigger",
25+
"triggerio",
26+
"angularjs",
27+
"angular"
28+
],
29+
"license": "MIT",
30+
"private": false,
31+
"ignore": [
32+
"**/.*",
33+
"CONTRIBUTING.md",
34+
"Gruntfile.js",
35+
"component.json",
36+
"config",
37+
"examples",
38+
"package.json",
39+
"release/js/angular",
40+
"release/js/angular-ui",
41+
"scripts",
42+
"test",
43+
"js/controllers",
44+
"js/ext",
45+
"js/utils",
46+
"js/views",
47+
"js/_license.js",
48+
"js/ionic.js"
49+
],
50+
"dependencies": {
51+
"angular": "1.4.3",
52+
"angular-animate": "1.4.3",
53+
"angular-sanitize": "1.4.3",
54+
"angular-ui-router": "0.2.13"
55+
}
56+
}

www/lib/ionic/circle.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
machine:
2+
node:
3+
version: v0.10.26
4+
ruby:
5+
version: 2.1.2
6+
checkout:
7+
post:
8+
# Make sure that the git repo that circleCI clones is not cloned shallow
9+
# (by default, it only clones the last 25 commits - aka shallow)
10+
# copy/pasted from circleCI support)
11+
- "[[ ! -s \"$(git rev-parse --git-dir)/shallow\" ]] || git fetch --unshallow"
12+
dependencies:
13+
post:
14+
- bower install
15+
test:
16+
override:
17+
- ./scripts/circle/test.sh --index=$CIRCLE_NODE_INDEX --total=$CIRCLE_NODE_TOTAL: {parallel: true}
18+
deployment:
19+
tasks:
20+
branch: master
21+
commands:
22+
- ./scripts/circle/deploy.sh --sha1=$CIRCLE_SHA1 --index=$CIRCLE_NODE_INDEX --build-number=$CIRCLE_BUILD_NUM: {parallel: true}

0 commit comments

Comments
 (0)