Merge branch 'may_general_2018'

oscmedgon · May 21, 2018 · f3bd1be · f3bd1be
2 parents d6b312b + 27d0907
commit f3bd1be
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 26 deletions.
diff --git a/server/app.js b/server/app.js
@@ -39,6 +39,7 @@ app.locals.moment = moment;
 app.use(express.static(path.join(__dirname, 'public')));
 
 // Parsing body requests
+app.use(bodyParser.text({limit: 2000000}))
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 app.use(tokenParser);

diff --git a/server/public/administration/index.html b/server/public/administration/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css"><title>HoD Administration</title><link href="/static/css/main.40da3e3a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"http"===window.location.protocol&&(window.location.protocol="https")</script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script type="text/javascript" src="/static/js/main.bbcb661c.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css"><title>HoD Administration</title><link href="/static/css/main.1966c1d2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"http"===window.location.protocol&&(window.location.protocol="https")</script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script type="text/javascript" src="/static/js/main.7160623d.js"></script></body></html>
diff --git a/server/public/asset-manifest.json b/server/public/asset-manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "static/css/main.40da3e3a.css",
-  "main.css.map": "static/css/main.40da3e3a.css.map",
-  "main.js": "static/js/main.bbcb661c.js",
-  "main.js.map": "static/js/main.bbcb661c.js.map"
+  "main.css": "static/css/main.1966c1d2.css",
+  "main.css.map": "static/css/main.1966c1d2.css.map",
+  "main.js": "static/js/main.7160623d.js",
+  "main.js.map": "static/js/main.7160623d.js.map"
 }
diff --git a/...public/scripts/bundle.1523717925.debug.js → ...public/scripts/bundle.1526872570.debug.js b/...public/scripts/bundle.1523717925.debug.js → ...public/scripts/bundle.1526872570.debug.js
diff --git a/server/public/scripts/bundle.1523717925.js → server/public/scripts/bundle.1526872570.js b/server/public/scripts/bundle.1523717925.js → server/public/scripts/bundle.1526872570.js
diff --git a/server/public/service-worker.js b/server/public/service-worker.js
diff --git a/server/public/static/css/main.40da3e3a.css → server/public/static/css/main.1966c1d2.css b/server/public/static/css/main.40da3e3a.css → server/public/static/css/main.1966c1d2.css
diff --git a/...r/public/static/css/main.40da3e3a.css.map → ...r/public/static/css/main.1966c1d2.css.map b/...r/public/static/css/main.40da3e3a.css.map → ...r/public/static/css/main.1966c1d2.css.map
diff --git a/server/public/static/js/main.7160623d.js b/server/public/static/js/main.7160623d.js
diff --git a/server/public/static/js/main.7160623d.js.map b/server/public/static/js/main.7160623d.js.map
diff --git a/server/public/static/js/main.bbcb661c.js b/server/public/static/js/main.bbcb661c.js
diff --git a/server/public/static/js/main.bbcb661c.js.map b/server/public/static/js/main.bbcb661c.js.map
diff --git a/server/public/styles/bundle/bundle.1523717925.map.css/bundle.1523717925.css.map b/server/public/styles/bundle/bundle.1523717925.map.css/bundle.1523717925.css.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css"><title>HoD Administration</title><link href="/static/css/main.40da3e3a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"http"===window.location.protocol&&(window.location.protocol="https")</script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script type="text/javascript" src="/static/js/main.bbcb661c.js"></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css"><title>HoD Administration</title><link href="/static/css/main.1966c1d2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"http"===window.location.protocol&&(window.location.protocol="https")</script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script><script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" charset="utf-8"></script><script type="text/javascript" src="/static/js/main.7160623d.js"></script></body></html>