Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master onto 6.0.x branch (Angular 7 update) #403

Merged
merged 33 commits into from
Dec 15, 2018

Conversation

sinedied
Copy link
Member

I have put a separate branch for this as some fixes are needed due to TS 3 update on the Ionic part.

Seems like we need to wait for the next Ionic beta that may fix typings issues until this can be merged (and first 6.0.0-beta released) :/

LuisReinoso and others added 25 commits October 11, 2018 22:51
…emoval

Updated to cordova-plugin-ionic-keyboard in place of deprecated keyboard plugin
Added redirect to previously saved url after login, if you are not authenticated.
Migrated generator code base to xo + prettier and async/await
- Added no redundant jsdoc tslint rule
- Removed redundant jsdoc type annotations
- Fixed deprecated forRoot() NgbModule init
Updated tslint rules, polyfills and some fixes
# Conflicts:
#	generators/app/templates/_package.json
#	generators/app/templates/src/app/_app.component.spec.ts
#	generators/app/templates/src/app/_app.component.ts
#	generators/app/templates/src/app/_app.module.ts
#	generators/app/templates/src/theme/__ionic.theme-variables.scss
@sinedied sinedied changed the title Feature/merge master Merge master onto 6.0.x branch (Angular 7 update) Oct 30, 2018
@sinedied sinedied changed the base branch from master to release/6.0.x October 30, 2018 08:49
@sinedied
Copy link
Member Author

sinedied commented Nov 6, 2018

With Ionic beta15, should be good 😃

@sinedied sinedied mentioned this pull request Nov 16, 2018
8 tasks
@captaincaius
Copy link
Contributor

FYI I made a PR towards this branch for easy review here: #411

The good news is that their new tabs seem a lot less buggy for our use case compared to before. The bad news, as I mentioned in the PR...

  1. (minor) for some weird reason the first "selectedTab" property update doesn't do anything... console logs show it's being passed exactly the same way, so it's probably a bug I need to report to them again.
  2. (showstopper) e2e is still broken because of beta-13 regression - can't sendKeys to ion-inputs from protractor e2e test ionic-team/ionic-framework#15956 >.< chances are high that the other loading controller bug is still there too.

@sinedied
Copy link
Member Author

Spent all day on it, but found a workaround for Ionic e2e issue 🎉

@sinedied
Copy link
Member Author

Hopefully this will allow merging, then after that we can start polishing the Ionic templates and ironing out small issues to prepare for release 😄

FYI Ionic 4 is expected early January for a final version

@captaincaius
Copy link
Contributor

Wow bravo! Snazzy! :)

So does this mean the loading controller test issue snuck away too? I didn't see a change related to it.

@captaincaius
Copy link
Contributor

\o/ looks like the ionic builds are passing! cool!

@sinedied sinedied merged commit b535d22 into release/6.0.x Dec 15, 2018
@sinedied sinedied deleted the feature/merge-master branch December 15, 2018 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants