Skip to content

Commit

Permalink
Merge pull request #806 from naver/release/3.5.5-p1
Browse files Browse the repository at this point in the history
Release 3.5.5-p1
  • Loading branch information
imbyungjun authored May 31, 2021
2 parents c729808 + 35ff3a9 commit 9cdf44a
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
* Please post questions in [Discussions](https://github.com/naver/ngrinder/discussions) not Issues.
* nGrinder 3.5.5 has been released. See https://github.com/naver/ngrinder/releases
* nGrinder 3.5.5-p1 has been released. See https://github.com/naver/ngrinder/releases

nGrinder
========
Expand Down
5 changes: 5 additions & 0 deletions RELEASE-NOTE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
3.5.5-p1 (2021.05.31)
==================
- Bug fix
- #804 Fix that perftest detail report does not rendered properly if logout

3.5.5 (2021.04.30)
==================
- Changes
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ allprojects {
apply plugin: "idea"

group = "org.ngrinder"
version = "3.5.5"
version = "3.5.5-p1"

idea {
module {
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-controller/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ngrinder:
version: 3.5.5
version: 3.5.5-p1

server:
default-encoding: UTF-8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories {
}

ext {
ngrinder_version = "3.5.5"
ngrinder_version = "3.5.5-p1"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngrinder",
"version": "3.5.5",
"version": "3.5.5-p1",
"description": "ngrinder GUI",
"private": true,
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-frontend/src/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Vue.directive('visible', (el, binding) => {
Vue.filter('numFormat', numFormat(numeral));
Vue.filter('dateFormat', (value, format) => {
if (value) {
return moment(new Date(value)).tz(ngrinder.currentUser.timeZone).format(format);
return moment(new Date(value)).tz(ngrinder.currentUser.timeZone || moment.tz.guess(true)).format(format);
}
return '';
});
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-frontend/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var lessLoader = {
};

module.exports = function (env) {
var ngrinderVersion = '3.5.5';
var ngrinderVersion = '3.5.5-p1';
if (env !== undefined && env.ngrinderVersion !== undefined) {
ngrinderVersion = env.ngrinderVersion;
}
Expand Down

0 comments on commit 9cdf44a

Please sign in to comment.