Skip to content

Commit

Permalink
Merge branch 'dev' into feature/#433
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Ruud committed Sep 28, 2021
2 parents a7269fd + 6f043f3 commit ef33448
Show file tree
Hide file tree
Showing 35 changed files with 45 additions and 86,319 deletions.
13 changes: 11 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,31 @@
- [ ] 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 if your code additions will fail linting checks
- [ ] Remember: Add PR description to [CHANGELOG](https://github.com/Puzzlepart/prosjektportalen365/blob/dev/CHANGELOG.md) with the ID that matches this PR
- [ ] Remember: Add PR description to [CHANGELOG](https://github.com/Puzzlepart/prosjektportalen365/blob/dev/CHANGELOG.md) with the **ID of the Issue** associated with this PR
- [ ] Documentation: Have a look at the [PP365 User manual](https://puzzlepart.github.io/prosjektportalen-manual/) and consider the need for updates to be made. Updates can be done directly into the 'Kladd' branch or by providing information to test team for implementation.

### Description

Please describe your pull request in detail.

### How to test

Please describe how someone else can test this PR. In the form of a numbered list and checkboxes for Jan when the testing period occurs.
Please describe how someone else (a regular user without coding skills) can test this PR. In the form of a numbered list and checkboxes for Jan when the testing period occurs.

Example:

- [ ] 1. Do this
- [ ] 2. Then this
- [ ] 3. Then that


### Update of documentation
- [ ] Check if user manual requires update
- [ ] No
- [ ] Yes
- [ ] Update user manual


### Relevant issues (if applicable)

💔Thank you!
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

Every change is marked with Pull Request ID.

## 1.2.9 - TBA
## 1.2.9 - 08.09.2021

## Added

Expand All @@ -14,6 +14,7 @@ Every change is marked with Pull Request ID.

- Fixed issue where the site design had to be applied post project creation #492
- Fixed date not being recognized when exporting Portfolio overview to Excel. #495
- Fixed issue where changing project phase did not always update the portfolio page #518

## 1.2.8 - 17.06.2021

Expand Down
4 changes: 4 additions & 0 deletions Install/Build-Release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ $PACKAGE_FILE = Get-Content "$PSScriptRoot/../package.json" -Raw | ConvertFrom-J
Write-Host "[Building release v$($PACKAGE_FILE.version)]" -ForegroundColor Cyan

#region Paths
$START_PATH = Get-Location
$ROOT_PATH = "$PSScriptRoot/.."
$SHAREPOINT_FRAMEWORK_BASEPATH = "$ROOT_PATH/SharePointFramework"
$PNP_TEMPLATES_BASEPATH = "$ROOT_PATH/Templates"
Expand All @@ -28,6 +29,8 @@ $RELEASE_PATH = "$ROOT_PATH/release/$($RELEASE_NAME)"
if ($CI.IsPresent) {
Write-Host "[Running in CI mode. Installing module SharePointPnPPowerShellOnline.]" -ForegroundColor Yellow
Install-Module -Name SharePointPnPPowerShellOnline -Force -Scope CurrentUser
} else {
Import-Module $PSScriptRoot\SharePointPnPPowerShellOnline\SharePointPnPPowerShellOnline.psd1 -DisableNameChecking
}

$sw = [Diagnostics.Stopwatch]::StartNew()
Expand Down Expand Up @@ -124,4 +127,5 @@ if (-not $CI.IsPresent) {
Add-Type -Assembly "System.IO.Compression.FileSystem"
[IO.Compression.ZipFile]::CreateFromDirectory($RELEASE_PATH, "$($RELEASE_PATH).zip")
Write-Host "Done building release [v$($PACKAGE_FILE.version)] in [$($sw.Elapsed)]" -ForegroundColor Cyan
Set-Location $START_PATH
}
Loading

0 comments on commit ef33448

Please sign in to comment.