mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-18 06:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,707 Commits 37 Branches 40 Tags
08e82094466a799c74c7151fa00a08d2d5c8f586
Commit Graph

221 Commits

Author SHA1 Message Date
FrancescoUK
ea7cc16cc9 Regen dist files 2016-09-07 20:28:26 +01:00
jekkos
91b18d032f Replace DOMPDF, GaTracking with composer managed dependencies (#624) 
Fix trim on search bug (#838)
 2016-09-07 09:11:11 +02:00
jekkos
9e01ca2e43 Merge branch 'master' into feature/composer 2016-09-02 17:58:03 +02:00
jekkos
eb59079fe5 Regenerate sql scripts for hashing upgrade (#822) 2016-09-01 19:20:50 +02:00
jekkos
96004f5699 Remove nominatim duplicates (#805) 
Set default notification popup position to center bottom
 2016-08-30 08:42:49 +02:00
jekkos
a2d2965785 Fix nominatim search suggestions + type in login (#805) 2016-08-29 23:30:41 +02:00
jekkos
3d15148b80 Fix broken js + css (regen with correct tags plugin version) (#809) 2016-08-29 23:00:15 +02:00
jekkos
0ec94f1044 Regenerate dist files 2016-08-29 17:54:49 +02:00
jekkos
6e7b32cb1b Remove duplicate suggestions 
Remove duplicate result suggestions in nominatim (#805)
 2016-08-29 17:50:43 +02:00
jekkos
d67b33d996 Reorder inlined javascript 
Regenerate licenses
 2016-08-28 23:07:31 +02:00
jekkos
7677c33ce1 Fix path to login.css (#624) 2016-08-25 17:38:56 +02:00
jekkos
e8a96054ee Merge branch 'master' into feature/composer 
Conflicts:
	dist/opensourcepos.min.js
	public/license/LICENSES
 2016-08-24 16:25:55 +02:00
FrancescoUK
9a6bd6e000 Revert back bootstrap-select to version 1.10.0 (#813) 2016-08-19 18:54:41 +01:00
jekkos
e302086b13 Merge branch 'master' into feature/composer 
Conflicts:
	.travis.yml
	application/controllers/Login.php
	application/views/partial/header.php
	public/dist/opensourcepos.min.js
 2016-08-19 12:09:38 +02:00
FrancescoUK
45675b8f29 Copy COPYING file to license dir, update js plugin, regen dist files 2016-08-18 20:17:54 +01:00
jekkos
d6b009fba8 Fix build after rebase with master 
Enable php socket extension in Dockerfile
 2016-08-18 13:33:01 +02:00
jekkos
a6ba67e2fc Change project layout for composer (#624) 2016-08-18 13:33:01 +02:00
jekkos
6203504976 Remove bootstrap 3.3.6 js from minified file (#489) 
Cleanup dist/ folder (remove duplicated bootswatch themes)
 2016-08-11 08:28:37 +02:00
jekkos
059ec54c72 Make theme configurable from config module (#409) 
Add symlink to bower_components in Docker dev environment (#616)
Move header_debug content back into header view
 2016-08-10 18:58:17 +02:00
jekkos
75567b9620 Fix bootstrap.min.css load in login and header (#409) 2016-08-10 17:16:00 +02:00
FrancescoUK
28e776248b Store all used stylesheets in dist dir, don't rely on css dir (#409) 2016-08-10 10:53:27 +01:00
FrancescoUK
a0886caf2f Added all bootswatch themes and made theming configurable from config.php (#409) 2016-08-10 10:53:27 +01:00
FrancescoUK
fe5e99978c Upgrade always to the latest bootswatch flatly theme (provided is available on bootswatch-dist) 2016-08-04 21:45:25 +01:00
FrancescoUK
cbc42f7868 Upgraded to Bootstrap 3.3.7, dist file regen 2016-08-01 08:31:06 +01:00
jekkos
956f18e55c Round amount due before comparing with zero (#759) 
Bump version chartist tooltip
 2016-07-30 10:23:30 +02:00
jekkos
2519d0fb20 Don't send totals row to server for delete (#686) 
Replace mysql with mariadb in docker images (#616)
 2016-07-26 08:40:54 +02:00
FrancescoUK
a66868651b Update js plugins and regen dist files 2016-07-15 20:47:09 +01:00
FrancescoUK
86b32240d3 Adjusted login and header title line, updated spacelab footer.php 2016-07-10 10:30:44 +01:00
FrancescoUK
fbba5ea2c5 Reduced font size to 13px from 14px, regen dist files (#722) 2016-07-06 13:53:45 +01:00
FrancescoUK
81d1aa7873 Added partial/header_debug, upgraded grunt script, regen dist with updated js plugins 2016-07-05 19:13:27 +01:00
jekkos
5de3f17af8 Show error message if avatar dimensions exceed allowed maximum (#696) 2016-07-05 08:22:09 +02:00
jekkos
7b674b2e3f Fix submit in items, customers and sales (#716) 
Add again new button functionality in items (#712)
Bugfixes for csrf tokens (#599)
 2016-07-04 23:20:14 +02:00
FrancescoUK
a69194745e Fixed template header issues (#714), and email_config tab js issue 2016-07-04 18:12:20 +01:00
jekkos
90660fd9e9 Fix close button in stock details (#14) 2016-07-04 18:03:25 +02:00
jekkos
806c1b9986 Add csrf token in forms (#599, #597) 2016-07-04 17:38:58 +02:00
FrancescoUK
06c74045be Make full use of moment.js for wall clock functionality. Update templates/spacelab header.php 2016-06-30 11:11:19 +01:00
FrancescoUK
7682f02222 Removed language="javascript" as deprecated 2016-06-27 21:04:27 +01:00
FrancescoUK
d2d9aae9ce Regen dist files 2016-06-26 12:06:09 +01:00
jekkos
e25ce12e55 Only mount uploads folder as docker volume (#616) 
Remove base64 jQuery plugin (#684)
 2016-06-25 12:36:36 +02:00
jekkos
57759d2775 Make bootstrap dialog buttons translatable (#439) 
Update deploy instructions in Readme (#616)
Add partial views to load CI translations in javascript (#439)
 2016-06-25 01:54:54 +02:00
FrancescoUK
d378cfdb5f New look for the Reports listing page, code tidy up, dist regen (#695) 2016-06-24 17:55:10 +01:00
jekkos
d72bddbd9d Export data with controller filename (#684) 
Upgrade table export plugin to newer fork
Fix variable substitution in .travis.yml (#616)
 2016-06-21 23:19:05 +02:00
jekkos
0b423f5828 Add utf-8 compatible base64 dependency (#649) 
Don't push to docker hub if no login information set (#616)
 2016-06-21 16:29:56 +02:00
jekkos
4cf1c31d4f Remove padding for comments field in register (#680) 
Properly align checkboxes in right lower corner (#680)
Add fix for bootstrap-tables delete and regen dist (#627)
Tidy up receipt email send code (use empty instead of isset)
 2016-06-21 08:40:56 +02:00
jekkos
8aa46126c5 Use bootstrap grid for payment options in sale register (#116) 
Short review of receipt/invoice email send (#475)
 2016-06-20 21:30:58 +02:00
jekkos
359184934e Fix refresh after deleting all items on last page (#627) 2016-06-16 23:11:40 +02:00
jekkos
1861f4f71f Don't take totals row in takings into account for pagination (#620) 
Reset payment summary css position underneath table
 2016-06-15 17:18:31 +02:00
jekkos
5d494fa08e Fix bstables pagination when deleting all items in last page (#627) 2016-06-14 08:35:14 +02:00
FrancescoUK
11ad1c2476 Regen dist files 2016-06-13 18:58:17 +01:00
FrancescoUK
7980b12239 Disable bootstrap tables escaping, tidy up of Reports unused code (#39) 2016-06-07 17:00:46 +01:00