mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-23 00:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
866 Commits 37 Branches 39 Tags
23b086fbc25d8979ca556ef40228130ea8e1e00a
Commit Graph

602 Commits

Author SHA1 Message Date
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
jekkos
3f12930223 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/partial/header.php
	dist/opensourcepos.js
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
 2016-02-11 08:00:47 +01:00
jekkos
5fad0e13e8 Upgrade to jQuery 1.12.0 + regen minified js 2016-02-11 07:03:43 +01:00
jekkos
715eac28c8 Add jquery-migrate-1.3.0 (solves js issues) 2016-02-11 07:00:02 +01:00
FrancescoUK
d31e1cef8f Remove double jQuery line for file input (#116) 2016-02-10 23:35:38 +00:00
FrancescoUK
e99b9cbe41 Make choose file in General Configuration bootstrap (#116) 
Used following jQuery plugin: http://gregpike.net/demos/bootstrap-file-input/demo.html
 2016-02-10 23:27:28 +00:00
FrancescoUK
2f1d0fd4f7 Make edit item button in register bootstrap one (#116) 2016-02-10 20:37:05 +00:00
jekkos
2aae378808 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 2016-02-10 21:36:55 +01:00
FrancescoUK
29cdb8103f Fix to sales edit server error when customer is '' (#116) 2016-02-10 20:16:20 +00:00
FrancescoUK
7a85d70139 Restore config.php comment line that somehow was cut out (#116) 2016-02-10 17:25:55 +00:00
FrancescoUK
e78d5ba461 Make empty table alert info not warning (#116) 2016-02-10 17:25:44 +00:00
FrancescoUK
5aefa2a116 Make add payment button the same style as complete sale (#116) 2016-02-10 17:25:34 +00:00
jekkos
32cbf109a4 Fix javascript minification in Grunt build 
Fix config tab navigation in bootstrap (#116)
 2016-02-10 17:25:19 +00:00
jekkos
d15f341f90 Trigger cachebreaker in all header.php files 
Apply center-align style for barcode only on receipt
Remove obsolete tabcontent.js
Update js scritps in spacelab header (#116)
 2016-02-10 17:24:49 +00:00
jekkos
b6d57a8f0e Add bootstrap 3.3.6 js file (needs jquery 1.9 minimum!) 
Upgrade jquery to 1.12.0, remove older version + rebuild using grunt
Remove obsolete css for tabcontent
Remove 'custom' javascript for tabs in config module (#116)
 2016-02-10 17:24:16 +00:00
jekkos
c48252790e Bootstrapify config module (#116) 2016-02-10 17:23:47 +00:00
jekkos
5c95e02eac Fix javascript minification in Grunt build 
Fix config tab navigation in bootstrap
 2016-02-10 08:43:01 +01:00
jekkos
b1b125d2a4 Trigger cachebreaker in all header.php files 
Apply center-align style for barcode only on receipt
Remove obsolete tabcontent.js
Update js scritps in spacelab header
 2016-02-09 20:02:16 +01:00
jekkos
634e626717 Add bootstrap 3.3.6 js file (needs jquery 1.9 minimum!) 
Upgrade jquery to 1.12.0, remove older version + rebuild using grunt
Remove obsolete css for tabcontent
Remove 'custom' javascript for tabs in config module
 2016-02-09 19:41:38 +01:00
jekkos
eee87c7bc2 Bootstrapify config module 2016-02-09 17:59:35 +01:00
FrancescoUK
c6855712d0 Change no items in cart to be info instead of warning (#116) 2016-02-08 21:38:05 +00:00
FrancescoUK
cb5a4c774c Add company name to top bar, change db backup style in config (#116) 2016-02-08 19:53:59 +00:00
FrancescoUK
7e269f1256 Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css (#116) 2016-02-08 19:30:26 +00:00
FrancescoUK
f6356dd9e6 Fix more buttons to be bootstrap ones, fixed sales register, removed old style assets (#116) 2016-02-08 12:12:05 +00:00
FrancescoUK
d5e0230b19 Change button styles to use bootstrap standard, other fixes in style.css (#116) 2016-02-08 10:25:06 +00:00
FrancescoUK
1b0bcf4e0b Make bootstrap flatly the default ospos theme (#116) 
Needs customisation on templates/<theme>/css/.. path to allow other templates to load just fecthing new css
 2016-02-08 10:23:52 +00:00
FrancescoUK
09831faaf4 Fix reports listing font size (#116) 2016-02-07 23:16:54 +00:00
FrancescoUK
a5e66eabed Fix reports listing missing </div> issue (#116) 2016-02-07 23:11:27 +00:00
FrancescoUK
25f8a34b23 Change buttons in all the forms to use bootstrap button class (#116) 2016-02-07 23:04:59 +00:00
FrancescoUK
2ea14273b8 Merge branch 'ci3' into bootstrapUI 2016-02-07 18:07:54 +00:00
FrancescoUK
445222bcdd Merge branch 'master' into ci3 2016-02-07 18:03:44 +00:00
FrancescoUK
345d2d95d8 Remove dbbackup on logout (#318) 2016-02-05 18:42:04 +00:00
FrancescoUK
8a22f1c889 Merge branch 'ci3' into bootstrapUI 2016-02-05 17:03:57 +00:00
FrancescoUK
d07ed0c09f Merge remote-tracking branch 'jekkos/develop/2.4' into ci3 2016-02-05 16:57:27 +00:00
jekkos
36cf19b1b9 Properly save company_name in customer form 2016-02-04 23:09:03 +01:00
jekkos
67d9ca1e41 Merge branch 'master' into develop/2.4 
Conflicts:
	Dockerfile
 2016-01-29 17:34:53 +01:00
FrancescoUK
8698026e86 Fix indentation 2016-01-28 09:32:46 +00:00
FrancescoUK
ec5d0ab4f7 Merge branch 'ci3' into bootstrapUI 2016-01-28 09:31:19 +00:00
FrancescoUK
3425920cb6 Merge branch 'master' into ci3 2016-01-28 09:05:35 +00:00
jekkos
847c4a67c9 Add integration test for making sale (#305) 2016-01-26 20:27:07 +01:00
FrancescoUK
342b889371 Merge branch 'ci3' into bootstrapUI 2016-01-25 09:44:08 +00:00
FrancescoUK
8e5b8712c0 Merge branch 'master' into ci3 2016-01-25 09:20:04 +00:00
jekkos
2520970698 Fix comment for autogenerated sql files (#301, #258) 2016-01-25 08:42:15 +01:00
FrancescoUK
f52c5b0843 Add a live clock functionality to flatly and spacelab templates (#298) (#116) 2016-01-24 22:57:13 +00:00
FrancescoUK
d48dc8b87b Merge branch 'master' into ci3 2016-01-24 22:44:45 +00:00
FrancescoUK
8f72756737 Add a live clock functionality (#298) fix Gruntfile.js (#297) 2016-01-24 22:34:05 +00:00
FrancescoUK
4fd7948987 Made flatly as default, various header adjustments, added login with bootstrap (#116) 2016-01-24 20:05:36 +00:00
FrancescoUK
4ccab6b8b5 Code reformatting (#296) 2016-01-24 10:27:41 +00:00
FrancescoUK
1849ee807c Add favicon (#296) 2016-01-24 10:27:15 +00:00