mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-25 09:48:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,123 Commits 37 Branches 39 Tags
28d89c685bc5aedabb71b993fa329b506960f044
Commit Graph

297 Commits

Author SHA1 Message Date
FrancescoUK
26d5605de5 Regen db, js, css files 2017-04-15 10:21:52 +01:00
FrancescoUK
0e60d5e6e1 Updated js plugins 2017-03-25 19:17:43 +00:00
FrancescoUK
00f99c524a Updated LICENSE, upgraded js plugin and regen dist files 2017-03-13 14:38:27 +00:00
FrancescoUK
3f489d6f53 Fix payment issue (#1182) regen sql script files 2017-03-12 22:12:42 +00:00
Joshua Fernandes
deea43ce67 customer reward points first phase work 2017-03-04 16:13:56 +05:30
Jorge Colmenarez
6826115b2d Support for Configurable Dinner Tables Feature 2017-02-26 15:35:21 -04:00
FrancescoUK
78cb4822c2 Updated js plugins and composer 2017-02-11 20:51:32 +00:00
FrancescoUK
ceb9687e5e Merge pull request #1115 from jlctmaster/date_or_time_format 
Fixed bug sales data preview of day (#932)
 2017-02-03 22:04:30 +00:00
Jorge Colmenarez
7a4525319a Fixed bug sales data preview of day when date or time field is checked into config location tab 2017-02-03 15:39:11 -04:00
i92guboj
b373b1e07e Merge branch 'master' into pic_filename 2017-01-30 17:45:47 +01:00
FrancescoUK
bb5d39cd0d Fix partial/header.php change 2017-01-29 17:35:11 +00:00
RamkrishnaMondal
17ff097406 Third commit 2017-01-29 17:35:11 +00:00
RamkrishnaMondal
03af00e26e First commit 2017-01-29 17:35:11 +00:00
jekkos
ba95853884 Remove quirk in master (#1076) 2017-01-29 17:35:11 +00:00
jekkos
258622ec87 Enable jsPrint for custom receipt templates (#1070) 2017-01-29 17:35:11 +00:00
jekkos
9b473e415d Hook standard jquery submit function and update csrf (#1019) 2017-01-29 17:19:00 +00:00
i92guboj
6095577f47 ran grunt 2016-12-20 22:03:16 +01:00
i92guboj
c6e4584f71 Convert pic_id to pic_filename - db and csv files 2016-12-19 18:37:52 +01:00
root
305d9dd55e Support for Date or Time Format 2016-11-30 14:32:25 -04:00
jekkos
7d4dff0a37 Remove percentage sign from number_sorter regex (#1003) 2016-11-26 15:54:04 +01:00
jekkos
1ed76fa091 Properly parse negative numbers + rename currency_sorter (#1003) 2016-11-26 15:46:27 +01:00
jekkos
422e2ddbab Add currency sorting for summary reports (#1003) 2016-11-26 14:49:41 +01:00
FrancescoUK
35e76bdd4d Add value label on bars in bar/hbar charts 2016-11-15 18:41:17 +00:00
FrancescoUK
0e2f84c91d Update js plugins and regen dist files 2016-11-13 18:52:57 +00:00
FrancescoUK
868868163c Replace Appconfig->get with config->item to reduce database calls 2016-11-08 20:09:40 +00:00
jekkos
8217b70984 Fix debug mode + simplify Gruntfile 2016-10-06 22:12:33 +02:00
FrancescoUK
5a2bd9a569 Fix css and js broken URL issue (#624) 2016-10-02 09:41:23 +01:00
jekkos
86de36d731 Fix include paths for debug js + css 2016-10-02 00:19:46 +02:00
jekkos
592f378d2a Include fixes for GA Client, CI Email bug and bstables fix 2016-10-01 23:52:03 +02:00
FrancescoUK
974744858f Upgrade js plugins and regen dist files 2016-10-01 11:14:08 +01:00
FrancescoUK
3b00c5bf9e Updated js plugins and regen dist files 2016-09-15 22:28:49 +01:00
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
2c1231ca61 Install CI langauges in system/language as before (#624) 
Map CI language folder with ospos language code
 2016-08-18 13:33:02 +02: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