cae0c0e050
Merge branch 'master' into v4
...
# Conflicts:
# package.json
# src/components/badge/badge.scss
# src/components/slides/slides.scss
2017-05-02 12:55:07 -05:00
94e54eed98
chore(scripts): update build
2017-05-02 12:53:32 -05:00
272893278d
docs(): update Ionic 2 to Ionic
...
Closes #11409
It's just Ionic
2017-05-01 14:33:39 -04:00
5199b826c8
Merge branch 'master' into v4
...
# Conflicts:
# src/components/toggle/toggle.ts
2017-04-28 23:30:33 -05:00
ee3d943116
chore(gulp): add a new task that opens the built prod e2e test
2017-04-28 13:55:24 -04:00
dfdcf2003d
fix(build): update angular build process
2017-04-26 15:26:25 -05:00
9a533f430f
Merge master
2017-04-21 03:33:13 -05:00
afc9b36c5d
chore(CI): Updating ionicframework homepage automatically on release
2017-04-19 11:16:42 -05:00
5809444aaf
chore(tasks): add v4 build tasks
2017-04-18 15:31:13 -05:00
f88823a30f
fix(navcontroller): lazy loading is queued
2017-04-18 20:55:41 +02:00
4fa17a2f59
chore(templates): change to IonicPageModule
2017-04-12 13:52:56 -05:00
a900c4e508
fix(templates) replace IonicModule with IonicPageModule ( #11077 )
2017-04-07 08:18:14 -05:00
8e438634a2
chore(gulp): preserve color of app-scripts
2017-04-06 23:46:58 +02:00
9316f73b81
chore(demos): send demos to content/docs/demos/src not …/src/src
2017-04-05 13:49:12 -05:00
44f36c4509
chore(CI): upgrade to Circle CI v2 and leverage multiple containers for demo builds ( #10991 )
...
* trying Circle CI v2
* paths are fun
* seeing how long a demos build takes
* Batching Demo builds
* testing demo builds on CI2
* batches count from 0
* ok, looks good. preparing for master branch
* forgot `production=true` flag. let’s test that quick.
* forgot to save the file
* making sure that docs are still copied over to ionic-site in the deploy phase
* getting ready for the PR again
2017-03-30 21:32:29 -05:00
41e34fc4ce
chore(docs): moving docs from /docs/v2 to /docs
2017-03-29 11:00:52 -05:00
54acc74fdb
refactor(packaging): points to es5 code with es2015 import/header, points to umd cod
...
points to es5 code with es2015 import/header, points to umd code, points to
pure es2015 code
2017-03-27 16:42:01 -05:00
3819740998
Update ts.tmpl
2017-03-27 16:18:12 -05:00
43de89f096
chore(dependencies): remove unused dependencies, update app scripts
2017-03-27 16:03:36 -04:00
5974dcea9e
docs(demos): update paths for fonts and stylesheet
2017-03-27 13:33:47 -04:00
93cfa17638
chore(demos): make sure version file is generated before demo gen
2017-03-23 18:06:07 -05:00
af6b54cda6
chore(templates): clean up generator templates
2017-03-23 11:09:25 -05:00
d04650c130
chore(templates): update component templates
2017-03-23 10:59:06 -05:00
4b9f673594
chore(templates): entryComponents are not needed with code splitting
2017-03-22 13:39:55 -05:00
09b01baa4e
chore(templates): clean up templates for new generators
2017-03-22 13:37:40 -05:00
a63f760786
chore(e2e): remove experimental deeplink arg, add deepLinksDir
2017-03-21 21:19:31 -05:00
daab927fbd
chore(readme): update readme for e2e tests with concurrency and dev flags
2017-03-21 12:09:32 -05:00
e1617c1433
chore(build): fix early return
2017-03-21 16:32:51 +01:00
042f698555
Merge branch 'master' into 3.0
...
# Conflicts:
# src/components/action-sheet/test/basic/pages/page-one/page-one.ts
# src/components/alert/alert.ts
# src/components/content/content.ts
# src/components/datetime/datetime.ts
# src/components/datetime/test/datetime.spec.ts
# src/components/loading/loading.ts
# src/components/modal/test/basic/app.module.ts
# src/components/picker/picker-component.ts
# src/components/toast/toast.ts
# src/components/toolbar/toolbar.ios.scss
# src/components/toolbar/toolbar.md.scss
# src/components/toolbar/toolbar.wp.scss
# src/components/virtual-scroll/test/basic/app.module.ts
# src/util/util.ts
2017-03-20 18:07:38 -04:00
b56b0e8105
chore(templates): change from deeplink to IonicPage
2017-03-20 14:04:51 -05:00
fbed3c5b04
chore(e2e): catch errors from app-scripts to continue
...
also return empty array so that if the exact folder isn’t matched it
won’t continue to filter and run tests. For example, if you pass
`--f=toolbar/color` it will error because that doesn't exist, but still
tries to run `toolbar/colors`.
2017-03-17 11:06:46 -04:00
da8ce042b6
chore(templates): directive template
2017-03-16 15:44:33 -05:00
960e529b43
chore(demos): remove unused code and add concurrency arg
2017-03-16 15:56:43 -04:00
ae56039ba1
chore(e2e): log an error if the test doesn't exist, add concurrency arg
...
- If the e2e test doesn’t exist then throw an error
- Don’t log anything if no tests are being built
- Add concurrency arg to change the number of tests being ran at once
2017-03-16 15:56:43 -04:00
06b388bb68
chore(templates): update tabs templates for 3.0
2017-03-15 15:15:41 -05:00
305848274d
chore(templates): wip: update templates for 3.0
2017-03-15 15:09:46 -05:00
5d668036e6
chore(templates): modify tabs template to code-split
2017-03-15 14:54:17 -05:00
06246df3ce
chore(build): fix to ensure all unit tests are run independent of state of dist directory
2017-03-14 16:08:15 -05:00
396f891f33
chore(docs): updating dgeni typescript package
2017-03-14 14:50:31 -05:00
0964c850d4
test(e2e): refactor e2e to use deeplink decorator, lazy load more pages
2017-03-11 00:15:38 -06:00
c90fcb07e7
chore(e2e): add --dev option to e2e.prod to speed up builds for faster but less thorough verification
2017-03-09 12:13:36 -06:00
1d68d1f91f
chore(npm): update ionic-angular readme to remove 2.x
2017-03-08 15:46:35 -05:00
0d32e5e791
chore(gulp): updates to build process to use app-scripts for watch/build
...
updates to build process to use app-scripts for watch/build
2017-03-02 14:28:15 -06:00
555519da62
chore(deps): update to Angular 2.4.8
...
* chore(angular): update to latest stable angular
* chore(deps): update app-scripts
* chore(deps): sw-toolbox
* chore(deps): bump to 1.1.1 app-scripts
* chore(deps): abc order sw-toolbox
* chore(deps): update to angular 2.4.8
* chore(build): pass appNgModule path to app-scripts, make run AoT instead of Prod when using --debug
pass appNgModule path to app-scripts, make run AoT instead of Prod when using --debug
2017-02-21 16:43:38 -06:00
38717155a8
chore(docs): it’s not 2.0.0-nightly, it’s just “nightly”
2017-02-21 10:58:35 -06:00
f50697bf5c
chore(release): add prompt for release to select release type ( #10244 )
...
* chore(release): add inquirer to prompt for release
* chore(release): wip get release working again and test
also adds nightly back in
* chore(release): WIP remove commented code
2017-02-02 18:26:07 -05:00
7f304edcf9
chore(docs): alphabetize class members in docs
2017-02-01 11:44:09 -06:00
2d4a998993
chore(release): update to increment major version
2017-01-25 11:26:46 -05:00
40b5ecba3b
chore(sass): update import path for ionic
2017-01-23 15:15:33 -05:00
091545e8c5
chore(e2e): update tests to remove component name strings
2017-01-23 14:35:23 -05:00
