mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-24 00:58:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reorder inlined javascript

Browse Source 
Regenerate licenses
This commit is contained in:
jekkos committed 2016-08-28 23:07:31 +02:00
1 parent 375408a7a7
commit d67b33d996
14 files changed
+43119 -42482
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.dockerignore
-1
View File
@@ -1,5 +1,4 @@
node_modules
bower_components
tmp
application/config/email.php
application/config/database.php
.gitattributes
+1
View File
@@ -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
Dockerfile
+1 -1
View File
@@ -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
application/config/config.php
+1 -12
View File
@@ -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
application/controllers/Secure_Controller.php
+1 -1
View File
@@ -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;
application/views/partial/footer.php
+1 -1
View File
@@ -4,7 +4,7 @@
<div id="footer">
<div class="jumbotron push-spaces">
<strong><?php echo $this->lang->line('common_you_are_using_ospos'); ?>
<?php echo $this->config->item('application_version'); ?> - <?php echo substr($this->config->item('commit_sha1'), 5, 12); ?></strong>.
<?php echo $this->config->item('application_version'); ?> - <?php echo substr('$Id$', 5, 7); ?></strong>.
<?php echo $this->lang->line('common_please_visit_my'); ?>
<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
<?php echo $this->lang->line('common_learn_about_project'); ?>
application/views/partial/header.php
+6 -4
View File
@@ -6,6 +6,7 @@
<title><?php echo $this->config->item('company') . ' | ' . $this->lang->line('common_powered_by') . ' OSPOS ' . $this->config->item('application_version') ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<link rel="stylesheet" type="text/css" href="<?php echo 'dist/bootswatch/' . (empty($this->config->item('theme')) ? 'flatly' : $this->config->item('theme')) . '/bootstrap.min.css' ?>"/>
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css" />
@@ -55,6 +56,7 @@
<script src="bower_components/chartist-plugin-tooltip/dist/chartist-plugin-tooltip.min.js"></script>
<script src="bower_components/remarkable-bootstrap-notify/bootstrap-notify.js"></script>
<script src="bower_components/js-cookie/src/js.cookie.js"></script>
<script src="bower_components/blockUI/jquery.blockUI.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/imgpreview.full.jquery.js"></script>
@@ -67,16 +69,16 @@
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=e884819322"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3e479ff055"/>
<link rel="stylesheet" type="text/css" href="dist/style.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=b6d4e5986e"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=900ac71ed4"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<?php $this->load->view('partial/lang_lines'); ?>
<?php $this->load->view('partial/header_js'); ?>
<?php $this->load->view('partial/lang_lines'); ?>
<style type="text/css">
html {
@@ -94,7 +96,7 @@
</div>
<div class="navbar-right" style="margin:0">
<?php echo $this->config->item('company') . " | $user_info->first_name $user_info->last_name | "; ?>
<?php echo $this->config->item('company') . " | $user_info->first_name $user_info->last_name | " . ($this->input->get("debug") == "true" ? $this->session->userdata('footer_sha1') : ""); ?>
<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
</div>
</div>
application/views/partial/header_js.php
+2
View File
@@ -44,4 +44,6 @@
}
});
footer_sha1 = '<?php echo $this->session->userdata('footer_sha1'); ?>';
</script>
bower.json
+2 -1
View File
@@ -41,7 +41,8 @@
"chartist-plugin-pointlabels": "^0.0.4",
"chartist-plugin-tooltip": "^0.0.13",
"remarkable-bootstrap-notify": "^3.1.3",
"js-cookie": "^2.1.2"
"js-cookie": "^2.1.2",
"blockUI": "*"
},
"overrides": {
"jquery-ui": {
dist/opensourcepos.js
Vendored
+42975 -42350
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.css
Vendored
+8 -8
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+31 -26
View File
File diff suppressed because one or more lines are too long.
js/manage_tables.js
+8 -1
View File
@@ -334,4 +334,11 @@
}
}, form_support.error);
})(window.form_support = window.form_support || {}, jQuery);
})(window.form_support = window.form_support || {}, jQuery);
$(document).ready(function() {
if (footer_sha1 != $("#footer strong").text().split("- ")[1])
{
$(window).block({ message: '' });
}
});
license/LICENSES
+82 -76
View File
@@ -1,45 +1,45 @@
{
"blockUI@undefined": {
"licenses": [
"MIT*"
],
"homepage": "http://jquery.malsup.com/block/"
},
"bootstrap-select@1.10.0": {
"licenses": [
"MIT"
],
"homepage": "http://silviomoreto.github.io/bootstrap-select"
},
"bootstrap3-dialog@1.35.2": {
"licenses": "UNKNOWN",
"homepage": "http://nakupanda.github.io/bootstrap3-dialog/"
},
"bootswatch@3.3.7": {
"licenses": [
"MIT"
],
"repository": {
"type": "git",
"url": "git://github.com/thomaspark/bootswatch.git"
},
"homepage": "http://bootswatch.com"
},
"chartist@0.9.8": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/gionkunz/chartist-js"
},
"jquery-form@3.46.0": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/malsup/form"
},
"tableExport.jquery.plugin@1.5.1": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/hhurz/tableExport.jquery.plugin"
},
"jquery@1.12.4": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/jquery/jquery-dist"
},
"chartist-plugin-axistitle@0.1.0": {
"licenses": [
"WTF*"
],
"homepage": "https://github.com/alexstanbury/chartist-plugin-axistitle"
},
"bootstrap3-dialog@1.35.2": {
"licenses": "UNKNOWN",
"homepage": "http://nakupanda.github.io/bootstrap3-dialog/"
},
"moment@2.14.1": {
"chartist-plugin-pointlabels@0.0.4": {
"licenses": [
"MIT*"
"WTF*"
],
"homepage": "https://github.com/moment/moment"
},
"file-saver.js@1.20150507.2": {
"licenses": [
"LICENSE.md"
],
"homepage": "https://github.com/Teleborder/FileSaver.js"
"homepage": "https://github.com/gionkunz/chartist-plugin-pointlabels"
},
"chartist-plugin-tooltip@0.0.13": {
"licenses": [
@@ -47,11 +47,21 @@
],
"homepage": "https://github.com/Globegitter/chartist-plugin-tooltip"
},
"chartist-plugin-pointlabels@0.0.4": {
"file-saver.js@1.20150507.2": {
"licenses": [
"WTF*"
"LICENSE.md"
],
"homepage": "https://github.com/gionkunz/chartist-plugin-pointlabels"
"homepage": "https://github.com/Teleborder/FileSaver.js"
},
"jquery@1.12.4": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/jquery/jquery-dist"
},
"jquery-form@3.46.0": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/malsup/form"
},
"js-cookie@2.1.2": {
"licenses": [
@@ -65,43 +75,24 @@
],
"homepage": "https://github.com/mrrio/jspdf"
},
"bootswatch@3.3.7": {
"moment@2.14.1": {
"licenses": [
"MIT*"
],
"homepage": "https://github.com/moment/moment"
},
"tableExport.jquery.plugin@1.5.1": {
"licenses": [
"MIT"
],
"repository": {
"type": "git",
"url": "git://github.com/thomaspark/bootswatch.git"
},
"homepage": "http://bootswatch.com"
"homepage": "https://github.com/hhurz/tableExport.jquery.plugin"
},
"bootstrap-select@1.10.0": {
"bootstrap@3.3.7": {
"licenses": [
"MIT"
],
"homepage": "http://silviomoreto.github.io/bootstrap-select"
},
"smalot-bootstrap-datetimepicker@2.3.11": {
"licenses": [
"Apache 2.0",
"Apache*"
],
"homepage": "https://github.com/smalot/bootstrap-datetimepicker",
"repository": "https://github.com/smalot/bootstrap-datetimepicker"
},
"bootstrap-table@1.11.0": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/wenzhixin/bootstrap-table",
"repository": "git+https://github.com/wenzhixin/bootstrap-table"
},
"jquery-validation@1.13.1": {
"licenses": [
"MIT"
],
"repository": "https://github.com/jzaefferer/jquery-validation",
"homepage": "http://jqueryvalidation.org/"
"homepage": "http://getbootstrap.com",
"repository": "git+https://github.com/twbs/bootstrap"
},
"bootstrap-daterangepicker@2.1.24": {
"licenses": [
@@ -117,20 +108,6 @@
"homepage": "https://github.com/niklasvh/html2canvas",
"repository": "git+ssh://git@github.com/niklasvh/html2canvas"
},
"bootstrap@3.3.7": {
"licenses": [
"MIT"
],
"homepage": "http://getbootstrap.com",
"repository": "git+https://github.com/twbs/bootstrap"
},
"jspdf-autotable@2.0.14": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/simonbengtsson/jspdf-autotable",
"repository": "git+https://github.com/simonbengtsson/jsPDF-AutoTable"
},
"jasny-bootstrap@3.1.3": {
"licenses": [
"Apache-2.0",
@@ -139,6 +116,20 @@
"homepage": "https://github.com/jasny/bootstrap",
"repository": "git+https://github.com/jasny/bootstrap"
},
"bootstrap-table@1.11.0": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/wenzhixin/bootstrap-table",
"repository": "git+https://github.com/wenzhixin/bootstrap-table"
},
"jquery-validation@1.13.1": {
"licenses": [
"MIT"
],
"repository": "https://github.com/jzaefferer/jquery-validation",
"homepage": "http://jqueryvalidation.org/"
},
"remarkable-bootstrap-notify@3.1.3": {
"licenses": [
"MIT"
@@ -146,6 +137,21 @@
"homepage": "http://bootstrap-notify.remabledesigns.com/",
"repository": "https://github.com/mouse0270/bootstrap-notify"
},
"jspdf-autotable@2.0.14": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/simonbengtsson/jspdf-autotable",
"repository": "git+https://github.com/simonbengtsson/jsPDF-AutoTable"
},
"smalot-bootstrap-datetimepicker@2.3.11": {
"licenses": [
"Apache 2.0",
"Apache*"
],
"homepage": "https://github.com/smalot/bootstrap-datetimepicker",
"repository": "https://github.com/smalot/bootstrap-datetimepicker"
},
"jquery-ui@1.11.4": {
"licenses": [
"MIT"