Final pull request #92
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…amento dell'Area Utente mancano solo piccoli dettagli da modificare (bisogna parlare con il gruppo), e modifiche di varie pagine jsp per creare le richieste alla servlet e perfezionamenti dell'html.
…nctions for the patient/logopedist
TODO: -Dynamic CSS loading based on the exercise -CSS of every exercise
Reached 59% Test Coverage
…or passing mocked DAO
…-user-settings-provide-all-actions # Conflicts: # src/main/java/model/DAO/DAOPersonalInfo.java
…tions 12 user settings provide all actions
# Conflicts: # src/main/java/controller/SendResetPin.java
…ting-purpose fixed textbox
# Conflicts: # src/main/java/model/service/exercise/SpeechRecognition.java
66 insert exercise images
# Conflicts: # README.md # src/main/java/model/service/user/UserRegistry.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging Backup into main. Backup contains all the files from Development. This branch was created because something didn't let us make the pull from development. GitHub magic 🌟