Commit Graph

  • 76639f6da1 remove misleading comment from code FrancescoUK 2016-03-08 19:50:46 +00:00
  • 01f59cc247 Fix jQuery migrate warnings in manage_tables (#328) jekkos 2016-03-08 20:46:30 +01:00
  • 6f6f4354fd Remove jQuery calls for attr (deprecated in newer versions) (#328) jekkos 2016-03-08 19:51:50 +01:00
  • d7df291b9a Merge branch develop/2.4 into master FrancescoUK 2016-03-08 19:14:36 +00:00
  • 1a1266a20c touched version to be 2.4.0, updated README.md, enabled Cross Site Request Forgery in config.php FrancescoUK 2016-03-08 17:38:20 +00:00
  • f366757476 Add group operator to giftcard query jekkos 2016-03-08 08:11:10 +01:00
  • 741843586d Remove duplicated cookie cleanup hack (CI 2.x issue) jekkos 2016-02-25 23:28:19 +01:00
  • fafdfd9afd fix php error on suggestion typing when in sale register return mode (#331) FrancescoUK 2016-02-25 15:44:13 +00:00
  • a156ad8087 Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future (#337) FrancescoUK 2016-02-22 17:52:29 +00:00
  • b36a03c4bc Fix to sales edit server error when customer is '' (#337) FrancescoUK 2016-02-22 08:51:18 +00:00
  • 028bdb074b Add caching hints for mod_expires (#340) jekkos 2016-02-20 21:40:06 +01:00
  • 643ceb25b5 Fix spacing in autocomplete suggestion jekkos 2016-02-08 17:01:37 +01:00
  • 5f8eface28 Properly save company_name in customer form jekkos 2016-02-04 23:09:03 +01:00
  • 8a5177f14c Fix base url for testcases (#305) Fix legacy ubuntu repository urls (#284) jekkos 2016-02-03 10:49:20 +01:00
  • 02c8a89bbe Use curl to wait for apache start (#305) jekkos 2016-01-31 15:24:42 +01:00
  • c67acaa6ec Make 2.4 version string npm compatible jekkos 2016-01-27 11:00:18 +01:00
  • 4bbacf6923 Code reformatting FrancescoUK 2016-01-22 22:14:42 +00:00
  • 38ea682c88 Add favicon FrancescoUK 2016-01-22 19:05:07 +00:00
  • 0f1208d4d9 Fix package.json version to be 2.4 (#284) FrancescoUK 2016-01-22 11:31:13 +00:00
  • 69942283e5 Make docker work with 2.4 branch jekkos 2016-01-21 16:23:54 +01:00
  • d13e034940 Update database/tables.sql script with new sessions table (#120) FrancescoUK 2016-01-19 12:00:51 +00:00
  • 72059184df Update Copyright notice (#120) FrancescoUK 2016-01-19 11:21:08 +00:00
  • 4d9dc0111e Make the data blob NOT NULL in the SQL upgrade script (#120) FrancescoUK 2016-01-19 08:24:58 +00:00
  • b9262230d1 Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 (#120) FrancescoUK 2016-01-18 23:01:42 +00:00
  • df4cea3228 Fix to custom fields that cannot be null on Items save (#120) FrancescoUK 2016-01-18 20:15:24 +00:00
  • 0f27348924 Add (temp) fix for cur_page conuter in CI pagination libary (#284) Fix .htaccess file jekkos 2016-01-06 19:29:33 +01:00
  • dd5aa1e241 Restore padding in pagination links, now it uses css (#120) FrancescoUK 2016-01-17 19:02:08 +00:00
  • 5df62610d2 Upgrade to CI 3.0.4 (#120) FrancescoUK 2016-01-17 18:33:26 +00:00
  • 9dcbef988a Added comments to some controller functions and improved spacing to improve readibility of code (#120) FrancescoUK 2016-01-17 17:56:54 +00:00
  • d1a973564f Make NULL to be null all over the code for consistency purposes (#120) FrancescoUK 2016-01-16 22:08:43 +00:00
  • da52ff99c1 Further review and fixes to input->post(...) (#120) FrancescoUK 2016-01-16 22:04:12 +00:00
  • ee07676193 Fix to items search not working due to input->post returning null (#120) FrancescoUK 2016-01-15 22:53:09 +00:00
  • 007598df6a Fix merge miss in constants.php (#120) FrancescoUK 2016-01-07 20:53:40 +00:00
  • 9a71bbc620 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) FrancescoUK 2016-01-07 20:11:19 +00:00
  • a5041a3a41 Remove application/errors, upgrade Step 8 (#120) FrancescoUK 2016-01-03 18:31:51 +00:00
  • 36d3717bd6 EXT constant deprecated, upgrade Step 20 (#120) FrancescoUK 2016-01-03 17:53:01 +00:00
  • abd63731be Follow upgrade guideline Step 9 (#120) FrancescoUK 2016-01-03 13:46:16 +00:00
  • b7c0e32cd0 Fix reports error due to report.php now being Report.php (#120) FrancescoUK 2016-01-03 13:43:46 +00:00
  • c512d7167d Change config language to be 'en' consistent with the OSPOS language identifiers (#120) FrancescoUK 2015-12-30 22:03:23 +00:00
  • 6ccfc8ba7d Improve .htaccess with some security rules (#120) FrancescoUK 2015-12-30 22:02:50 +00:00
  • b27d3c04c9 Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120) FrancescoUK 2015-12-30 22:02:21 +00:00
  • aa3948b9a2 Remove application/config.php and database.php (#120) FrancescoUK 2015-12-30 22:00:25 +00:00
  • 75fa1a8167 Upgrade to Code Igniter 3.0.3 (#120) Toni Haryanto 2015-11-02 13:09:10 +07:00
  • c414922167 touched README.md file (#116) FrancescoUK 2016-03-08 17:15:32 +00:00
  • 38ecacc62f mark OSPOS with Bootstrap3 vs 3.0.0 (#116) FrancescoUK 2016-03-08 16:52:53 +00:00
  • cc05f9b2df regenerate dist files (#116 #328 #329) FrancescoUK 2016-03-08 12:44:42 +00:00
  • d7d2c8cb35 get the latest swfobject 2.3.0 using an alternative bower package repo (#116 #328 #329) FrancescoUK 2016-03-08 12:43:58 +00:00
  • ea394a00b5 remove spinner, unused images, unused code (#116 #328) FrancescoUK 2016-03-08 12:42:38 +00:00
  • 49b1eb3150 fix table action & search header geometry/positioning (#116) FrancescoUK 2016-03-08 12:40:41 +00:00
  • 4a216f0a7c used proper form and group-form for table action search and header (#116) FrancescoUK 2016-03-08 12:28:18 +00:00
  • 674dd90221 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI jekkos 2016-03-08 08:40:23 +01:00
  • 2436cf5da5 Fix suggestions for item kits (by name and KIT id) (#328) jekkos 2016-03-08 08:39:21 +01:00
  • 9cd42e0614 Add group operator to giftcard query jekkos 2016-03-08 08:11:10 +01:00
  • a6fa6c9cd6 Add group operator to giftcard query jekkos 2016-03-08 08:11:10 +01:00
  • 4403a6775a Fix wrong form name in location dropdown due to copy&paste action (#116) FrancescoUK 2016-03-07 22:47:40 +00:00
  • dfbab194de Add item search for category + suppliers (#328) jekkos 2016-03-07 23:21:57 +01:00
  • fe2787217f Fix item suggestion in item kits, fix category suggestion in item form (#328) jekkos 2016-03-07 22:42:42 +01:00
  • 554f2b32db Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI jekkos 2016-03-07 21:33:26 +01:00
  • 36f825d0fe Replace legeacy autocomplete with jquery-ui version (#328) Cleanup PHP search suggestion functionality Add jquery-ui css explicitly (wasn't included in bower main attribute) jekkos 2016-03-07 21:23:29 +01:00
  • 04b6ba21f7 bootstrapisation of #table_action_header in all views, tidy up css styles changed px to em (#116) FrancescoUK 2016-03-07 19:09:57 +00:00
  • ff63adecdc Fix For #339 Aaron Gong 2016-03-07 22:26:07 +08:00
  • 6c29faeba1 Remove old jquery autocomplete Remove id|name format in giftcards customer selection Cleanup duplicated custom field suggestion in Items Migrate table search suggestion to jQuery UI Add jquery UI bootstrap theme jekkos 2016-03-07 07:56:41 +01:00
  • 517f67a3a9 remove double entry in daterangepicker translations, open calendar always (#116) FrancescoUK 2016-03-06 21:51:46 +00:00
  • 7f37ebf87e proper support of date range in reports input leveraging all the features, translations and fixed some bugs (#116) FrancescoUK 2016-03-06 21:30:54 +00:00
  • f0af6f8927 Correct spanish translations for reorder level warning (#365) jekkos 2016-03-06 13:39:11 +01:00
  • d78c4dec67 Add default english for other langauge labels jekkos 2016-03-06 13:34:21 +01:00
  • 0831089790 fix stock_config error message (#116) FrancescoUK 2016-03-05 21:08:20 +00:00
  • 8faf1285da fix general_config tax 1 rate and name error message (#116) FrancescoUK 2016-03-05 11:54:10 +00:00
  • d5b278217b fix first name error message in Suppliers/form (#116) FrancescoUK 2016-03-05 11:41:57 +00:00
  • a04101d756 fix an issue with error messages on required fields in Items/form (#116) FrancescoUK 2016-03-05 11:33:25 +00:00
  • 3cb41c9fe3 fix picture loading widget in Items/form, works but pic extension is not handled so still commented out (#116) FrancescoUK 2016-03-05 10:20:44 +00:00
  • 2ab9404229 render in red the fields in config that are empty at submit time (#116) FrancescoUK 2016-03-05 10:12:04 +00:00
  • 6cef7a124e fix a wrong counting with custom fields for-loop (#116) FrancescoUK 2016-03-05 09:02:13 +00:00
  • f226c774df Merge pull request #376 from ais-one/patch-1 FrancescoUK 2016-03-05 09:34:52 +00:00
  • 06a1f1a869 Merge pull request #378 from ais-one/patch-2 FrancescoUK 2016-03-05 08:26:38 +00:00
  • 44dc300c63 Update form.php Aaron Gong 2016-03-05 14:50:53 +08:00
  • edaa936766 Fix for issue 377 Aaron Gong 2016-03-05 09:46:42 +08:00
  • 6d9a53edba Fix for issue 373 Aaron Gong 2016-03-05 09:25:34 +08:00
  • 1d9a7eced3 set correct order new & submit buttons in receiving (#116) FrancescoUK 2016-03-04 22:42:28 +00:00
  • f9971aabb6 remove unnecessary .':' from form labels (#116) FrancescoUK 2016-03-04 21:54:23 +00:00
  • 1fe26afe4f fix missing required fields in Items form, changed file input to be bootstrap one (#116) FrancescoUK 2016-03-04 21:48:37 +00:00
  • 6d547048c4 set two methods private in Items and Config controllers (#116) FrancescoUK 2016-03-04 21:44:00 +00:00
  • 687b68f13e set correct tax_2 and not tax_1 label in general_config (#116) FrancescoUK 2016-03-04 21:42:40 +00:00
  • c49728e2fc fix New Employee button wrong indentation in Employees view (#116) FrancescoUK 2016-03-04 21:41:22 +00:00
  • a201d18938 Add specific warning when stock goes below reorder level in sales (#365, #336) jekkos 2016-03-02 08:26:17 +01:00
  • d433866e39 Only accept .csv for import excel functionality (#116) Enable enter key to submit form by default (as before) jekkos 2016-03-01 18:01:53 +01:00
  • 45da78bbde Trigger employee form validation for all tabs (#116) jekkos 2016-03-01 17:48:33 +01:00
  • c9238877fa Bootstrapify report input forms, add datepicker range widget (#116) Move datepicker translations to datepicker_lang.csv jekkos 2016-03-01 08:46:17 +01:00
  • d4f456d868 Bump version strings to 2.3.5 jekkos 2016-02-29 22:35:33 +01:00
  • 2833b7598e Bootstrapify date_input for reports (#116). Form alignment to be improved, basic version working Move common jquery validation settings to base object jekkos 2016-02-29 22:20:38 +01:00
  • 68c4c1cc56 Use bootstrap style to highlight fields in error state after failed validation (#116) jekkos 2016-02-29 08:14:00 +01:00
  • bc8673d883 Remove debugger statement + fix glyph in item kits form (#116) jekkos 2016-02-28 23:51:49 +01:00
  • 6b76e28ebb fix tables in item_kit/form items/inventory details and sales/suspended (#116) FrancescoUK 2016-02-28 21:24:55 +00:00
  • f2e02e4e06 fixed wrong titles in excel import forms (coming from manage views) (#116) FrancescoUK 2016-02-28 19:35:38 +00:00
  • 2b257d21fb add icons to inventory detail and inventory change forms (#116) FrancescoUK 2016-02-28 19:23:40 +00:00
  • 92bfd903dc bootstrapify inventory details form, fixed multilocation support that was broken (#116) FrancescoUK 2016-02-28 19:08:05 +00:00
  • 69fedb3712 bootstrapify inventory form (#116) FrancescoUK 2016-02-28 17:08:30 +00:00
  • c4df1f3671 make items/form_bulk consistent with the rest of the forms (#116) FrancescoUK 2016-02-28 16:41:55 +00:00
  • 0cd7af7c4f change file load widget in excel_import forms (#116) FrancescoUK 2016-02-28 16:26:58 +00:00
  • c675a73fc6 make sale and receiving forms consistent with the other forms (#116) FrancescoUK 2016-02-28 15:55:45 +00:00