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

Master merge to dev #321

Merged
merged 29 commits into from
Oct 7, 2020
Merged

Master merge to dev #321

merged 29 commits into from
Oct 7, 2020

Conversation

tarjeieo
Copy link
Member

@tarjeieo tarjeieo commented Oct 7, 2020 •
edited by olemp
Loading

Your checklist for this pull request

  • Make sure you are requesting to pull a topic/feature/bugfix branch (right side). Don't request your master!
  • Make sure you are making a pull request against the dev branch (left side). Also you should start your branch off dev.
  • Check the commit's or even all commits' message
  • Check your code additions will fail linting checks
  • Remember: After PR is closed, add PR description to Changelog

Description

Merging commits from master branch into dev since they are missing from the dev branch

How to test

Build new release and test everything again.

Relevant issues (if applicable)

💔Thank you!

olemp and others added 29 commits May 22, 2020 14:28
@olemp
Not using refiners from search anymore in PortfolioOverview, retrievi…
c85eb9d 
…ng the values from the current collection instead (#244)
@olemp
Updated CHANGELOG #244
4dd8736
@olemp
Syntax in fetchDataForView #244
8a504f5
@olemp
Synchronize web title to Project list at portal root (#248)
7d061bd
@olemp
Pull request template based on angular-translate (#250)
25f51ad
@olemp
Template Standardmal: Disabling content types for Prosjektlogg (#249)
571a403
@olemp
Improvements to document template selector component #251 (#252) (#252)
ee9ad90 
Co-authored-by: Ole Martin Pettersen <OleMartin@Oles-MacBook-Pro.local>
@tarjeieo @olemp
Browser support
6d6fdbc
@Remi749 @olemp
Readme grammar and markdown formatting
4f2b450
@Remi749 @olemp
Minor readme header bugfix
8c7e9fe
@tarjeieo @olemp
#266 Cleanup: Remove lists 'Information' and 'Milestones'
74831a4
@Petterandre @olemp
Removed "Add to portfolio" on Opportunities and Fixed readme (#270)
bf7b741 
* Removed "Add to portfolio" on Opportunities and Fixed readme

* Update README.md

Co-authored-by: Petter <petter.braten@puzzlepart.com>
Co-authored-by: Ole Martin Pettersen <olemp@puzzlepart.com>
@olemp
Create pr_build_release
84e7ae4
@olemp
Rename pr_build_release to pr_build_release.yml
cae8950
@olemp
Update pr_build_release.yml
e3de5ad 
Fixed error in yml syntax
@olemp
Delete pr_build_release.yml
f6cce20
@olemp
Customizable flexible width for project properties in status sections (…
24c0399 
…#272)

* Removed tslint from ProjectWebParts (it's being deprecated)

* Flex adjustments for ProjectPropertiesSection

* Customizable width for project properties in status sections

* Minor adjustment
@olemp
Create stale.yml
cccf41d
@olemp
Update CHANGELOG.md
1fbe0a1
@olemp
1.2.1
a1af0af
@olemp
Delete stale.yml
4923328
@olemp
Merge branch 'master' of https://github.com/Puzzlepart/prosjektportal…
f4d92ac 
…en365
Merge branch 'dev'
b284e59
@olemp
1.2.2
96e77e0
@olemp
Merge dev into master
b7270e3
@olemp
1.2.2
303230a
@olemp
Merge branch 'dev' into master (v1.2.3)
b321c27
@Remi749
Update PR template, changelog and create new issue template for release
29b827a
@tarjeieo
Merge pull request #318 from Puzzlepart/dev
ace6122 
Dev to master
@tarjeieo tarjeieo requested a review from olemp October 7, 2020 13:43
olemp
olemp approved these changes Oct 7, 2020
View reviewed changes
Copy link
Collaborator

@olemp olemp left a comment

Choose a reason for hiding this comment

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

Looks good! Always build releases from master branch.

@tarjeieo tarjeieo merged commit 399fe65 into dev Oct 7, 2020
@tarjeieo tarjeieo deleted the master branch October 7, 2020 14:16
@tarjeieo tarjeieo restored the master branch October 7, 2020 14:20
@tarjeieo tarjeieo added this to the Version 1.2.3 milestone Oct 8, 2020
@tarjeieo tarjeieo deleted the master branch October 8, 2020 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olemp olemp olemp approved these changes

Assignees

@tarjeieo tarjeieo

Labels
None yet
Projects
None yet
Milestone
Version 1.2.3
Development

Successfully merging this pull request may close these issues.
4 participants
@tarjeieo @olemp @Remi749 @Petterandre