diff --git a/api/.DS_Store b/api/.DS_Store index 80930024..23523b3c 100755 Binary files a/api/.DS_Store and b/api/.DS_Store differ diff --git a/api/Views/Landing/cp-ds.cshtml b/api/Views/Landing/cp-ds.cshtml index f02e7331..17c0aecc 100644 --- a/api/Views/Landing/cp-ds.cshtml +++ b/api/Views/Landing/cp-ds.cshtml @@ -124,6 +124,7 @@
Retail Consult
+
Auditório 1
@@ -142,6 +143,7 @@

Sara Faria Leal

Novabase
+
Auditório 1
@@ -158,8 +160,10 @@ Telecomunicações Móveis.

Germán Méndez

+
Novabase
+
Laboratório 2
@@ -185,6 +189,7 @@

Marta Santos

Feedzai
+
Auditório 3
@@ -202,6 +207,7 @@

Fábio Pinto

Feedzai
+
Laboratório 2
diff --git a/api/Views/Landing/cp-ia.cshtml b/api/Views/Landing/cp-ia.cshtml index 9561be48..c78c9b37 100644 --- a/api/Views/Landing/cp-ia.cshtml +++ b/api/Views/Landing/cp-ia.cshtml @@ -120,8 +120,11 @@
Workshop
+

Desenvolvimento de chat bots usanto a plataforma LUIS da Microsoft

Licínio Oliveira

+
Critical Software
+
Laboratório 2
@@ -131,14 +134,16 @@
-
15:30 - 16:30
+
14:15 - 15:15
Palestra
-

Eduardo Pereira

-
Delloite +

IA- a beautiful and inspirational journey

+

Licínio Oliveira

+
Deloitte
+
Auditório 3
@@ -156,7 +161,7 @@
-
15:15 - 16:15
+
15:00 - 16:00
@@ -209,7 +214,8 @@ Deloitte

Eduardo Pereira

-
Delloite
+
Deloitte
+
diff --git a/api/Views/Landing/cp-ia.html b/api/Views/Landing/cp-ia.html index cce2aec4..40cf231d 100644 --- a/api/Views/Landing/cp-ia.html +++ b/api/Views/Landing/cp-ia.html @@ -118,7 +118,7 @@
Workshop
-

(Critical)

+

Hands-on-Docker

Licínio Oliveira

Critical
diff --git a/api/Views/Landing/cp-iot.cshtml b/api/Views/Landing/cp-iot.cshtml index 2ecd0277..088110f9 100644 --- a/api/Views/Landing/cp-iot.cshtml +++ b/api/Views/Landing/cp-iot.cshtml @@ -23,10 +23,10 @@ - + - + @@ -112,7 +112,7 @@
-
11:15 - 12:00
+
11:15 - 12:15
@@ -121,6 +121,7 @@

André Duarte

Ubiwhere
+
Auditório 1
@@ -139,6 +140,7 @@

Gonçalo Santos

Ubiwhere
+
Auditório 2
@@ -146,7 +148,7 @@
-
16:45 - 18:30
+
16:45 - 18:45
@@ -155,6 +157,7 @@

André Duarte & Gonçalo Santos

Ubiwhere
+
Auditório 2
@@ -168,15 +171,16 @@
-
11:15 - 12:00
+
11:15 - 12:15
Palestra
-

(Critical Software)

+

High Integrity Systems

Márcia Guerra & Luís Galo

Critical Software
+
Auditório 1
@@ -186,15 +190,16 @@
-
15:15 - 16:10
+
15:15 - 16:15
Palestra
-

(Critical Software)

+

Cars, the next big thing in the Internet of Things

João Esteves

Critical Sofware
+
Auditório 3
@@ -207,10 +212,11 @@
Workshop
-

(Critical Software)

+

The Things Network, be part of this global community!

Gonçalo Silva

Critical Software
+
Laboratório 1
@@ -280,7 +286,7 @@
- +

João Esteves

@@ -290,11 +296,11 @@
diff --git a/api/Views/Landing/cp-net.cshtml b/api/Views/Landing/cp-net.cshtml index b86d4274..feca52c5 100644 --- a/api/Views/Landing/cp-net.cshtml +++ b/api/Views/Landing/cp-net.cshtml @@ -119,11 +119,12 @@
Palestra
-

Desenvolvimento de Software para Segurança Nacional

+

Desenvolvimento de Software para Segurança Nacional: -Dual Control Organization

Manuel Martins

Critical Software
+
Auditório A2
@@ -134,17 +135,25 @@
-
11:15 - 12:00
+
11:15 - 12:15
Workshop
-

Scapy

