diff --git a/Frontend Angular 4/package-lock.json b/Frontend Angular 4/package-lock.json
index f75adca87bf20d5e610c293bd54e4e17ef2cdd05..88533aa21e2eea99ae1d1bff3b435ec1ce87329e 100644
--- a/Frontend Angular 4/package-lock.json
+++ b/Frontend Angular 4/package-lock.json
@@ -2871,9 +2871,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.238",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.238.tgz",
- "integrity": "sha512-k+s6EIiSTgfOm7WiMlGBMMMtBQXSui8OfLN1sXU3RohJOuLGVq0lVm7hXyDIDBcbPM0MeZabAdIPQOSEZT3ZLg==",
+ "version": "1.3.241",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.241.tgz",
+ "integrity": "sha512-Gb9E6nWZlbgjDDNe5cAvMJixtn79krNJ70EDpq/M10lkGo7PGtBUe7Y0CYVHsBScRwi6ybCS+YetXAN9ysAHDg==",
"dev": true
},
"elliptic": {
@@ -4519,7 +4519,7 @@
"dev": true
},
"graph3D": {
- "version": "git://github.com/ifagian/graph3D.git#c0b284a2503343898fbba1fba17040e6fc97f717",
+ "version": "git://github.com/ifagian/graph3D.git#71770714d10f7ef67e6e7f430b6b90e926ce0b6d",
"from": "git://github.com/ifagian/graph3D.git#master",
"requires": {
"gif.js": "^0.2.0",
diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts
index b3b1163617d271c0379d09f1260091ab153f232f..c2a30b6e43e9f3ca572557f8b19f651a2e4b6e3d 100755
--- a/Frontend Angular 4/src/app/shared/config.ts
+++ b/Frontend Angular 4/src/app/shared/config.ts
@@ -25,9 +25,12 @@
// export const GHCI_URL = 'ws://35.199.87.61:9090/endpoint';
// psico
-export const SERVER = 'https://matefun.math.psico.edu.uy';
-export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint';
+// export const SERVER = 'https://matefun.math.psico.edu.uy';
+// export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint';
+// fing
+export const SERVER = 'https://www.fing.edu.uy/proyectos/matefun';
+export const GHCI_URL = 'wss://matefun.fing.edu.uy/proyectos/matefun/endpoint';
//diego docker
// export const SERVER = 'http://localhost:8080';
diff --git a/Servidor JEE/WebContent/3rdpartylicenses.txt b/Servidor JEE/WebContent/3rdpartylicenses.txt
index 3baf89723501d30cd5659a923b175b1ae8852431..0074daae5b68e3f8d3ac947f393198cc52922106 100644
--- a/Servidor JEE/WebContent/3rdpartylicenses.txt
+++ b/Servidor JEE/WebContent/3rdpartylicenses.txt
@@ -2,7 +2,7 @@
MIT
MIT
-codemirror@5.48.2
+codemirror@5.48.4
MIT
MIT License
@@ -257,11 +257,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-base64-js@1.3.0
+base64-js@1.3.1
MIT
The MIT License (MIT)
-Copyright (c) 2014
+Copyright (c) 2014 Jameson Little
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Servidor JEE/WebContent/index.html b/Servidor JEE/WebContent/index.html
index b97d491ef7d89ab114f68c4eb1476fd39b8cc43d..e2f639ff4992da579f867a10906b762e1c063eff 100644
--- a/Servidor JEE/WebContent/index.html
+++ b/Servidor JEE/WebContent/index.html
@@ -1,4 +1,4 @@
-<!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script><!--
+<!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/proyectos/matefun/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script><!--
<script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script>
- --><link href="styles.8e9b76ce39821b2f5328.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.95684a2a6beea22e9bb0.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.94941e96a5bd65bdeb71.bundle.js"></script></body></html>
\ No newline at end of file
+ --><link href="styles.1dc6715c59e708068692.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.7971b8aed44589acdfb7.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.94941e96a5bd65bdeb71.bundle.js"></script></body></html>
\ No newline at end of file
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun
index a1d2af05002e286650db9c684ec34d1f4b076396..3c3f25a7d86b8a3b91d633a576ae4309d45f1c35 100755
Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun differ
diff --git a/generate-war.sh b/generate-war.sh
index 12e02fe5e508194ba8a8a706d561041f0052f882..bc5cb83618dbc3973eb942b565afc77d8dd98d27 100644
--- a/generate-war.sh
+++ b/generate-war.sh
@@ -1,5 +1,5 @@
cd Frontend\ Angular\ 4/
-ng build --prod
+ng build --prod --base-href /proyectos/matefun/
cd ..
cp -R Frontend\ Angular\ 4/dist/* Servidor\ JEE/WebContent/
cd Servidor\ JEE/