5 Commits

Author SHA1 Message Date
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
8570d4396c some action bar fixes 2021-01-05 10:40:21 +01:00
9a380cd43e fix(core): prevent circular reference Frame <> Page (#9111) 2020-12-30 07:58:14 -08:00
3accdb3f06 fix: prevent circular reference && Cannot access … before initialization 2020-12-18 09:25:30 +01:00
020ad4da37 chore(core): monorepo, esm targeting, improved management (#8707) 2020-08-25 20:00:59 -07:00