Merge branch 'master' into develop

Arquisoft · Mar 10, 2024 · 2585a11 · 2585a11
2 parents 5a6a104 + e88eb35
commit 2585a11
Show file tree

Hide file tree

Showing 36 changed files with 309 additions and 806 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,8 +3,7 @@ name: Deploy on release
 on:
   release:
     types: [published]
-    branches:
-      - master
+
 jobs:
   unit-tests:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 |Martín Cancio Barrera | UO287561 | [Mi github](https://github.com/CANCI0)
 |Iyán Fernández Riol | UO288231 | [Mi github](https://github.com/iyanfdezz)
 |Rodrigo García Iglesias | UO276396 | [Mi github](https://github.com/Rodrox11)
-|Alfredo Jirout Cid | UO288443 | [Mi github](https://github.com/uo288443)
+|Miguel Olamendi Alonso | UO285032 | [Mi github](https://github.com/uo285032)
 
 ## Introduction to our project
 [![Deploy on release](https://github.com/Arquisoft/wiq_es1a/actions/workflows/release.yml/badge.svg)](https://github.com/Arquisoft/wiq_es1a/actions/workflows/release.yml)

diff --git a/debug.log b/debug.log
@@ -0,0 +1 @@
+[0220/104149.273:ERROR:registration_protocol_win.cc(107)] CreateFile: El sistema no puede encontrar el archivo especificado. (0x2)
diff --git a/docs/images/Level2.png b/docs/images/Level2.png
diff --git a/docs/images/UML.png b/docs/images/UML.png
diff --git a/docs/images/businesscontext.png b/docs/images/businesscontext.png
diff --git a/docs/images/businesscontext.svg b/docs/images/businesscontext.svg
diff --git a/docs/images/historial.png b/docs/images/historial.png
diff --git a/docs/images/juega.png b/docs/images/juega.png
diff --git a/docs/images/technicalcontext.png b/docs/images/technicalcontext.png
diff --git a/docs/images/technicalcontext.svg b/docs/images/technicalcontext.svg
diff --git a/docs/images/whiteBox5.1.png b/docs/images/whiteBox5.1.png
diff --git a/docs/index.adoc b/docs/index.adoc
@@ -6,7 +6,7 @@
 // configure EN settings for asciidoc
 include::src/config.adoc[]
 
-= image:arc42-logo.png[arc42] Template
+= image:arc42-logo.png[arc42] WIQ! Documentation
 :revnumber: 8.2 EN
 :revdate: January 2023
 :revremark: (based upon AsciiDoc version)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[0220/104149.273:ERROR:registration_protocol_win.cc(107)] CreateFile: El sistema no puede encontrar el archivo especificado. (0x2)