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.

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

Release #99

Merged
merged 69 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
f179ce6
Added fetch-depth 0
labra Jan 22, 2024
ff5fadb
Update sonar-project.properties
ExarcaFidalgo Jan 22, 2024
3a7d874
Update README.md
ExarcaFidalgo Jan 22, 2024
f67f94d
Update sonar-project.properties
ExarcaFidalgo Jan 22, 2024
caa267f
Update README.md
ExarcaFidalgo Jan 22, 2024
72fedaf
Fixing some old-fashioned code in the actions and README.md file
augustocristian Jan 23, 2024
09590d8
0 por es6b
ExarcaFidalgo Jan 23, 2024
d7948e9
0 por es6c
ExarcaFidalgo Jan 23, 2024
2f84702
Merge pull request #3 from Arquisoft/dev_fixcomposeandactions
pglez82 Jan 23, 2024
d658968
Adding the .env to the service deployment
augustocristian Jan 23, 2024
d6ec049
Merge pull request #4 from Arquisoft/ft_Addenvfiledeployment
augustocristian Jan 23, 2024
f7c5893
Adding -O to wget to overwrite existing files
augustocristian Jan 23, 2024
88c299b
Changed welcome message and some devDependencies
labra Jan 26, 2024
fa9aec3
Merge branch 'master' of https://github.com/Arquisoft/wiq_0
labra Jan 26, 2024
dbaea69
Merge branch 'master' into master
ExarcaFidalgo Jan 26, 2024
dc74163
Revert "Merge branch 'master' into master"
ExarcaFidalgo Jan 26, 2024
a50371b
Merge branch 'master' into master
ExarcaFidalgo Jan 26, 2024
e049274
Revert "Merge branch 'master' of https://github.com/Arquisoft/wiq_0"
ExarcaFidalgo Jan 26, 2024
e9278f2
Expiando mis pecados
ExarcaFidalgo Jan 26, 2024
1f0cbfb
Minor fixes to tear-down the container
augustocristian Feb 12, 2024
f4f8efb
Merge pull request #6 from Arquisoft/ft_solveproblemcompose
labra Feb 12, 2024
dce1d3f
Merge branch 'develop', remote-tracking branch 'origin' into pablo
uo264915 Mar 13, 2024
304dd15
Adding --pull always to the deployment command to force image downloa…
augustocristian Mar 14, 2024
227b3f5
Added OpenAPI specification for wiq_0 gateway service (#17)
augustocristian Mar 17, 2024
6e9d94e
Sync package.json with package-lock.json (#18)
augustocristian Mar 17, 2024
789b3f2
Adding some examples to the OpenAPI spec (#19)
augustocristian Mar 17, 2024
7c88c7e
Fixing OpenAPI E2E Tests
pglez82 Mar 18, 2024
7b11b83
Merge remote-tracking branch 'origin' into pablo
uo264915 Mar 18, 2024
98b87b9
:sparkles: Temporizador añadido con cuenta atrás de 20 segundos
coral2742 Mar 18, 2024
997e0bc
Small local changes
labra Mar 19, 2024
8d15121
Sincronización con develop (24 Marzo)
uo264915 Mar 24, 2024
fef70b4
Merge de develop
uo264915 Mar 24, 2024
492a216
[APP] Implementación interfaz de MainPage Arquisoft/wiq_es2b#76
uo264915 Mar 28, 2024
d9d57fb
Sincronización con develop (28 Marzo)
uo264915 Mar 28, 2024
cbc574d
cambios css
uo264915 Mar 28, 2024
2bae69f
Arreglando fallo bucle infinito en peticiones
baraganio Mar 28, 2024
fc2de3a
Merge branch 'develop' into pablo
uo264915 Mar 30, 2024
78acdb3
Finalizacion del juego y mostrar puntuacion
uo264915 Mar 30, 2024
ada6418
Merge pull request #89 from Arquisoft/pablo
uo264915 Mar 30, 2024
2254984
Merge branch 'develop' into ray
UO290054 Mar 31, 2024
f540641
Merge branch 'develop' into ray
UO290054 Mar 31, 2024
7d11d8a
Historial de usuario implementado + errores varios
UO290054 Apr 1, 2024
e80c658
Implementación CSS de HistoricalData y otros cambios
uo264915 Apr 1, 2024
b33132f
Ajustes Histotico del usuario
UO290054 Apr 1, 2024
3613362
Merge branch 'master' into ray
UO290054 Apr 1, 2024
e197ad2
Merge pull request #92 from Arquisoft/ray
UO290054 Apr 1, 2024
2c0cf10
:sparkles: Modificaciones del reloj de juego
coral2742 Apr 1, 2024
f71db54
Sincronizacion con master (1 abril)
uo264915 Apr 1, 2024
11ffd55
:sparkles: Temporizador añadido
coral2742 Apr 3, 2024
0e50e0e
:sparkles: Especificación de API con Openapi
coral2742 Apr 3, 2024
b779725
Merge from develop
baraganio Apr 4, 2024
f86c7a3
Arreglando las respuestas que no traen nombre (traen la etiqueta Q1234)
baraganio Apr 4, 2024
af050db
Merge branch 'develop' of https://github.com/Arquisoft/wiq_es2b into …
uo264915 Apr 7, 2024
3cc157c
Resolucion de problemas fin de partida
uo264915 Apr 7, 2024
92cce23
Resolucion problemas fin de partida
uo264915 Apr 7, 2024
c7052a5
Merge pull request #95 from Arquisoft/pablo
uo264915 Apr 7, 2024
e0cdd4f
sparkles: Cambios en temporizador
coral2742 Apr 7, 2024
3e8ddb7
:sparkles: Pequeños cambios en temporizador
UO285240 Apr 7, 2024
12687e4
Merge branch 'develop' into coral
UO285240 Apr 7, 2024
d0fb796
:sparkles: Temporizador solucionado
UO285240 Apr 7, 2024
838e093
:sparkles: 6 preguntas por partida
UO285240 Apr 7, 2024
4983926
:sparkles: Pregunta incorrecta si pasa de tiempo
UO285240 Apr 7, 2024
f2f4236
:sparkles: Manejo de tiempo agotado con modal
coral2742 Apr 7, 2024
4573723
Cambiando alguna peticiones post por get
baraganio Apr 7, 2024
1d8a5fa
Merge con develop
baraganio Apr 7, 2024
597fe01
Merge con develop
baraganio Apr 7, 2024
668b401
Update 06_runtime_view
baraganio Apr 7, 2024
881154f
Merge pull request #98 from Arquisoft/carlos
baraganio Apr 7, 2024
cfd29cd
Arreglos de warnings
uo264915 Apr 7, 2024
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
Adding the .env to the service deployment
  • Loading branch information
augustocristian committed Jan 23, 2024
commit d6589685369805dcf58a0fbb681046675bd87234
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,6 @@ jobs:
key: ${{ secrets.DEPLOY_KEY }}
command: |
wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml
wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env
docker compose down
docker compose --profile prod up -d
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ deploy:
key: ${{ secrets.DEPLOY_KEY }}
command: |
wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml -O docker-compose.yml
wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/.env
docker compose down
docker compose --profile prod up -d
```
Expand Down