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

Bump json from 20180130 to 20230227 in /backend #129

Open
wants to merge 120 commits into
base: master
Choose a base branch
from
Open

Bump json from 20180130 to 20230227 in /backend #129

Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
3551cc5
Hardcoded keystore pw. Changed starttls to ssl prop.
Jan 19, 2022
02cf554
Pull request #178: Hardcoded keystore pw.
Jan 19, 2022
f0b6dd5
Changed keystore password
Jan 19, 2022
ba91398
added property socketfactory fallback = true
Jan 19, 2022
e2c38ea
added property socketfactory fallback = true
Jan 19, 2022
4632b96
changed starttls to ssl
Jan 19, 2022
76dbbb8
changed ssl to starttls and added transport protocol smtp
Jan 19, 2022
556a622
session debug print
Jan 19, 2022
9a3c3fd
fixing
Jan 19, 2022
0e8fb71
delete keystore password
Jan 19, 2022
fda8cb5
added keystore password
Jan 19, 2022
19437e5
Removed changes
Jan 19, 2022
de8f585
Pull request #179: RIHAKB-1085
Jan 19, 2022
195d190
package.json edited online with Bitbucket
KristjanKruusRIA Jan 20, 2022
9fef596
Pull request #180: Mail
KristjanKruusRIA Jan 20, 2022
8e3cced
Changed email notification sending logic. System send emails separate
Jan 20, 2022
76a10eb
Pull request #181: Changed email notification sending logic.
Jan 24, 2022
75ebe74
Pull request #182: RIHAKB-1091
KristjanKruusRIA Jan 24, 2022
ef0262b
Added new logic to controller IssueController.getInfosystemIssue
Jan 28, 2022
0824fbb
Deleted unuseful import
Jan 28, 2022
cbf66b5
Pull request #184: RIHAKB-782
Jan 28, 2022
57bd3ea
Added CustomAuthenticationEntryPoint.class
Jan 28, 2022
7889c46
Pull request #185: Added CustomAuthenticationEntryPoint.class
Jan 28, 2022
b08bbce
Added description to forbidden status error.
Jan 28, 2022
728ea7c
Deleted useless imports
Jan 28, 2022
75c5c57
Pull request #186: Added description to forbidden status error.
Jan 28, 2022
f9561c1
Implemented storage-client to backend module. Fixed warnings
Feb 8, 2022
7cb28e8
Pull request #187: Implemented storage-client to backend module. Fixe…
Feb 14, 2022
b347035
Revert "Added E-ITS security standard. Refactored tests."
Feb 14, 2022
37b6101
Revert "Deleted Setup.java changes"
Feb 14, 2022
18df2f4
Revert "Added E-ITS"
Feb 14, 2022
0215802
Revert "Correct E-ITS security standard preview"
Feb 14, 2022
58605ee
Revert "Added E-ITS security standard preview"
Feb 14, 2022
921755f
Automatic merge from release -> develop
KristjanKruusRIA Feb 21, 2022
627d652
Pull request #188: Release 7.8
KristjanKruusRIA Feb 21, 2022
f91a93b
text fix
KristjanKruusRIA Mar 2, 2022
2f07f92
version up
KristjanKruusRIA Mar 15, 2022
389aae3
project version up
KristjanKruusRIA Mar 15, 2022
0a8db0f
Pull request #189: Release
KristjanKruusRIA Mar 21, 2022
4154ab9
test spinner
KristjanKruusRIA Mar 22, 2022
42d89d9
test
KristjanKruusRIA Mar 22, 2022
1d2961e
remove test
KristjanKruusRIA Mar 22, 2022
e4e420f
upgrade dependencies
KristjanKruusRIA Mar 22, 2022
5f258aa
typescript downgrade
KristjanKruusRIA Mar 22, 2022
94927c2
version up
KristjanKruusRIA Mar 22, 2022
2dd553f
typescript proper version
KristjanKruusRIA Mar 22, 2022
d2546c8
Revert "upgrade dependencies"
KristjanKruusRIA Mar 22, 2022
d914d03
dependency update
KristjanKruusRIA Mar 22, 2022
7cbb4ed
new yarn version
KristjanKruusRIA Mar 22, 2022
70b8f5e
added missing dependencies
KristjanKruusRIA Mar 22, 2022
b73aaf1
Fixed ngs-ui-switch dependency error
Apr 5, 2022
103a396
Upgraded all dependencies in frontend
Apr 5, 2022
4a8f356
Changed readme
Apr 5, 2022
d6b03b6
Downgraded bootstrap version
Apr 5, 2022
3d552dd
Upgraded bootstrap version. Fixed errors
Apr 6, 2022
9633d13
Removed z-index
Apr 7, 2022
9793837
Fixing css styles
Apr 8, 2022
ba4d6d2
Fixed standard system choosing css style
Apr 8, 2022
e11062f
Updated all backend dependencies
Apr 11, 2022
d366d6c
Removing deprecated annotation
Apr 12, 2022
7325661
Moved bean to another class
Apr 12, 2022
d939e2b
Updated spring boot version to 2.6.6
Apr 13, 2022
46a6d08
spring-boot-starter-parent 2.6.6
KristjanKruusRIA Apr 13, 2022
c14368e
Parandatud märksõnade stiilid.
May 2, 2022
84a3a37
Parandatud viga, mis tekkitas ngx-ui-switch
May 2, 2022
ea8a9ea
Parandatud tirvalisuse blokki stiilid. Vahetatud kõikide input'ite vä…
May 2, 2022
e80a5d6
CSS stiilide parandus
May 3, 2022
29e8c61
Pull request #190: RIHAKB-1100
KristjanKruusRIA May 5, 2022
640af74
Pull request #191: RIHAKB-1095
KristjanKruusRIA May 5, 2022
5811505
Parandatud selenium testid
May 5, 2022
fd7cf6f
README.md edited online with Bitbucket
KristjanKruusRIA May 6, 2022
2b92aed
ScenarioContext.java edited online with Bitbucket
KristjanKruusRIA May 6, 2022
e991eac
README.md edited online with Bitbucket
KristjanKruusRIA May 6, 2022
a7bc383
Pull request #192: RIHAKB-1095
KristjanKruusRIA May 6, 2022
99489dc
Parandatud CSS stiilid
May 6, 2022
e28134a
Pull request #193: RIHAKB-1095
KristjanKruusRIA May 6, 2022
b5a94e0
Parandatud CSS stiilid
May 6, 2022
def5299
Merge remote-tracking branch 'origin/develop' into RIHAKB-1095
May 6, 2022
ab08124
Pull request #194: RIHAKB-1095
May 9, 2022
25bf09d
fix float for new bootstrap version
KristjanKruusRIA May 9, 2022
6fd677b
Pull request #195: fix float for new bootstrap version
KristjanKruusRIA May 9, 2022
d24523c
float-end
KristjanKruusRIA May 9, 2022
68e54d4
Pull request #196: float-end
KristjanKruusRIA May 9, 2022
dcafb10
test
KristjanKruusRIA May 9, 2022
986cdd1
Pull request #197: test
KristjanKruusRIA May 9, 2022
d8a9063
Parandatud CSS stiilid
May 17, 2022
77d2d96
Parandatud CSS stiilid
May 17, 2022
68fd1b1
Pull request #198: RIHAKB-1095
KristjanKruusRIA May 17, 2022
73894f5
Pull request #199: RIHAKB-1100
KristjanKruusRIA May 25, 2022
49cfa0f
Revert "Pull request #199: RIHAKB-1100"
KristjanKruusRIA May 25, 2022
dd3ebb8
Automatic merge from release -> develop
KristjanKruusRIA May 25, 2022
1b07ad8
Pull request #201: RIHAKB-1095
KristjanKruusRIA May 25, 2022
9018253
Selenium test fix
Jun 2, 2022
79f1019
Pull request #203: RIHAKB-1095 Selenium test fix
Jun 2, 2022
7a4d314
Pull request #204: RIHAKB-1095
KristjanKruusRIA Jun 2, 2022
d69d920
Automatic merge from release -> develop
KristjanKruusRIA Jun 2, 2022
cf387c0
Fixing sonarqube errors
Jun 15, 2022
81c79fb
Fixing sonarqube errors
Jun 15, 2022
edc6044
Test
Jun 17, 2022
e761aec
Test fix
Jun 17, 2022
c91d88a
Test remove
Jun 17, 2022
70a0e99
Test remove fix
Jun 17, 2022
403b658
Test auditlog
Jun 17, 2022
9bc6293
Test auditlog
Jun 17, 2022
c67f85c
Tests
Jun 20, 2022
423c0fc
Check for Null Statement
Jun 27, 2022
11a92bd
Check for Null Statement
Jun 27, 2022
8e96fbd
Check for Null Statement
Jun 27, 2022
c8e24e4
Fixing sonarqube errors
Jun 27, 2022
f8a1dd9
Fixing sonarqube errors
Jun 27, 2022
832b246
Fixing sonarqube errors
Jun 27, 2022
a17caaf
Fixing sonarqube errors
Jun 27, 2022
7ef20ea
Pull request #206: RIHAKB-1101
Jun 28, 2022
5fda23b
Automatic merge from release -> develop
KristjanKruusRIA Jun 28, 2022
a2bb45e
Pull request #207: Develop
KristjanKruusRIA Jun 28, 2022
91f4953
version up
KristjanKruusRIA Jun 30, 2022
59946c6
version up
KristjanKruusRIA Jun 30, 2022
c7093e1
Pull request #208: Develop
KristjanKruusRIA Jun 30, 2022
6f4f0af
Pull request #209: Release 7.9
KristjanKruusRIA Jul 8, 2022
62fd416
Bump json from 20180130 to 20230227 in /backend
dependabot[bot] May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pull request #182: RIHAKB-1091 
Merge in RIHA/riha-browser from RIHAKB-1091 to develop

