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.

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

bring develop to feature branch #628

Merged
merged 490 commits into from
Jun 14, 2019
Merged

bring develop to feature branch #628

merged 490 commits into from
Jun 14, 2019

Conversation

evereq
Copy link
Member

@evereq evereq commented Jun 14, 2019 •
edited
Loading

Please note: we will close your PR without comment if you do not check the boxes above and provide ALL requested information.

AlishMekliov931 and others added 30 commits April 18, 2019 18:13
@AlishMekliov931
fix(ever-api): fixed bug with start on SocketIO server
9c5c15f
@evereq
Merge pull request #437 from ever-co/feature/EV-1217/logout-redirection
3275fc2 
Feature/ev 1217/logout redirection
@evereq
Merge pull request #439 from ever-co/develop
e12200b 
Develop
@evereq
Update README.md
f875deb
@evereq
fix: switch carrier default port to 4203
7db4300
@closedspace
feat(ever-admin): added new page and track button
9260465
@greenkeeper
fix(package): update @ionic-native/google-maps to version 5.5.0
378466e
@greenkeeper
fix(package): update @ionic-native/google-maps to version 5.5.0
687b94b
@greenkeeper
fix(package): update @ionic-native/google-maps to version 5.5.0
e460e69
@greenkeeper
chore(package): update lockfile shop/mobile-ionic/package-lock.json
5433731
@evereq
Merge pull request #440 from ever-co/greenkeeper/default/@ionic-nativ…
67b06e5 
…e/google-maps-5.5.0

Update @ionic-native/google-maps in group default to the latest version 🚀
@evereq
chore: enable TS watch, updates lock files
6ae4e55
@evereq
Update README.md
e67d563
@evereq
chore: add start for server with watch for changes
d61abe4
@evereq
Merge pull request #459 from ever-co/develop
e226d09 
Develop
@deepaksslibra @evereq
Draft Storybook Integration (#462)
1ad160b
@evereq
chore: lots of packages updates
a3cd846
@evereq
refactor: tiny fixes / improvements
03b1286
@evereq
fix: attempt to fix core-js v3 related issues
6d4095a
@evereq
fix: few more fixes for core-js v3
6581450
@evereq
fix: storybook needs TranslateService provider & refactoring
2c20359
@greenkeeper
fix(package): update ionic-selectable to version 4.4.1
ba1018e
@greenkeeper
chore(package): update lockfile merchant/tablet-ionic/yarn.lock
2743a29
@greenkeeper
chore(package): update @nestjs/typeorm to version 6.1.0
8271749
@greenkeeper
fix(package): update @nestjs/typeorm to version 6.1.0
6b8cf39
@greenkeeper
chore(package): update lockfile yarn.lock
e17b0d1
@greenkeeper
chore(package): update lockfile backend/api/yarn.lock
c6cac23
@evereq
Merge branch 'develop' into greenkeeper/default/@nestjs/typeorm-6.1.0
1186ff4
@evereq
Merge pull request #466 from ever-co/greenkeeper/default/@nestjs/type…
d5faa90 
…orm-6.1.0

Update @nestjs/typeorm in group default to the latest version 🚀
@evereq
Merge pull request #465 from ever-co/greenkeeper/default/ionic-select…
3b0f33b 
…able-4.4.1

Update ionic-selectable in group default to the latest version 🚀
AlishMekliov931 and others added 27 commits June 7, 2019 11:56
@AlishMekliov931
chore(ever-shop-mobile): completed upgrade to angular 8
b23bb8c
@AlishMekliov931
chore(ever-shop-web): completed upgrade to angular 8
05af957
@AlishMekliov931
chore(ever-admin): not completed upgrade to angular 8
015bedb
@AlishMekliov931
fix(ever-admin): fix error on login page
7b7217b
@evereq
Merge pull request #616 from ever-co/feature/update-to-Angular-8
04be457 
All Feature/update to angular 8
@dependabot
chore(deps): bump ecstatic from 3.3.1 to 3.3.2 in /shop/website-angular
b3dc371 
Bumps [ecstatic](https://github.com/jfhbrook/node-ecstatic) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/jfhbrook/node-ecstatic/releases)
- [Changelog](https://github.com/jfhbrook/node-ecstatic/blob/3.3.2/CHANGELOG.md)
- [Commits](jfhbrook/node-ecstatic@3.3.1...3.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
@evereq
Merge pull request #619 from ever-co/dependabot/npm_and_yarn/shop/web…
4ff6ee6 
…site-angular/ecstatic-3.3.2

chore(deps): bump ecstatic from 3.3.1 to 3.3.2 in /shop/website-angular
@closedspace
feat(ever-admin): added map component
7bfea5f
@closedspace
feat(ever-shop-web): added map icons, map button, fixed images
f53a22f
@closedspace
feat(ever-shop-web): removed obsolete button, fixed spacing
f381781
@evereq
Merge pull request #544 from ever-co/feature/EV-1150-improvements-to-…
ac3ad9c 
…orders-page

feat(ever-shop-web): fixed text overlap
@closedspace
fix(ever-shop-web): fix build error
f730e5f
@greenkeeper
chore(package): update typescript-tslint-plugin to version 0.5.0
3d9b9cd
@greenkeeper
chore(package): update lockfile admin/website-angular/yarn.lock
0bb4d11
@evereq
Merge pull request #621 from ever-co/greenkeeper/default/typescript-t…
31bb117 
…slint-plugin-0.5.0

Update typescript-tslint-plugin in group default to the latest version 🚀
@evereq
chore: add snyk
06eb14f
@evereq
Merge branch 'develop' of github.com:ever-co/ever into develop
010bb51
@evereq
chore: fix CircleCI config
c7f9042
@AlishMekliov931
fix(ever-admin): fixed header and side-menu EV-1240
6dd2907
@AlishMekliov931
fix(ever-admin): fixed dashboard style EV-1240
28997b5
@AlishMekliov931
fix(ever-admin): fixed all pages style with default theme EV-1240
76de6bf
@evereq
Merge pull request #626 from ever-co/feature/update-to-Angular-8
5e2e7b1 
Feature/update to angular 8
@AlishMekliov931
style(ever-admin): fixed lot of buttons EV-1240
cedbfd9
@AlishMekliov931
style(ever-admin): fixed all buttons EV-1240
281f139
@AlishMekliov931
style(ever-admin): lost style fixing EV-1240
7722434
@AlishMekliov931
fix(ever-admin): a lot of fixings EV-1240
ca2377e
@evereq
Merge pull request #627 from ever-co/feature/update-to-Angular-8
273f14a 
Feature/update to angular 8
@CLAassistant
Copy link

CLAassistant commented Jun 14, 2019 •
edited
Loading

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 6 committers have signed the CLA.

✅ AdemHodzic
✅ AlishMekliov931
✅ jew-er
✅ evereq
❌ dependabot[bot]
❌ greenkeeper[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@evereq evereq merged commit f00eef0 into feature-EV-1154-delivery-areas Jun 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@evereq @CLAassistant @BlagovestGerov @AlishMekliov931 @closedspace @deepaksslibra @deecoded @snyk-bot @AdemHodzic