mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-29 11:41:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,675 Commits 37 Branches 39 Tags
a5b2c823959df71093d6002b074e419a7c231bef
Commit Graph

1239 Commits

Author SHA1 Message Date
jekkos
e8a96054ee Merge branch 'master' into feature/composer 
Conflicts:
	dist/opensourcepos.min.js
	public/license/LICENSES
 2016-08-24 16:25:55 +02:00
jekkos
dc0245c4fb Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer 2016-08-23 18:28:50 +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
59bbe55215 Install CI langauges in system/language as before (#624) 
Map CI language folder with ospos language code
 2016-08-18 08:27:54 +02:00
jekkos
af6b323013 Fix build after rebase with master 
Enable php socket extension in Dockerfile
 2016-08-14 11:58:15 +02:00
jekkos
3f34775000 Change project layout for composer (#624) 2016-08-14 11:58:15 +02:00
FrancescoUK
2bda02dd74 Further bug fixes 2016-08-13 18:17:17 +01:00
FrancescoUK
01aeca579a Code refactoring and bug fixes 2016-08-13 14:07:27 +01:00
FrancescoUK
2555203a54 Arab translation amendments (#794) 2016-08-12 21:51:35 +01:00
FrancescoUK
b77d368885 Refactoring and statistics support 2016-08-12 21:23:26 +01:00
FrancescoUK
4b569d093b Made the password input glyphicons consistent across OSPOS (#731) 2016-08-12 10:13:43 +01:00
FrancescoUK
51bdfc050e Update Spanish translation (#750) 2016-08-11 22:26:18 +01:00
FrancescoUK
1b19fed206 Updated login page (#731) 2016-08-11 18:36:59 +01:00
FrancescoUK
55764d7625 Updated Theme translation (#794) 2016-08-11 13:26:39 +01:00
FrancescoUK
dd8d848544 Updated Arabic (EG) and Portuguese (BR) translations (#794 #795) 2016-08-11 09:41:45 +01: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
jekkos
4c337aa5c6 Try to fix travis docker setup + remove jquery validator override (#788, #616) 2016-08-10 15:26:18 +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
333067955c Improved theme config option comment (#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
jekkos
8b08bf5daa Add frontside support for locale dependent number validation (#788) 2016-08-09 18:20:52 +02:00
FrancescoUK
597a5caee5 XSS clean the license text (#359) 2016-08-08 16:09:40 +01:00
FrancescoUK
19403adde2 Read plugin LICENSES json and display in Store Config (#359) 2016-08-08 15:54:29 +01:00
FrancescoUK
266610399d Fixed Arabic (Egypt) translations (#756) 2016-08-07 17:07:17 +01:00
FrancescoUK
3ed454d1b3 Fixed missing location_id error in Graphical Summary Tax report (#785) 2016-08-06 11:59:17 +01:00
FrancescoUK
2402da6e30 Added Arabic (Egypt) translations (#756) 2016-08-06 10:39:46 +01:00
FrancescoUK
c76109ab0a Update to Code Igniter 3.1.0 (#782) 2016-08-04 22:25:17 +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
63a6706770 Fixed comment sentence that was unclear 2016-08-03 07:36:02 +01:00
FrancescoUK
4ea056e3f7 Fixed Item exists where issue (#666) 2016-08-02 17:25:49 +01:00
FrancescoUK
5f1d9e7f45 Fixed cart enter issue in receiving (#775) 2016-08-02 17:22:08 +01:00
jekkos
9fa2676352 Fix exists by doing string comparison using like clause (#666) 2016-08-01 13:58:07 +02:00
jekkos
76630365e7 Fix submit on enter for secondary sale lines (#771) 2016-08-01 13:27:45 +02:00
FrancescoUK
cbc42f7868 Upgraded to Bootstrap 3.3.7, dist file regen 2016-08-01 08:31:06 +01:00
FrancescoUK
fba0915c42 Fixed DB backup error due to & (#629) 2016-08-01 08:24:16 +01:00
jekkos
ab075fd94f Amount due can be negative as well (#733)) 2016-07-30 15:52:06 +02: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
jekkos
28129ef075 Set calculation precision to currency + tax decimals (#759) 2016-07-25 21:28:56 +02:00
jekkos
0727ae06af Regenerate language files (#750) 2016-07-25 18:05:06 +02:00
jekkos
352586531f Fix graphical items summary report (#742) 2016-07-25 17:37:54 +02:00
jekkos
745874f0b3 Fix graphical items summary report (#742) 2016-07-21 01:41:22 +02:00
jekkos
d8e4bf48d8 Check if payments cover sale with exact precision (#733) 
Set bc-operation style scale globally
Add location filtering in graphical and summary reports (#742)
 2016-07-20 20:43:31 +02:00