Squashed commit of the following:

commit c8c5c9cb3038abfbf08dbc17d4880581678b0fd4
Author: Kristjan Kruus <[email protected]>
Date:   Mon Jan 24 14:31:22 2022 +0200

    logback-spring.xml edited online with Bitbucket

commit 2029ef963766c2809c9f4414cff78ed54da082db
Author: makar <[email protected]>
Date:   Mon Jan 24 14:23:16 2022 +0200

    changed logs path to /var/log/

commit c4f80bfa80a1fa1d710cb49262922dd0836e4f68
Merge: a882e655 5d3858aa
Author: makar <[email protected]>
Date:   Mon Jan 24 14:17:37 2022 +0200

    Merge remote-tracking branch 'origin/RIHAKB-1091' into RIHAKB-1091

commit a882e6552b3b1047ed4e45f36c63dfd2fbf01b00
Author: makar <[email protected]>
Date:   Mon Jan 24 14:17:09 2022 +0200

    changed logs path 2

commit 5d3858aa32c5f01f3050c7d4db3905fdcc7d3cf1
Author: Kristjan Kruus <[email protected]>
Date:   Mon Jan 24 14:15:37 2022 +0200

    added back logging

commit c05fb69e6b0629244eef74faa2e87627c478e549
Author: makar <[email protected]>
Date:   Mon Jan 24 13:59:57 2022 +0200

    changed logs path
  • Loading branch information
