Commit Graph

  • 5c95e02eac Fix javascript minification in Grunt build Fix config tab navigation in bootstrap jekkos 2016-02-10 08:43:01 +01:00
  • 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 jekkos 2016-02-09 20:02:16 +01:00
  • 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 jekkos 2016-02-09 19:41:38 +01:00
  • eee87c7bc2 Bootstrapify config module jekkos 2016-02-09 17:59:35 +01:00
  • c6855712d0 Change no items in cart to be info instead of warning (#116) FrancescoUK 2016-02-08 21:38:05 +00:00
  • b27d94e316 Merge branch 'ci3' into bootstrapUI FrancescoUK 2016-02-08 20:19:15 +00:00
  • ca8b5a75ea Merge branch 'master' into ci3 FrancescoUK 2016-02-08 20:18:25 +00:00
  • cb5a4c774c Add company name to top bar, change db backup style in config (#116) FrancescoUK 2016-02-08 19:53:59 +00:00
  • 7e269f1256 Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css (#116) FrancescoUK 2016-02-08 19:30:26 +00:00
  • f9c882bf24 Fix spacing in autocomplete suggestion jekkos 2016-02-08 17:01:37 +01:00
  • f6356dd9e6 Fix more buttons to be bootstrap ones, fixed sales register, removed old style assets (#116) FrancescoUK 2016-02-08 12:12:05 +00:00
  • d5e0230b19 Change button styles to use bootstrap standard, other fixes in style.css (#116) FrancescoUK 2016-02-08 10:25:06 +00:00
  • 1b0bcf4e0b Make bootstrap flatly the default ospos theme (#116) FrancescoUK 2016-02-08 10:23:52 +00:00
  • 7180e7e9ed Update changelog for 2.3.4 2.3.4 jekkos 2016-02-08 07:42:04 +01:00
  • 09831faaf4 Fix reports listing font size (#116) FrancescoUK 2016-02-07 23:16:54 +00:00
  • a5e66eabed Fix reports listing missing </div> issue (#116) FrancescoUK 2016-02-07 23:11:27 +00:00
  • 25f8a34b23 Change buttons in all the forms to use bootstrap button class (#116) FrancescoUK 2016-02-07 23:00:34 +00:00
  • eb0cf07f4a Adjust flatly style.css (#116) FrancescoUK 2016-02-07 22:47:28 +00:00
  • 375f6860aa Small fix on class tags order (#116) FrancescoUK 2016-02-07 21:54:00 +00:00
  • 79f0961e09 Add jumbotron container to the footer (#116) FrancescoUK 2016-02-07 20:18:07 +00:00
  • 9ddccc6592 Fix footer overlapping last lines of the page (e.g. totals) (#116) FrancescoUK 2016-02-07 19:56:08 +00:00
  • 6606535fa9 remove dbbackup on logout from the two bootstrap themes (#116) FrancescoUK 2016-02-07 19:08:24 +00:00
  • 2ea14273b8 Merge branch 'ci3' into bootstrapUI FrancescoUK 2016-02-07 18:07:54 +00:00
  • 445222bcdd Merge branch 'master' into ci3 FrancescoUK 2016-02-07 18:03:44 +00:00
  • 40ddfdc2ab Merge pull request #319 from daN4cat/master jekkos 2016-02-07 15:09:02 +01:00
  • 345d2d95d8 Remove dbbackup on logout (#318) FrancescoUK 2016-02-05 18:42:04 +00:00
  • 8a22f1c889 Merge branch 'ci3' into bootstrapUI FrancescoUK 2016-02-05 17:03:57 +00:00
  • 8d47faadd7 Merge branch 'master' into ci3 FrancescoUK 2016-02-05 17:01:07 +00:00
  • d07ed0c09f Merge remote-tracking branch 'jekkos/develop/2.4' into ci3 FrancescoUK 2016-02-05 16:57:27 +00:00
  • 24b4c98d94 Merge pull request #317 from daN4cat/master jekkos 2016-02-05 17:36:16 +01:00
  • ea6fffc525 Add version liner so we remember which version the script works with (#258) FrancescoUK 2016-02-05 09:06:54 +00:00
  • a0b422be34 Fix source script phppos_migrate.sql too (#258) FrancescoUK 2016-02-05 09:05:57 +00:00
  • 6599ea6678 Fix and add data copy rules. Tested script (#258) FrancescoUK 2016-02-04 23:04:13 +00:00
  • 36cf19b1b9 Properly save company_name in customer form jekkos 2016-02-04 23:09:03 +01:00
  • 9d056b2765 Remove invoice_number from phppos SQL migration script (#258) FrancescoUK 2016-01-31 17:31:06 +00:00
  • 5c16c2a21a Use grep and wait for mysql to come up properly (#305) jekkos 2016-02-03 10:49:20 +01:00
  • acd9beae73 Set npm package version number jekkos 2016-02-03 17:29:01 +01:00
  • e598817287 Set correct version for npm package jekkos 2016-02-03 17:18:28 +01:00
  • 35d53e2fae Fix base url for testcases (#305) Fix legacy ubuntu repository urls (#284) jekkos 2016-02-03 10:49:20 +01:00
  • fa3d77299e Use curl to wait for apache start (#305) jekkos 2016-01-31 15:24:42 +01:00
  • 48a16d65e1 Fix base url for testcases (#305) Fix legacy ubuntu repository urls (#284) jekkos 2016-02-03 10:49:20 +01:00
  • 89f126ab04 Use curl to wait for apache start (#305) jekkos 2016-01-31 15:24:42 +01:00
  • 67d9ca1e41 Merge branch 'master' into develop/2.4 jekkos 2016-01-29 17:34:53 +01:00
  • 8f9d80a809 Wait for container before running integration tests (#305) Add integratoin test for quantity units (#305) jekkos 2016-01-29 08:38:55 +01:00
  • 8698026e86 Fix indentation FrancescoUK 2016-01-28 09:32:46 +00:00
  • ec5d0ab4f7 Merge branch 'ci3' into bootstrapUI FrancescoUK 2016-01-28 09:31:19 +00:00
  • 3425920cb6 Merge branch 'master' into ci3 FrancescoUK 2016-01-28 09:05:35 +00:00
  • 85c6da4346 Add integration test for making receiving (#305) Update docker scripts to work with data volumes (#284) jekkos 2016-01-27 20:11:21 +01:00
  • 93460daadf Make 2.4 version string npm compatible jekkos 2016-01-27 11:00:18 +01:00
  • 574548f360 Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos 2016-01-26 20:27:58 +01:00
  • 847c4a67c9 Add integration test for making sale (#305) jekkos 2016-01-26 20:27:07 +01:00
  • 8aab154a9f Disable sudo for travis tests, omit nodejs version jekkos 2016-01-26 16:27:06 +01:00
  • a3119d1993 Add integration test for creating new item jekkos 2016-01-26 08:44:48 +01:00
  • 0a159c803f Add testcase for creating new item Optimise CI setup jekkos 2016-01-25 21:14:48 +01:00
  • 22a7231d8f Run docker container in background + launch tests once ready jekkos 2016-01-25 19:16:13 +01:00
  • c36f6b603d Run docker interactively in travis script step jekkos 2016-01-25 17:53:47 +01:00
  • 05ff49616d Retouch opensourcepos.min.js hash changed due to merge from master -> develop/2.4 FrancescoUK 2016-01-25 09:47:41 +00:00
  • 342b889371 Merge branch 'ci3' into bootstrapUI FrancescoUK 2016-01-25 09:44:08 +00:00
  • 8e5b8712c0 Merge branch 'master' into ci3 FrancescoUK 2016-01-25 09:20:04 +00:00
  • f063aa16a8 Launch webdriver test in docker container jekkos 2016-01-25 09:34:10 +01:00
  • 2520970698 Fix comment for autogenerated sql files (#301, #258) jekkos 2016-01-25 08:42:15 +01:00
  • a21a825aac Merge pull request #299 from daN4cat/master jekkos 2016-01-25 08:36:43 +01:00
  • d66829d62d Merge branch 'ci3' into bootstrapUI FrancescoUK 2016-01-24 23:01:41 +00:00
  • f52c5b0843 Add a live clock functionality to flatly and spacelab templates (#298) (#116) FrancescoUK 2016-01-24 22:26:44 +00:00
  • d48dc8b87b Merge branch 'master' into ci3 FrancescoUK 2016-01-24 22:44:45 +00:00
  • 8f72756737 Add a live clock functionality (#298) fix Gruntfile.js (#297) FrancescoUK 2016-01-24 22:26:44 +00:00
  • 4fd7948987 Made flatly as default, various header adjustments, added login with bootstrap (#116) FrancescoUK 2016-01-24 20:05:36 +00:00
  • e76833d364 Merge 'cpl2015/boostrapUI' into bootstrapUI (#116) FrancescoUK 2016-01-24 11:33:14 +00:00
  • 3cb0094dde Merge branch 'bootstrapUI' of git://github.com/cpl2015/opensourcepos into cpl2015-boostrapUI FrancescoUK 2016-01-24 11:30:05 +00:00
  • 946c50b222 flatly header.php code reformatting (#116) (#296) FrancescoUK 2016-01-22 22:21:31 +00:00
  • 1dccee389d Add favicon to flatly header.php (#116) (#296) FrancescoUK 2016-01-22 19:02:17 +00:00
  • 875c0b31b7 Apply changes from #226 (#116) FrancescoUK 2016-01-07 19:17:54 +00:00
  • 8bf77e27dc Change header template (#116) FrancescoUK 2016-01-07 19:17:28 +00:00
  • a51352017a Overriding view files (#116) FrancescoUK 2016-01-07 19:17:04 +00:00
  • 68b28a17e4 Merge branch 'master' into ci3 FrancescoUK 2016-01-24 10:33:15 +00:00
  • 463af45e73 Remove test run in pre_install (travis-ci) jekkos 2016-01-23 19:41:31 +01:00
  • 4ccab6b8b5 Code reformatting (#296) FrancescoUK 2016-01-22 22:14:42 +00:00
  • 1849ee807c Add favicon (#296) FrancescoUK 2016-01-22 19:05:07 +00:00
  • bd7b4a1c14 Create style.css cpl2015 2016-01-24 03:04:24 +05:30
  • c20520c877 Delete style.css cpl2015 2016-01-24 03:00:29 +05:30
  • 35aec3c34f Update header.php cpl2015 2016-01-24 02:59:08 +05:30
  • d9e18551b5 Update receiving.php cpl2015 2016-01-24 02:52:22 +05:30
  • 144da1ed6b Update theme.php cpl2015 2016-01-24 02:34:36 +05:30
  • 125ffe9f73 Create home.php cpl2015 2016-01-24 02:33:51 +05:30
  • a94f32dc50 Delete home.css cpl2015 2016-01-24 02:33:08 +05:30
  • 8c338fc223 Create footer.php cpl2015 2016-01-24 02:32:36 +05:30
  • ca764a3165 Create header.php cpl2015 2016-01-24 02:31:54 +05:30
  • b58547f988 Create home.css cpl2015 2016-01-24 02:30:23 +05:30
  • 05fbe8b218 Create style.css cpl2015 2016-01-24 02:26:20 +05:30
  • 823f8f0be3 Create bootstrap.css cpl2015 2016-01-24 02:24:53 +05:30
  • b40b06a18e Delete spacelab cpl2015 2016-01-24 02:16:38 +05:30
  • 513250cadf Create spacelab cpl2015 2016-01-24 02:11:23 +05:30
  • 216432f4b6 Update manage.php cpl2015 2016-01-24 01:38:02 +05:30
  • 2b5825f841 Update form.php cpl2015 2016-01-24 01:34:59 +05:30
  • 46987845b3 Update form.php cpl2015 2016-01-24 01:34:12 +05:30
  • e1cead8241 Update form.php cpl2015 2016-01-24 01:30:49 +05:30
  • 63f72b046d Update receiving.php cpl2015 2016-01-24 01:24:14 +05:30
  • 3fe39bbf73 Update register.php cpl2015 2016-01-24 01:19:50 +05:30
  • 81646a00ff flatly header.php code reformatting (#116) FrancescoUK 2016-01-22 22:21:31 +00:00
  • 8edd6a2e49 Add favicon to flatly header.php (#116) FrancescoUK 2016-01-22 19:02:17 +00:00