From d67b33d996e887c076fcdfa4079b8649e1d6f3b4 Mon Sep 17 00:00:00 2001 From: jekkos Date: Thu, 18 Aug 2016 17:23:29 +0200 Subject: [PATCH] Reorder inlined javascript Regenerate licenses --- .dockerignore | 1 - .gitattributes | 1 + Dockerfile | 2 +- application/config/config.php | 13 +- application/controllers/Secure_Controller.php | 2 +- application/views/partial/footer.php | 2 +- application/views/partial/header.php | 10 +- application/views/partial/header_js.php | 2 + bower.json | 3 +- dist/opensourcepos.js | 85325 ++++++++-------- dist/opensourcepos.min.css | 16 +- dist/opensourcepos.min.js | 57 +- js/manage_tables.js | 9 +- license/LICENSES | 158 +- 14 files changed, 43119 insertions(+), 42482 deletions(-) diff --git a/.dockerignore b/.dockerignore index 544c9b50c..6ce330c74 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ node_modules -bower_components tmp application/config/email.php application/config/database.php diff --git a/.gitattributes b/.gitattributes index 65fd95ef1..b89b92b39 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ dist/ merge=ours application/language/**/*.php merge=ours text=auto application/config/config.php ident +application/views/partial/footer.php ident diff --git a/Dockerfile b/Dockerfile index 709ef980e..513312512 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libgd-dev RUN a2enmod rewrite -RUN docker-php-ext-install mysql mysqli bcmath intl gd +RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets RUN echo "date.timezone = \"UTC\"" > /usr/local/etc/php/conf.d/timezone.ini WORKDIR /app diff --git a/application/config/config.php b/application/config/config.php index 840336996..cc9be81ec 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -12,22 +12,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); */ $config['application_version'] = '3.0.0'; -/* -|-------------------------------------------------------------------------- -| Commit sha1 -|-------------------------------------------------------------------------- -| -| This is the commit hash for the version you are currently using -| -| -*/ -$config['commit_sha1'] = '$Id$'; - /* |-------------------------------------------------------------------------- | Internal to OSPOS XSS Clean |-------------------------------------------------------------------------- -| +|² | This is to indicated whether we want XSS clean to be performed or not | By default it's enabled as it's assumed the installation has Internet access and needs to be protected, | however intranet only installations may not need this so they can set FALSE to improve performance diff --git a/application/controllers/Secure_Controller.php b/application/controllers/Secure_Controller.php index f13bcd83b..0993503e4 100644 --- a/application/controllers/Secure_Controller.php +++ b/application/controllers/Secure_Controller.php @@ -26,7 +26,7 @@ class Secure_Controller extends CI_Controller { redirect('no_access/' . $module_id . '/' . $submodule_id); } - + // load up global data visible to all the loaded views $data['allowed_modules'] = $this->Module->get_allowed_modules($logged_in_employee_info->person_id); $data['user_info'] = $logged_in_employee_info; diff --git a/application/views/partial/footer.php b/application/views/partial/footer.php index fef0a0a44..4f5ad5761 100644 --- a/application/views/partial/footer.php +++ b/application/views/partial/footer.php @@ -4,7 +4,7 @@