mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2025-12-24 01:57:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't send totals row to server for delete (#686)

Browse Source 
Replace mysql with mariadb in docker images (#616)
This commit is contained in:
jekkos
2016-07-26 08:39:17 +02:00
parent 28129ef075
commit 2519d0fb20
10 changed files with 1846 additions and 1837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/login.php
View File

@@ -6,7 +6,7 @@
<title><?php echo $this->config->item('company') . ' | OSPOS ' . $this->config->item('application_version') . ' | ' . $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=0ff26f4768"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<!-- end css template tags -->

6
application/views/partial/header.php
View File

@@ -12,12 +12,12 @@
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=0ff26f4768"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b003b9c4a3"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=0ad5e454a4"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ca4b8f4943"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=52a2324353"></script>
<!-- end minjs template tags -->
<?php endif; ?>

3629
dist/opensourcepos.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

22
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docker-cloud.yml
View File

@@ -16,7 +16,7 @@ web:
- MYSQL_DB_NAME=ospos
- MYSQL_HOST_NAME=mysql
mysql:
image: mysql:5.6
image: mariadb:10.0.26
environment:
- MYSQL_ROOT_PASSWORD=pointofsale
- MYSQL_DATABASE=ospos

2
docker-compose.yml
View File

@@ -26,7 +26,7 @@ services:
- MYSQL_HOST_NAME=mysql
mysql:
image: mysql:5.6
image: mariadb:10.0.26
environment:
- MYSQL_ROOT_PASSWORD=pointofsale
- MYSQL_DATABASE=ospos

2
js/manage_tables.js
View File

@@ -111,7 +111,7 @@
var selected_ids = function () {
return $.map(table().getSelections(), function (element) {
return element[options.uniqueId || 'id'];
return element[options.uniqueId || 'id'] !== '-' ? element[options.uniqueId || 'id'] : null;
});
};

2
templates/spacelab/views/login.php
View File

@@ -6,7 +6,7 @@
<title><?php echo $this->config->item('company') . ' | OSPOS ' . $this->config->item('application_version') . ' | ' . $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=0ff26f4768"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- end css template tags -->

6
templates/spacelab/views/partial/header.php
View File

@@ -11,14 +11,14 @@
<!--[if lte IE 8]>
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=0ff26f4768"/>
<!-- 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=b003b9c4a3"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=0ad5e454a4"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ca4b8f4943"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=52a2324353"></script>
<!-- end minjs template tags -->
<?php endif; ?>