mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-21 07:44:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
938 Commits 58 Branches 40 Tags
d3b87189e32600a1cb2554d5d05aa3ac5cac331f
Commit Graph
64 Commits
Author SHA1 Message Date
jekkos d3b87189e3 Fix form submission in sales and receivings forms (#116) 2016-02-27 21:31:44 +01:00
jekkos fd87c59492 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/partial/header.php
	application/views/receivings/receiving.php
	application/views/sales/register.php
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
 2016-02-27 18:55:44 +01:00
FrancescoUK d04fec09d5 Sales register and Receiving with new dropdown and relayout (#116) 2016-02-26 23:33:05 +00:00
FrancescoUK e814f8835a fix issue related to double bootstrap.js in min.js preventing bootstrap-select from functioning properly (#116) 2016-02-26 22:20:11 +00:00
jekkos 7769334372 Add close button by default (#116, #361) 2016-02-26 19:08:49 +01:00
jekkos 959f7da876 Fix item form submission + remove invalid char before value attribute 2016-02-26 11:05:55 +01:00
jekkos a9902219ae Continue bootstrapification (item bulk edit, bootstrap modals) 
(#116, #361)
Remove get_form_width() from controllers, add new class to define modal width
Add bootstrap validation markup to edit forms
 2016-02-25 23:31:43 +01:00
FrancescoUK abdf2a23d0 add bootstrap-table but not used yet (#116 #293) 2016-02-23 15:50:04 +00:00
FrancescoUK 56826ab3c1 fix spacelab template to work with new setup (#116, #329) 2016-02-21 20:29:14 +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
jekkos 30223c38e1 Fix css minification (#329) 
Fix suspended sales dialog (set class to modal-dlg)
 2016-02-19 19:03:56 +01:00
jekkos d2a11cdb91 Bootstrappify config forms - WIP (#116) 2016-02-18 23:30:21 +01: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
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
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 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 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
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 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 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 715eac28c8 Add jquery-migrate-1.3.0 (solves js issues) 2016-02-11 07:00:02 +01: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
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 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
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 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 eb0cf07f4a Adjust flatly style.css (#116) 2016-02-07 23:04:44 +00:00
FrancescoUK 375f6860aa Small fix on class tags order (#116) 2016-02-07 23:04:19 +00:00
FrancescoUK 79f0961e09 Add jumbotron container to the footer (#116) 2016-02-07 23:04:01 +00:00
FrancescoUK 9ddccc6592 Fix footer overlapping last lines of the page (e.g. totals) (#116) 2016-02-07 23:03:44 +00:00
FrancescoUK 6606535fa9 remove dbbackup on logout from the two bootstrap themes (#116) 2016-02-07 23:03:18 +00:00
FrancescoUK 05ff49616d Retouch opensourcepos.min.js hash changed due to merge from master -> develop/2.4 2016-01-25 09:47:41 +00:00
FrancescoUK f52c5b0843 Add a live clock functionality to flatly and spacelab templates (#298) (#116) 2016-01-24 22:57:13 +00:00
FrancescoUK 4fd7948987 Made flatly as default, various header adjustments, added login with bootstrap (#116) 2016-01-24 20:05:36 +00:00
cpl2015 bd7b4a1c14 Create style.css 2016-01-24 03:04:24 +05:30
cpl2015 c20520c877 Delete style.css 2016-01-24 03:00:29 +05:30
cpl2015 35aec3c34f Update header.php 2016-01-24 02:59:08 +05:30