-

Hugo trovão

+

Web Security 101

+

Gonçalo Amaro & André Pinheiro

Dognaedis
+
Laboratório 3
+
    Requisitos: +
  • METASPLOITABLE
  • +
  • KALI LINUX
  • +
  • VIRTUAL BOX
  • +
  • VIRTUAL BOX EXTENSION PACK
  • +
+
@@ -157,12 +166,15 @@
Workshop
-

(Dognaedis)

-

Gonçalo Amaro & André Pinheiro

+

SCAPY Workshop

+

Hugo trovão

Dognaedis
+
Requisitos: + Material necessário: É esperado que os participantes tenham acesso a um computador com scapy instalado e alguns conhecimentos de programação em python. +
@@ -264,53 +276,29 @@
- - - - + + diff --git a/api/Views/Landing/cp-web.cshtml b/api/Views/Landing/cp-web.cshtml index b9d5e129..e5dfb270 100644 --- a/api/Views/Landing/cp-web.cshtml +++ b/api/Views/Landing/cp-web.cshtml @@ -117,6 +117,7 @@

Progressive Web App: From Full Online to Full Offline

Domingos Martins e Ricardo Soares

Blip
+
Laboratório 1
@@ -131,6 +132,7 @@

Introdução ao Git: onde estiveste toda a minha vida?

João Vale

Blip
+
Auditório 1
@@ -143,6 +145,7 @@

Mapping the DNA of fraud

Luís Cardoso

Feedzai
+
Auditório 1
diff --git a/api/wwwroot/.DS_Store b/api/wwwroot/.DS_Store index 0d1f0945..6795284e 100755 Binary files a/api/wwwroot/.DS_Store and b/api/wwwroot/.DS_Store differ diff --git a/api/wwwroot/Landing/cp-ia.cshtml b/api/wwwroot/Landing/cp-ia.cshtml index 9561be48..fcc959e2 100644 --- a/api/wwwroot/Landing/cp-ia.cshtml +++ b/api/wwwroot/Landing/cp-ia.cshtml @@ -120,11 +120,13 @@
Workshop
+

Desenvolvimento de chat bots usanto a plataforma LUIS da Microsoft

+

a

Licínio Oliveira

Critical Software
- + mais det dalhes
diff --git a/api/wwwroot/imgs/.DS_Store b/api/wwwroot/imgs/.DS_Store index ac3993a4..aa83a077 100644 Binary files a/api/wwwroot/imgs/.DS_Store and b/api/wwwroot/imgs/.DS_Store differ diff --git a/api/wwwroot/imgs/jogo/CriticalCromo.png b/api/wwwroot/imgs/jogo/CriticalCromo.png new file mode 100755 index 00000000..a32ca3df Binary files /dev/null and b/api/wwwroot/imgs/jogo/CriticalCromo.png differ diff --git a/api/wwwroot/imgs/jogo/FebradaCromo.png b/api/wwwroot/imgs/jogo/FebradaCromo.png new file mode 100755 index 00000000..31f04b9e Binary files /dev/null and b/api/wwwroot/imgs/jogo/FebradaCromo.png differ diff --git a/api/wwwroot/imgs/jogo/FestarolaCromo.png b/api/wwwroot/imgs/jogo/FestarolaCromo.png new file mode 100755 index 00000000..a783177d Binary files /dev/null and b/api/wwwroot/imgs/jogo/FestarolaCromo.png differ diff --git a/api/wwwroot/imgs/mapa.png b/api/wwwroot/imgs/mapa.png index 8ed8efee..8a8cb532 100644 Binary files a/api/wwwroot/imgs/mapa.png and b/api/wwwroot/imgs/mapa.png differ diff --git a/api/wwwroot/imgs/speakers-image/goncalo-silva.jpg b/api/wwwroot/imgs/speakers-image/goncalo-silva.jpg new file mode 100644 index 00000000..fdd5ea66 Binary files /dev/null and b/api/wwwroot/imgs/speakers-image/goncalo-silva.jpg differ diff --git a/api/wwwroot/imgs/speakers-image/goncalo-silva.png b/api/wwwroot/imgs/speakers-image/goncalo-silva.png new file mode 100644 index 00000000..33d69e46 Binary files /dev/null and b/api/wwwroot/imgs/speakers-image/goncalo-silva.png differ diff --git a/api/wwwroot/imgs/speakers-image/joao-esteves.png b/api/wwwroot/imgs/speakers-image/joao-esteves.png new file mode 100644 index 00000000..f630b560 Binary files /dev/null and b/api/wwwroot/imgs/speakers-image/joao-esteves.png differ