Skip to content

chore: merge release in master #1826

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 198 commits into from
May 18, 2019
Merged

chore: merge release in master #1826

merged 198 commits into from
May 18, 2019

Conversation

SvetoslavTsenov
Copy link
Contributor

No description provided.

ErjanGavalji and others added 30 commits May 5, 2016 10:02
@ErjanGavalji
Init
5341635
Initial commit
a0f043c
Remove README.md
5e94c37
Update to RC1
27b4e0a
Minor tweaks
b426420
Update .vscode
86c1189
Fix router-outlet
8c7775b
Update to 0.1.3
580f920
Add action-bar test components
9537a4b
Update to 0.1.6
5ae516f
Update ActionBar Components
be82e7b
Add automationText properties
6692dc3
@SvetoslavTsenov
Include binding test page
2d2970e
Clean up ActionBar test
260162d
Merge pull request #1 from NativeScript/act-bar
426f25a 
Clean up ActionBar test
@SvetoslavTsenov
Change automationText
0aec282
Update Main Component
bdb1430
@SvetoslavTsenov
Include test pages for ListView
5882000
@SvetoslavTsenov
Merge branch 'master' of https://github.com/NativeScript/tests-app-ng
09ccd73 
# Conflicts:
#	app/main/main-page-router-outlet.ts
Modal dialogs page
0f73c13
Template file renamed: XML to HTML
9a4f0a3
Async show added
9c246b0
@SvetoslavTsenov
Merge branch 'master' of https://github.com/NativeScript/tests-app-ng
2b264c9 
# Conflicts:
#	app/binding/binding-page.html
#	app/binding/binding-page.ts
#	app/main/main-page-router-outlet.ts
@SvetoslavTsenov
Merge branch 'master' of https://github.com/NativeScript/tests-app-ng
2976131
@SvetoslavTsenov
Update main-page-router-outlet
e422b93
Correct tns-android version
d9a3fe9
@SvetoslavTsenov
Include automationText property for listViewExamples
7abb1bd
@SvetoslavTsenov
Update binding-page
8c1242c
@SvetoslavTsenov
Update tests-app-ng to use new nativescript-angular/router-dapricated
1a5dcb1
migrate to rotuer v3
cdbbff4
SvetoslavTsenov and others added 23 commits November 20, 2018 12:36
@SvetoslavTsenov
chore: update images
2006f26
@SvetoslavTsenov
chore: include images for iphone XR
2744688
@SvetoslavTsenov
tests: include more images for iPhone XR
4ac4f6b
chore: update community files
3a1a283
Delete LICENSE.proui
7ac2a91
Merge pull request #6 from NativeScript/radeva/update-license
5101ebb 
update LICENSE
@dtopuzov
chore: update durations
7661cff
@etabakov
chore: update community files
3c54ec9
@etabakov
Merge pull request #7 from NativeScript/etabakov/update-license-year
65aeb13 
update LICENSE year
@ADjenkov
fix(api): change location strategy API method name (#40)
8531ca8
@elena-p
chore: update short imports (#41)
b51cb12 
* chore: update short imports

* remove FontAwesome import
@SvetoslavTsenov
tests: add mochawesome reporter
c796a11
@SvetoslavTsenov
tests: update deps
d753aff
@SvetoslavTsenov
tests: fix uitests for UIAutomator2
75ca827
@SvetoslavTsenov
tests(router): add afterEach
3cf035f
@SvetoslavTsenov
Add 'e2e/animation-examples/' from commit '75ca8272e8a4d2b448e5101123…
190780e 
…27e06d9bb70bdd'

git-subtree-dir: e2e/animation-examples
git-subtree-mainline: 3cf035f
git-subtree-split: 75ca827
@SvetoslavTsenov
Add 'e2e/routable-animations/' from commit '274468855154d9262d0df1895…
efd4ef6 
…7e8611f84873ad6'

git-subtree-dir: e2e/routable-animations
git-subtree-mainline: 190780e
git-subtree-split: 2744688
@SvetoslavTsenov
Add 'e2e/tests-app-ng/' from commit 'b51cb126f580a2a2ae7944b18d7a10ec…
76b0f55 
…7ba2ea13'

git-subtree-dir: e2e/tests-app-ng
git-subtree-mainline: efd4ef6
git-subtree-split: b51cb12
@SvetoslavTsenov
tests: include animations , routable animations and tests-ap-ng
59306e6
@SvetoslavTsenov
release: update 7.2.4 release change log
237b78f
@elena-p
Merge pull request #1814 from NativeScript/release-7.2.4
a3c1200 
release: update 7.2.4 release change log
@SvetoslavTsenov
Merge pull request #1821 from NativeScript/svetoslavtsenov/move-tests…
d8c097c 
…-apps-in-e2e-folder

tests: move tests apps in e2e folder
@SvetoslavTsenov
Merge remote-tracking branch 'origin/master' into merge-release-in-ma…
2aca49b 
…ster
@SvetoslavTsenov SvetoslavTsenov requested a review from dtopuzov May 17, 2019 20:24
@cla-bot
Copy link

cla-bot bot commented May 17, 2019

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Vasil Chimev, vchimev.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email [email protected]
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@SvetoslavTsenov
Copy link
Contributor Author

test

@SvetoslavTsenov SvetoslavTsenov merged commit 418aff2 into master May 18, 2019
@SvetoslavTsenov SvetoslavTsenov deleted the merge-release-in-master branch May 18, 2019 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtopuzov dtopuzov dtopuzov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@SvetoslavTsenov @dtopuzov @ErjanGavalji @hdeshev @sis0k0 @tbozhikov @MartoYankov @ADjenkov @etabakov @elena-p