@KristjanKruusRIA
KristjanKruusRIA committed Jan 24, 2022
commit 75ebe7491701cd9320eb9b65a022758b5427eb03
10 changes: 5 additions & 5 deletions backend/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE configuration>
<configuration>
<property name="LOG_DIR" value="logs"/>
<property name="LOG_DIR" value="/var/log"/>
<property name="appName" value="riha-browser"/>
<appender name="FILEJSON" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_DIR}/${appName}.json.log</file>
<file>${LOG_DIR}/${appName}/${appName}.json.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_DIR}/${appName}.%d{yyyy-MM-dd}.%i.json.log</fileNamePattern>
<fileNamePattern>${LOG_DIR}/${appName}/${appName}.%d{yyyy-MM-dd}.%i.json.log</fileNamePattern>
<maxHistory>14</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender>
<appender name="AUDIT_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_DIR}/${appName}-audit.json.log</file>
<file>${LOG_DIR}/${appName}/${appName}-audit.json.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_DIR}/${appName}-audit.%d{yyyy-MM-dd}.%i.json.log</fileNamePattern>
<fileNamePattern>${LOG_DIR}/${appName}/${appName}-audit.%d{yyyy-MM-dd}.%i.json.log</fileNamePattern>
<maxHistory>14</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
Expand Down