mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-16 22:18:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
914 Commits 64 Branches 38 Tags
55d6237f93a094fdadfb6c46b434491efaecae44
Commit Graph

914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FrancescoUK
55d6237f93 Add caching hints for mod_expires (#340) 2016-02-21 19:28:58 +00:00
FrancescoUK
349da7e7ad fix font issue, split bootstrap.min.css out of opensourcepos.min.css, grunt upgrades header.php and login.php (#329, #116) 
requires npm install to install bowercopy
 2016-02-21 19:14:04 +00:00
jekkos
1aa5c72db3 Tune css inclusion (use negation for unwanted files in header.php) 2016-02-20 15:08:29 +01:00
FrancescoUK
fc20b74b57 fix wrong css file sequence generation with grunt, add bootstrap-select (not used yet) (#329) 2016-02-19 23:31:18 +00:00
FrancescoUK
7236902143 restore correct style for the main page module list (#329) 2016-02-19 23:30:42 +00:00
FrancescoUK
cf92544600 manage better meridiem cases with datetimepicker (use strpos) (#116) 2016-02-19 19:07:39 +00:00
jekkos
ab87b30423 Update .gitignore to exclude intermediate minified files 2016-02-19 19:04:14 +01:00
jekkos
0ad30370ae Do not include login.css in minified result (#329) 2016-02-19 19:04:06 +01:00
jekkos
30223c38e1 Fix css minification (#329) 
Fix suspended sales dialog (set class to modal-dlg)
 2016-02-19 19:03:56 +01:00
jekkos
967ba99c12 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/configs/locale_config.php
	application/views/receivings/receiving.php
	application/views/sales/register.php
 2016-02-18 23:38:39 +01:00
jekkos
d2a11cdb91 Bootstrappify config forms - WIP (#116) 2016-02-18 23:30:21 +01:00
FrancescoUK
bb966feb8a small indentation adjustment (#116) 2016-02-18 22:06:47 +00:00
FrancescoUK
ebaec8de26 remove white gap in sales/register items table (#116) 2016-02-18 21:30:33 +00:00
FrancescoUK
ee4297e22c fix sales/register and receiving button, styles, alignment and code tidy up (#116) 2016-02-18 21:16:07 +00:00
jekkos
aae36bce00 Merge branch 'feature/bower+grunt' into feature/bootstrapUI 2016-02-18 17:42:38 +01:00
jekkos
4a7e0af9a2 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 2016-02-18 17:42:20 +01:00
jekkos
808943f250 Add bootstrap form style to item kits, suppliers, giftcards, and excel import in 
items and customers (#118)
Fix dialog submission in all pages (#328)
 2016-02-18 08:57:17 +01:00
FrancescoUK
f19e7142cd complete datetimepicker change with proper date and time formats support (#116) 2016-02-17 22:47:59 +00:00
jekkos
82a3f9a3e2 Add new dialogs to all pages (use modal-dlg class) #116 
Bootstrapify customer edit form (almost done)
Bootstrapify item excel impor
 2016-02-17 23:34:53 +01:00
FrancescoUK
66a5a159d8 add language support to datetimepicker using ospos translation support (#116) 
Translated languages: en, es, fr, de-CH, nl-BE
 2016-02-16 23:16:03 +00:00
jekkos
a5107445f0 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/configs/barcode_config.php
 2016-02-16 23:59:49 +01:00
jekkos
c99ef3f315 Bootstrapify item edit form (#116) 
Use bootstrap-dialog in items inventory and inventory details (#328)
 2016-02-16 23:42:20 +01:00
FrancescoUK
cd5094d389 fix barcode_config barcode_lib->listfonts "font" to be "fonts" (#116) 2016-02-16 21:32:58 +00:00
FrancescoUK
d1a596b0be fix php error on suggestion typing when in sale register return mode (#331) 2016-02-16 21:28:10 +00:00
jekkos
a97929f239 Remove thickbox from bower.json (#328) 
Items edit working now (items module only) (#116)
 2016-02-16 21:41:02 +01:00
jekkos
444ba37eb1 Import bower compatible dependencies using bower+grunt (#329) 
Cleanup obsolete js + css files (jquery-ui)
 2016-02-15 22:52:58 +01:00
FrancescoUK
52487a4a78 Remove datetimepicker locales as the translation will use I18N but leveraging OSPOS translations (#116) 2016-02-15 21:51:53 +00:00
FrancescoUK
b6adf916c4 fixed arrow icons issue, bootcssVer autodetect doesn't work and needs explicit declaration (#116) 2016-02-15 09:31:44 +00:00
FrancescoUK
f92082270d add locale js for bootstrap-datetimepicker and regenerated min.js (#116) 
locale not tested, js script seems unaffected
 2016-02-14 23:32:50 +00:00
FrancescoUK
4667282966 add FontAwesome font (#116) 2016-02-14 23:30:57 +00:00
FrancescoUK
5546700fee upgrade templates/spacelab bootstrap.css to latest (#116) 2016-02-14 23:30:10 +00:00
FrancescoUK
644a159d0a remove completely flatly dir from templates (#116) 2016-02-14 23:29:06 +00:00
FrancescoUK
3156ce217b upgrade to latest flatly bootstrap.css (#116) 2016-02-14 23:24:42 +00:00
FrancescoUK
7c10a9a63a rename font directory to fonts so we are inline with bootstrap (#116) 2016-02-14 23:03:32 +00:00
FrancescoUK
fc3aac58b5 select transaction in Takings inclusive of time, fix Sale edit form to use bootstrap-datetimepicker (#116) 2016-02-14 22:41:10 +00:00
FrancescoUK
d788320a9d Tidy up js in Sales/manage and Items/manage, commented out invoice js part as not used (#116) 2016-02-14 19:42:08 +00:00
FrancescoUK
0f4d5e8f1b Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future (#116) 2016-02-14 19:40:18 +00:00
FrancescoUK
c5ab15ca64 Revert post TRUE change for XSS filtering (#116) 2016-02-14 13:05:42 +00:00
FrancescoUK
42312bcc20 Complete tidy up of unneeded table filter id, add TRUE for XSS filtering (#116) 2016-02-13 21:49:08 +00:00
FrancescoUK
d69a3c6130 Fix tables (detailed sale report) colour for inner table (#116) 2016-02-13 21:47:10 +00:00
jekkos
d003239525 Items form bootstrapified (working in Chrome) (#116, #328) 2016-02-13 14:42:01 +01:00
jekkos
45cb6bc4f7 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 2016-02-13 14:14:40 +01:00
jekkos
b361d78051 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	templates/flatly/css/style.css
 2016-02-13 14:14:30 +01:00
FrancescoUK
8438942b10 use bootstrap-datetimepicker instead of jquery-ui-timepicker-addon in Items and Takings (#116) 
There is an issue with Takings filtering that needs fixing and also arrows are not showing in the datetimepicker.
 2016-02-13 12:29:15 +00:00
jekkos
2be22d8e48 Migrate thickbox in items to bootstrap modal dialog (#328) 2016-02-13 13:17:29 +01:00
FrancescoUK
1be861cd8d change empty table to be alert-info instead of alert-warning (#116) 2016-02-13 11:28:12 +00:00
FrancescoUK
e0745b5109 make flatly OSPOS default, tidied up stylesheets, added bootstrap-datetimepicker js no support yet (#116) 2016-02-13 09:54:49 +00:00
FrancescoUK
792f6c4154 Remove zip file committed by mistake (#116) 2016-02-12 10:36:33 +00:00
FrancescoUK
23b086fbc2 added jasny-bootstrap-3.1.3, removed bootstrap.file-input and changed image upload in general config (#116) 
For jasny-bootstrap-3.1.3 see: http://www.jasny.net/bootstrap/
 2016-02-12 09:32:21 +00:00
FrancescoUK
e35bd81c8b Fix File Choose boostrap jQuery plugin not working with latest submission (#116) 2016-02-11 08:13:06 +00:00