FrancescoUK
|
76639f6da1
|
remove misleading comment from code
|
2016-03-08 19:50:46 +00:00 |
|
jekkos
|
01f59cc247
|
Fix jQuery migrate warnings in manage_tables (#328)
|
2016-03-08 20:46:30 +01:00 |
|
jekkos
|
6f6f4354fd
|
Remove jQuery calls for attr (deprecated in newer versions) (#328)
|
2016-03-08 20:18:51 +01:00 |
|
FrancescoUK
|
d7df291b9a
|
Merge branch develop/2.4 into master
|
2016-03-08 19:14:36 +00:00 |
|
FrancescoUK
|
1a1266a20c
|
touched version to be 2.4.0, updated README.md, enabled Cross Site Request Forgery in config.php
|
2016-03-08 18:19:28 +00:00 |
|
jekkos
|
f366757476
|
Add group operator to giftcard query
|
2016-03-08 18:18:27 +00:00 |
|
jekkos
|
741843586d
|
Remove duplicated cookie cleanup hack (CI 2.x issue)
|
2016-03-08 18:18:27 +00:00 |
|
FrancescoUK
|
fafdfd9afd
|
fix php error on suggestion typing when in sale register return mode (#331)
|
2016-03-08 18:18:27 +00:00 |
|
FrancescoUK
|
a156ad8087
|
Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future (#337)
|
2016-03-08 18:16:31 +00:00 |
|
FrancescoUK
|
b36a03c4bc
|
Fix to sales edit server error when customer is '' (#337)
|
2016-03-08 18:16:31 +00:00 |
|
jekkos
|
5f8eface28
|
Properly save company_name in customer form
|
2016-03-08 18:16:31 +00:00 |
|
FrancescoUK
|
4bbacf6923
|
Code reformatting
|
2016-03-08 18:04:15 +00:00 |
|
FrancescoUK
|
38ea682c88
|
Add favicon
|
2016-03-08 18:00:33 +00:00 |
|
FrancescoUK
|
b9262230d1
|
Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
df4cea3228
|
Fix to custom fields that cannot be null on Items save (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
5df62610d2
|
Upgrade to CI 3.0.4 (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
9dcbef988a
|
Added comments to some controller functions and improved spacing to improve readibility of code (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
d1a973564f
|
Make NULL to be null all over the code for consistency purposes (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
da52ff99c1
|
Further review and fixes to input->post(...) (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
ee07676193
|
Fix to items search not working due to input->post returning null (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
007598df6a
|
Fix merge miss in constants.php (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
9a71bbc620
|
Complete CI 3.0.3 upgrade since it wasn't done in full (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
a5041a3a41
|
Remove application/errors, upgrade Step 8 (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
36d3717bd6
|
EXT constant deprecated, upgrade Step 20 (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
abd63731be
|
Follow upgrade guideline Step 9 (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
b7c0e32cd0
|
Fix reports error due to report.php now being Report.php (#120)
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
c512d7167d
|
Change config language to be 'en' consistent with the OSPOS language identifiers (#120)
However language support doesn't work properly at the moment.
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
b27d3c04c9
|
Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120)
Apparently the upgrade wasn't complete.
|
2016-03-08 17:44:59 +00:00 |
|
FrancescoUK
|
aa3948b9a2
|
Remove application/config.php and database.php (#120)
|
2016-03-08 17:41:16 +00:00 |
|
Toni Haryanto
|
75fa1a8167
|
Upgrade to Code Igniter 3.0.3 (#120)
|
2016-03-08 17:41:16 +00:00 |
|
FrancescoUK
|
38ecacc62f
|
mark OSPOS with Bootstrap3 vs 3.0.0 (#116)
|
2016-03-08 17:17:13 +00:00 |
|
FrancescoUK
|
cc05f9b2df
|
regenerate dist files (#116 #328 #329)
|
2016-03-08 12:44:42 +00:00 |
|
FrancescoUK
|
ea394a00b5
|
remove spinner, unused images, unused code (#116 #328)
|
2016-03-08 12:42:38 +00:00 |
|
FrancescoUK
|
4a216f0a7c
|
used proper form and group-form for table action search and header (#116)
|
2016-03-08 12:28:18 +00:00 |
|
jekkos
|
674dd90221
|
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
|
2016-03-08 08:40:23 +01:00 |
|
jekkos
|
2436cf5da5
|
Fix suggestions for item kits (by name and KIT id) (#328)
|
2016-03-08 08:39:21 +01:00 |
|
jekkos
|
9cd42e0614
|
Add group operator to giftcard query
|
2016-03-08 08:12:23 +01:00 |
|
jekkos
|
a6fa6c9cd6
|
Add group operator to giftcard query
|
2016-03-08 08:11:10 +01:00 |
|
FrancescoUK
|
4403a6775a
|
Fix wrong form name in location dropdown due to copy&paste action (#116)
|
2016-03-07 22:47:40 +00:00 |
|
jekkos
|
dfbab194de
|
Add item search for category + suppliers (#328)
|
2016-03-07 23:21:57 +01:00 |
|
jekkos
|
fe2787217f
|
Fix item suggestion in item kits, fix category suggestion in item form
(#328)
|
2016-03-07 22:42:42 +01:00 |
|
jekkos
|
554f2b32db
|
Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI
Conflicts:
application/views/items/manage.php
application/views/partial/header.php
dist/opensourcepos.min.css
dist/opensourcepos.min.js
templates/spacelab/views/partial/header.php
|
2016-03-07 21:33:26 +01:00 |
|
jekkos
|
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)
|
2016-03-07 21:23:29 +01:00 |
|
FrancescoUK
|
04b6ba21f7
|
bootstrapisation of #table_action_header in all views, tidy up css styles changed px to em (#116)
|
2016-03-07 19:09:57 +00:00 |
|
Aaron Gong
|
ff63adecdc
|
Fix For #339
https://github.com/jekkos/opensourcepos/issues/339
We should also rollout the fixes to develop/2.4 if necessary. This fix
was adapted from BootstrapUI which fixed the PHP 7 error regarding
classes.
|
2016-03-07 22:26:07 +08:00 |
|
jekkos
|
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
|
2016-03-07 07:56:41 +01:00 |
|
FrancescoUK
|
517f67a3a9
|
remove double entry in daterangepicker translations, open calendar always (#116)
|
2016-03-06 21:51:46 +00:00 |
|
FrancescoUK
|
7f37ebf87e
|
proper support of date range in reports input leveraging all the features, translations and fixed some bugs (#116)
|
2016-03-06 21:34:12 +00:00 |
|
jekkos
|
f0af6f8927
|
Correct spanish translations for reorder level warning (#365)
|
2016-03-06 13:39:11 +01:00 |
|
jekkos
|
d78c4dec67
|
Add default english for other langauge labels
|
2016-03-06 13:34:21 +01:00 |
|