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

Merge develop branch into master #112

Merged
merged 184 commits into from
Mar 9, 2024
Merged

Merge develop branch into master #112

merged 184 commits into from
Mar 9, 2024

Conversation

uo288347
Copy link
Contributor

@uo288347 uo288347 commented Mar 9, 2024

No description provided.

alagoconde and others added 30 commits February 22, 2024 17:53
@alagoconde
Added first navbar prototype
f928913
@alagoconde
Added a footer example
de9beff
@uo288543
Setup of question generation module
2e42f5b
@uo288543
Setup node scripts to start and starting code for question generation…
5659a76 
… module
@uo288543
Setup dockerfile
5c95498
@uo288543
Integration of question generation service in gateway service
e3f99bf
@alagoconde
Changed the format of the homepage and the navbar
d4d1b62
@uo289689
Change in the user-model.js class to use MariaDB instead of Mongo
5be9e05
@uo289689
Modification in the docker-compose.yml file to add MariaDB as the dat…
2bb4c48 
…abase, and adaptation of the AuthService and UserService modules
@uo289689
Added environment variables for the database and fixed the user-model…
2ba2b78 
….js and docker-compose.yml classes
@uo289689
Fix of the userSchema of user-model.js
38d7232
@alagoconde
Changed auth-model to use MariaDB
172763a
@uo289689
Adapted user-service.js class to MariaDB database and to User-model.js
e2cffcb
@uo289689
Changing dependency from mongoose to mysql2 in package.json
176d7e2
@alagoconde
Changed auth-service to use MariaDB
b5af196
@alagoconde
Added MariaDB in the users package.json
794fac1
@uo288347
First try looking for fast wikidata requests
44f7d28
@uo288347
Just some random things about SparQL. Not working yet
086d29a
@uo289689
Fix userservice
ecbc5ac
@uo289689
Merge branch 'develop-users' of https://github.com/Arquisoft/wiq_es04a …
28089f1 
…into develop-users
@uo289689
Fixing userservice
793d9e4
@uo288347
Index works with fullQuery
d916a18
@uo288347
City and population on the same wikidata request
62bd3bf
@uo288347
Including population and spanish filters (spanish does not always work)
cce6ae4
@uo288347
Tyring to request wikidata with various queries
3616917
@uo289689
Fixing the userService
40f294b
@uo289689
Fixed errors in the user service. Using a Sequelize to manage the dat…
5eb0fc8 
…abase connection.
@uo288347
Decreasing number of requests for city questions
20b91b7
@uo289689
Fix of the dabase_name
158aa73
@uo288347
Fixed bug in improved cities question
95d7c67
PBC003 and others added 15 commits March 7, 2024 19:41
@PBC003
Merge pull request #109 from Arquisoft/develop-users
c90d9a6 
Adding session
@uo288543
Changed url to fix a bug
60b705f
@uo288347
Fix questions bug. Changed configurations .github
81f4b0e
@uo288347
Merge branch 'develop-questions' of https://github.com/Arquisoft/wiq_…
1e9322e 
…es04a into develop-questions
@uo288347
Merge questions branch with develop branch
57dbd2c
@uo289689
Merge pull request #110 from Arquisoft/develop-questions
36c6fe9 
Merge from questions to develop
@uo288347
Modify sonar properties
8de0cb7
@uo289689
Changing time out
644cc35
@PabloGOP
Removed test routes from questions
921c484
@PabloGOP
Merge branch 'develop' of https://github.com/Arquisoft/wiq_es04a into…
d20576a 
… develop
@uo289689
Added error message for duplicate user
dc72fab
@uo289689
Adding error duplicate username message
7408b5a
@uo289689
Fixing game session
c47ba92
@uo288347
Merge with master branch
9fe3b1f
@uo288347
merge branch master into develop
ebaf47d
@uo288347 uo288347 added the release✅ Merge with master branch for a deliverable of the product label Mar 9, 2024
@uo288347 uo288347 added this to the Deliverable II milestone Mar 9, 2024
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Mar 9, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
27 Security Hotspots
0.0% Coverage on New Code (required ≥ 80%)
C Security Rating on New Code (required ≥ A)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@PabloGOP PabloGOP merged commit 87e9167 into master Mar 9, 2024
1 of 2 checks passed
@uo288347 uo288347 mentioned this pull request Mar 11, 2024
Closed
@uo288347 uo288347 self-assigned this Mar 11, 2024
@uo288347 uo288347 mentioned this pull request Apr 8, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alagoconde alagoconde alagoconde approved these changes

@uo289689 uo289689 uo289689 approved these changes

@PBC003 PBC003 PBC003 approved these changes

@PabloGOP PabloGOP PabloGOP approved these changes

Assignees

@uo288347 uo288347

Labels
release✅ Merge with master branch for a deliverable of the product
Projects
None yet
Milestone
Deliverable II
Development

Successfully merging this pull request may close these issues.
7 participants
@uo288347 @PabloGOP @PBC003 @uo289689 @alagoconde @uo288543 @and1na