Skip to content

Commit 71a9441

Browse files
committed
Merge remote-tracking branch 'origin/heroku-deployment-tmp' into branch-2.3-MVC
# Conflicts: # .github/workflows/fortify-analysis.yml # .github/workflows/xanitizer-analysis.yml # etc/TODO.md # pom.xml
1 parent 8971eff commit 71a9441

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# simpleworklist
22

3-
![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master)
4-
[![Build Status](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist.svg?branch=master)](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist)
5-
3+
[![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
4+
[![OSSAR](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/OSSAR/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
5+
[![Codacy Security Scan](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Codacy%20Security%20Scan/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
6+
[![Travis CI Build Status](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist.svg?branch=master)](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist)
67
Your Todo List for Getting Things Done
78

89
## Getting Things Done
910
GTD® and Getting Things Done® are registered trademarks of the David Allen Company.
1011
SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
1112

1213
## Requirements
13-
* [Functional Requirements](etc/requirements/Requirements.md)
14-
* [Nonfunctional Requirements](etc/requirements/Nonfunctional_Requirements.md)
14+
* [Functional Requirements](src/site/markdown/REQUIREMENTS_FUNCTIONAL.md)
15+
* [Nonfunctional Requirements](src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md)
1516

1617
## Development
17-
* [Requirements](src/site/markdown/REQUIREMENTS_FUNCTIONAL.md)
18-
* [Nonfunctional_Requirements](src/site/markdown/Nonfunctional_Requirements.md)
19-
* [HOWTO](src/site/markdown/TODO.md)
18+
* [CHANGELOG](src/site/markdown/CHANGELOG.md)
19+
* [TODO](src/site/markdown/TODO.md)
2020

2121
## URLs:
2222
* Heroku Deployment: [simpleworklist.herokuapp.com/](https://simpleworklist.herokuapp.com/)

src/site/markdown/CHANGELOG.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,11 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
128128

129129
## 2.3.26
130130
* fixed #249 TaskRepository: move the JQL Query-String to Entity as Prepared Statement
131-
* Issue #234 Taskstate: Task Edit Form -> change Project via DropDown
132-
* Issue #235 Project/Root: Task Edit Form -> change Project via DropDown
133-
* Issue #236 Project/id: Task Edit Form -> change Project via DropDown
134131

135132
## 2.3.27
136-
* Issue #298 try out java15
137-
138-
139-
133+
* fixed #298 try out java15
140134

135+
## 2.3.28
136+
* Issue #234 Taskstate: Task Edit Form -> change Project via DropDown
137+
* Issue #235 Project/Root: Task Edit Form -> change Project via DropDown
138+
* Issue #236 Project/id: Task Edit Form -> change Project via DropDown

0 commit comments

Comments
 (0)