mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-23 00:34:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
846 Commits 64 Branches 41 Tags
b1b125d2a4d071c69d0c4e9eb2195e4a3e253fcd
Commit Graph
846 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 b27d94e316 Merge branch 'ci3' into bootstrapUI 2016-02-08 20:19:15 +00:00
FrancescoUK ca8b5a75ea Merge branch 'master' into ci3 2016-02-08 20:18:25 +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
jekkos f9c882bf24 Fix spacing in autocomplete suggestion 2016-02-08 17:01:37 +01: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
jekkos 7180e7e9ed Update changelog for 2.3.4 2.3.4 2016-02-08 07:42:04 +01: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 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 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
jekkos 40ddfdc2ab Merge pull request #319 from daN4cat/master 
Remove dbbackup on logout #318
 2016-02-07 15:09:02 +01: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 8d47faadd7 Merge branch 'master' into ci3 
# Conflicts:
#	package.json
 2016-02-05 17:01:07 +00:00
FrancescoUK d07ed0c09f Merge remote-tracking branch 'jekkos/develop/2.4' into ci3 2016-02-05 16:57:27 +00:00
jekkos 24b4c98d94 Merge pull request #317 from daN4cat/master 
Fixes to phppos to ospos 2.3.4 migration script #258
 2016-02-05 17:36:16 +01:00
FrancescoUK ea6fffc525 Add version liner so we remember which version the script works with (#258) 2016-02-05 09:06:54 +00:00
FrancescoUK a0b422be34 Fix source script phppos_migrate.sql too (#258) 2016-02-05 09:05:57 +00:00
FrancescoUK 6599ea6678 Fix and add data copy rules. Tested script (#258) 2016-02-04 23:04:13 +00:00
jekkos 36cf19b1b9 Properly save company_name in customer form 2016-02-04 23:09:03 +01:00
FrancescoUK 9d056b2765 Remove invoice_number from phppos SQL migration script (#258) 2016-02-03 18:14:00 +00:00
jekkos 5c16c2a21a Use grep and wait for mysql to come up properly (#305) 2016-02-03 17:42:44 +01:00
jekkos acd9beae73 Set npm package version number 2016-02-03 17:29:01 +01:00
jekkos e598817287 Set correct version for npm package 2016-02-03 17:18:28 +01:00
jekkos 35d53e2fae Fix base url for testcases (#305) 
Fix legacy ubuntu repository urls (#284)
 2016-02-03 11:09:45 +01:00
jekkos fa3d77299e Use curl to wait for apache start (#305) 2016-02-03 11:04:09 +01:00
jekkos 48a16d65e1 Fix base url for testcases (#305) 
Fix legacy ubuntu repository urls (#284)
 2016-02-03 10:49:20 +01:00
jekkos 89f126ab04 Use curl to wait for apache start (#305) 2016-01-31 16:03:19 +01:00
jekkos 67d9ca1e41 Merge branch 'master' into develop/2.4 
Conflicts:
	Dockerfile
 2016-01-29 17:34:53 +01:00
jekkos 8f9d80a809 Wait for container before running integration tests (#305) 
Add integratoin test for quantity units (#305)
 2016-01-29 17:24:28 +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 85c6da4346 Add integration test for making receiving (#305) 
Update docker scripts to work with data volumes (#284)
 2016-01-27 20:11:21 +01:00
jekkos 93460daadf Make 2.4 version string npm compatible 2016-01-27 11:00:18 +01:00
jekkos 574548f360 Merge branch 'master' of https://github.com/jekkos/opensourcepos 2016-01-26 20:27:58 +01:00
jekkos 847c4a67c9 Add integration test for making sale (#305) 2016-01-26 20:27:07 +01:00