476e9ef236
fix(core): fix core files, use ng button
2017-05-24 14:21:48 -05:00
8244cd940b
Merge v4-alpha
2017-05-24 11:11:37 -05:00
3f2a753811
Merge branch 'master' into v4
...
# Conflicts:
# src/components/slides/swiper/swiper.ts
2017-05-24 10:50:58 -05:00
f6e4f88d5b
chore(gulp): update demos task to call app-scripts correctly
2017-05-23 11:52:42 -04:00
d2975c0ab0
chore(gulp): remove bonjour service
2017-05-22 12:20:58 -04:00
897ab203ab
fix(): change e2e.prod so that it copies the core files.
2017-05-19 16:25:37 -05:00
4bd292722f
fix(): corrected inclusion of bindings in e2e.prod process.
2017-05-19 15:52:35 -05:00
c89af152fa
fix(): ensure that all included components are ignored during the app-scripts processing.
2017-05-19 12:06:18 -05:00
4003b6f62b
chore(): ensure scripts match v4
2017-05-18 11:39:58 -05:00
e50dc31d93
Merge branch 'master' into v4
...
# Conflicts:
# README.md
# package.json
# src/components/action-sheet/action-sheet-component.ts
# src/components/badge/badge.scss
# src/components/card/card.ios.scss
# src/components/card/card.md.scss
# src/components/card/card.wp.scss
# src/components/scroll/scroll.scss
# src/components/scroll/scroll.ts
# src/components/scroll/test/basic/main.html
# src/components/slides/slides.scss
# src/components/slides/swiper/swiper-effects.ts
# src/components/slides/swiper/swiper-events.ts
# src/components/slides/swiper/swiper-parallax.ts
# src/components/slides/swiper/swiper.ts
# src/components/toggle/test/toggle.spec.ts
# src/components/toggle/toggle-gesture.ts
# src/components/toggle/toggle.ios.scss
# src/components/toggle/toggle.md.scss
# src/components/toggle/toggle.ts
# src/components/toggle/toggle.wp.scss
# src/themes/ionic.mixins.scss
2017-05-17 23:03:49 +02:00
db94ef606f
test(rtl): do not set dir to ltr by default, add reorder e2e
2017-05-12 16:43:33 -04:00
a30379bef6
feat(rtl): add rtl margin, padding, position and border-radius ( #11342 )
...
* refactor(item): replaced item-left with item-start
replaced item-right with item-end
* style(item): fix spacing
* fix(item): add backwards support for left/right in ng-content
* fix(item): deprecated old variables, not breaking change
* feat(rtl): padding mixin
* feat(rtl): change all padding variables to start/end
add support for old variable names
* feat(rtl): replace all padding-side with start/end
* revert(functions): remove mixins
* feat(scss): add padding-horizontal and rtl functions (thanks brandy)
* feat(padding): use padding horizontal mixin everywhere
* feat(padding): use padding horizontal mixin everywhere
* fix(lint): change properties order. tests passing
* fix(sass-functions): reorder functions to avoid warning
* fix(scss): fix variable name
* perf(rtl): add check if need rtl selector
* feat(scss): add full padding function
* feat(scss): add border-radius mixin
* fix(rtl): change border-radius to use mixin
* perf(scss): only override if has something to override
* feat(scss): add margin scss variables for sides
* feat(scss): add margin mixin
* fix(scss): fix wrong support for 2/3 args
* feat(rtl): spread margins/paddings
* feat(rtl): spread margins/paddings
* feat(position): add rtl support for absolute
* fix(rtl): add missing calls
* fix(item): old attributes deprecated support
* revert(changelog): not intended to be changed
* fix(sass-functions): and not &&
* fix(padding): merge + missing padding
* style(): remove newline
* refactor(mixins): move mixins to mixins file
* style(): fix alignment
* fix(item): right padding should not be set
* fix(): incorrect defaults
* feat(scss-lint): disable some side variables
* fix(scss): lint passes
* feat(lint): disabled text-align
* fix(): correct variable name
* fix(fab): missed a comma
* fix(rtl): rtl method incorrect for multiple selectors
* fix(rtl): toolbar bad merge
* fix(rtl): icon-only is in px not em
* fix(rtl): toggle padding
* feat(rtl): correct notation for rtl custom
* Merge branch 'breaking-item' into start-end
# Conflicts:
# src/components/checkbox/checkbox.ios.scss
# src/components/checkbox/checkbox.md.scss
# src/components/checkbox/checkbox.wp.scss
# src/components/item/item.ios.scss
# src/components/item/item.md.scss
# src/components/item/item.wp.scss
# src/components/radio/radio.ios.scss
# src/components/radio/radio.md.scss
# src/components/radio/radio.wp.scss
# src/components/toggle/toggle.ios.scss
# src/components/toggle/toggle.md.scss
# src/components/toggle/toggle.wp.scss
* fix(scss): fix for deprecated usages
2017-05-12 13:05:45 -04:00
700e4c2479
chore(ci): sync paralell demo builds via s3
2017-05-10 14:28:55 -05:00
1d435bfd95
docs(snapshot): missing vital info ( #11502 )
...
* docs(snapshot): depends on java jdk as well
* docs(snapshot): only works on a retina mac
* docs(snapshot): move explanation out of setup
* docs(snapshot): only for mac
2017-05-05 01:29:08 +02:00
877829b933
chore(e2e): adds bonjour support
2017-05-04 22:05:57 +02:00
5d472982dd
Merge branch 'master' into v4
2017-05-03 14:03:57 -05:00
d350ddc175
chore(CI): fixing API demo links
2017-05-03 12:20:32 -05:00
10dca2d574
chore(build): update core build
2017-05-03 11:21:38 -05:00
2b2f23b71a
Merge branch 'master' into v4
2017-05-03 10:50:18 -05:00
27a70fbdd8
chore(e2e): add domCount() perf tool
2017-05-03 14:51:07 +02:00
8d335b26b8
chore(build): pass project root
2017-05-02 21:59:59 -05:00
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
