|
|
37c8a846c7
|
Merge branch 'master' of github.com:NativeScript/NativeScript
# Conflicts:
# .gitignore
# apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml
# apps/ui/src/tabs/main-page.ts
# apps/ui/src/tabs/swipe-disabled-page.xml
# apps/ui/src/tabs/tabs-position-page.xml
# package.json
# packages/core/package.json
# packages/core/ui/core/view-base/index.d.ts
# packages/core/ui/core/view-base/index.ts
# packages/core/ui/core/view/index.android.ts
# packages/core/ui/tabs/index.android.ts
# packages/core/ui/tabs/index.ios.ts
# packages/core/ui/tabs/tabs-common.ts
|
2021-01-19 13:44:42 +01:00 |
|
|
|
4690162384
|
fix(android): BottomNavigation fragment child already has a parent (#9148)
closes https://github.com/NativeScript/NativeScript/issues/8132
closes https://github.com/NativeScript/NativeScript/issues/7901
closes https://github.com/NativeScript/NativeScript/issues/9051
closes https://github.com/NativeScript/NativeScript/issues/8251
|
2021-01-17 09:21:33 -08:00 |
|
|
|
e0b90396bc
|
Merge branch 'frame_nav_events' of github.com:Akylas/NativeScript
# Conflicts:
# apps/automated/src/test-runner.ts
# packages/core/css/parser.ts
# packages/core/global-types.d.ts
# packages/core/ui/bottom-navigation/index.android.ts
# packages/core/ui/styling/style-scope.ts
# packages/core/ui/tabs/index.android.ts
# packages/core/ui/tabs/index.ios.ts
|
2020-11-12 10:02:51 +01:00 |
|
|
|
c1f231d88e
|
chore: fix eslint issues (#9017)
|
2020-11-11 08:46:36 -08:00 |
|
|
|
7fadab1dc8
|
Merge branch 'master' of github.com:NativeScript/NativeScript
# Conflicts:
# package.json
# packages/core/tsconfig.lib.json
# packages/core/ui/frame/index.android.ts
# packages/core/ui/tabs/index.ios.ts
|
2020-10-28 09:46:54 +01:00 |
|
|
|
e6fc8784e1
|
fix: android cleanup after new fragment handling
|
2020-10-27 21:00:10 +01:00 |
|
|
|
2243660080
|
feat(core): TypeScript 4 + cleanup (#8967)
|
2020-10-19 09:28:05 -07:00 |
|
|
|
03f1f3d5f5
|
chore: format and fix ci build
|
2020-09-25 15:58:39 -07:00 |
|
|
|
020ad4da37
|
chore(core): monorepo, esm targeting, improved management (#8707)
|
2020-08-25 20:00:59 -07:00 |
|
