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

Merge Dev to Master #784

Merged
merged 35 commits into from Jun 25, 2018
Merged

Merge Dev to Master #784

merged 35 commits into from Jun 25, 2018

Conversation

hemantjadon
Copy link
Contributor

Changes proposed in this pull request

  • Merge the stable dev branch to master

simsausaurabh and others added 30 commits June 1, 2018 22:54
@simsausaurabh
Fixes #731: Update README and travis to work on development branch
a6571a0
@hemantjadon @mariobehling
(deps): Dependency Update (#734)
e4b3869
@hemantjadon
Merge pull request #733 from simsausaurabh/updatebranchPolicy
9594abf 
Fixes #731: Update travis & docs, and remove automatic deployment to gh-pages branch
@simsausaurabh @mariobehling
Fixes #735: Fix security vulnerabilities and module deprecation (#736)
1f006d7
@praveenojha33
Parent #738:Fixed issue of service box.
9c3fe06
@hemantjadon
Merge pull request #739 from praveenojha33/serv-box
90003f1 
Parent #738:Fixed issue of service box.
@simsausaurabh
Parent #738: Fix CSS issues in development
e7f4f06
@hemantjadon
Merge pull request #740 from simsausaurabh/fixDevUi
b30a3ce 
Parent #738: Fix CSS issues in development
@debck @mariobehling
Update README.md (#745)
c75be17
@simsausaurabh @mariobehling
Fixes #732: Create automatic deployment of development branch on surge (
2164e70 
#737)
@simsausaurabh
Fixes #743: Create Action, Reducer and Effect for changing Title
4090e32
@hemantjadon
Merge pull request #747 from simsausaurabh/newbranch
f395efb 
Fixes #743: Create Action, Reducer and Effect for changing Title
@simsausaurabh @singhpratyush
Fixes #750: Complete development branch deployment on surge (#751)
e56334a
@simsausaurabh @mariobehling
Fixes #738: Fix 'No results after upgrading to latest version' (#749)
ef5ec9d
@simsausaurabh @mariobehling
Fixes #748, #712: Add label for travis build and fix dependency label (…
2559bbd 
…#752)
@simsausaurabh @mariobehling
Fixes #188, #333, #543: Fix missing sidebar and improve results (#754)
0d691dc
@simsausaurabh @mariobehling
Fixes #755: Repeating data in sidebar, and Adress: #716 console errors (
d805efb 
#756)
@simsausaurabh @mariobehling
Fixes #761: Use Title Action to set Media-Wall title (#762)
7066c31
@simsausaurabh @mariobehling
Fixes #759: Show results on clicking Enter (#763)
59c45b7
@simsausaurabh
Fixes #760: Constantly searching while typing query on results page
795dfae
@simsausaurabh @mariobehling
Fixes #764: Add new test for reg-exp utility to increase test coverage (
e465db7 
#765)
@simsausaurabh @mariobehling
Fixes #724: Push search data to server using api/push.json (#753)
cb39145
@simsausaurabh @mariobehling
Fixes #767: Remove excessive unused imports, variables and declaratio…
202d1d1 
…ns (#768)
@simsausaurabh
Merge branch 'development' into typingQuery
f99ac8d
@simsausaurabh @mariobehling
Addresses #758: Fix Service Box mat-icon (#769)
4cf8a0e
@simsausaurabh @mariobehling
Fixes #46: Implement news sub tab with results from news organizations (
52d279b 
#770)
@simsausaurabh @mariobehling
Addresses #758: Fix Tools & Views tab and position of Suggestion Box (#…
85781a1 
…771)
@Orbiter
Merge pull request #766 from simsausaurabh/typingQuery
7872255 
Fixes #760: Constantly searching while typing query on results page
@simsausaurabh @mariobehling
Fixes #774: Fix Codacy issues (#775)
5023427
@simsausaurabh @mariobehling
Fixes #772: Replace all instance of Title property with titleAction (#…
c4b478d 
…773)
@codecov
Copy link

codecov bot commented Jun 25, 2018 •
edited

Codecov Report

Merging #784 into master will decrease coverage by 1.76%.
The diff coverage is 47.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #784      +/-   ##
==========================================
- Coverage   53.41%   51.65%   -1.77%     
==========================================
  Files         107      105       -2     
  Lines        2881     2565     -316     
  Branches      374      283      -91     
==========================================
- Hits         1539     1325     -214     
+ Misses       1218     1210       -8     
+ Partials      124       30      -94
Impacted Files Coverage Δ
src/app/app-masonry/brick.ts 44.44% <ø> (ø) ⬆️
src/app/reducers/media-wall-design.ts 41.66% <ø> (ø) ⬆️
src/app/actions/suggest.ts 100% <ø> (ø) ⬆️
src/app/actions/media-wall-design.ts 52.38% <ø> (ø) ⬆️
src/app/reducers/user-query.ts 72.72% <ø> (ø) ⬆️
src/app/reducers/suggest.ts 100% <ø> (ø) ⬆️
src/app/reducers/speech.ts 70% <ø> (ø) ⬆️
src/app/lazy-img/lazy-img.component.ts 76.56% <ø> (+4.68%) ⬆️
src/app/shared/countrycode/countrycode.ts 100% <ø> (ø) ⬆️
src/app/app-masonry/index.ts 100% <ø> (ø) ⬆️
... and 103 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7eaf03f...5be6651. Read the comment docs.

simsausaurabh
simsausaurabh approved these changes Jun 25, 2018
View reviewed changes
Copy link
Member

@simsausaurabh simsausaurabh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@singhpratyush
Copy link
Member

I'm not sure why this can't be fast-forwarded.

@singhpratyush singhpratyush merged commit 5be6651 into master Jun 25, 2018
@singhpratyush
Copy link
Member

Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@singhpratyush singhpratyush singhpratyush approved these changes

@simsausaurabh simsausaurabh simsausaurabh 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.

None yet
6 participants
@hemantjadon @singhpratyush @simsausaurabh @praveenojha33 @debck @Orbiter