mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-26 01:53:16 -04:00
Code Issues Packages Projects Releases Wiki Activity
882 Commits 90 Branches 39 Tags
3156ce217b404cee6fb52a36ec5dc172e241ff4e
Commit Graph

35 Commits

Author SHA1 Message Date
jekkos
d003239525 Items form bootstrapified (working in Chrome) (#116, #328) 2016-02-13 14:42:01 +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
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
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
5c95e02eac Fix javascript minification in Grunt build 
Fix config tab navigation in bootstrap
 2016-02-10 08:43:01 +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
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
jekkos
2520970698 Fix comment for autogenerated sql files (#301, #258) 2016-01-25 08:42:15 +01:00
FrancescoUK
8f72756737 Add a live clock functionality (#298) fix Gruntfile.js (#297) 2016-01-24 22:34:05 +00:00
jekkos
6d5c192447 Add jquery-ui slider for datepicker #169 2015-10-17 00:22:57 +02:00
FrancescoUK
1b90ac14d2 #169 regenerate dist/ js scripts adding datetimepicker jQuery plugin 2015-10-15 19:12:50 +01:00
jekkos
c843c174ed Initialize table sorting if this didn't happen when the page was loaded 
initially (#139)
 2015-09-14 08:26:41 +02:00
jekkos
b680cdff36 Fix table sorting after loading search results 2015-09-07 08:35:59 +02:00
jekkos
e62df579f1 Keep last row in position even after filtering 2015-09-06 13:33:12 +02:00
jekkos
2b6b3914a7 Mark totals row as static (keep it at bottom of the table issue #131) 2015-09-06 13:19:32 +02:00
jekkos
9281995029 Fix payment summary update on search 
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
 2015-09-04 23:14:06 +02:00
jekkos
f36c700129 Add date filtering in sales overview 
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
 2015-09-04 22:09:24 +02:00
jekkos
517363b485 Fix deleted checkbox in items form 
Clear suggestion cache when toggling deleted filter
 2015-08-18 18:10:00 +02:00
jekkos
011caf375f Apply is_deleted in item suggestion search 2015-08-18 08:35:21 +02:00
jekkos
4ab2ec1b5b Add supplier attribute search for items (pull request #106) 
Add company name to supplier column in summary report
 2015-08-16 15:41:39 +02:00
jekkos
7926a05948 Regenerate language files 
Remove committed merge conflict in giftcard_numbering.js
Add sql upgrade script for 2.3.3
 2015-08-07 17:17:53 +02:00
jekkos
fc5f097820 Add proper validation for module grants (issue #87) 2015-06-23 23:32:56 +02:00
jekkos
6a2a5278b8 Fix general test setup (finally) 
Add basic selenium test for application login
Adapt default database template file
Add correct db settings for travis-ci
 2015-05-15 00:47:25 +02:00
jekkos
6f7090d7ba Upgrade jquery.color 
Conflicts:

	dist/opensourcepos.js
	dist/opensourcepos.min.js
 2015-04-06 15:42:57 +02:00
jekkos
04abb716fa Merge branch 'master' of https://github.com/jekkos/opensourcepos 
Conflicts:
	dist/opensourcepos.min.js
 2015-04-06 15:16:43 +02:00
jekkos
39edf5ccdb Add basic unit tests 2015-04-06 15:13:36 +02:00
jekkos
ae99555fec Add test folder + basic unit test setup 
Add grunt mochaWebdriver plugin for phantomJs test
 2015-03-31 23:58:05 +02:00
jekkos
cae9d3b67e Remove tags:css task in Grunfile (css files are imported the old way 
again)
Fix sale delete confirmation in edit dialog
Add bower.json (still unused)
Fix autogenerated javascript load order
 2015-03-17 16:47:49 +01:00
jekkos-t520
aa65593ce3 Add Gruntfile.js for concat+uglification of javascript 
Enable debug=true cookie for full source inclusion in header.php
Add template in header.php to inject generated javascript files
 2015-03-15 16:56:37 +01:00