Commit Graph

6394 Commits

Author SHA1 Message Date
Doug Hutcheson
23e06dea7f Initial setup in a new environment
The result of running the npm build and editing the .env file
2023-09-06 18:07:00 +08:00
jekkos
71df876d1b Sync language files with master (#3468) 2023-08-30 19:16:11 +02:00
jekkos
be8584cff3 Move first stage to different image (#3584) 2023-06-26 23:56:22 +02:00
jekkos
60c8ef5fbe Revert to last working Dockerfile (#3584) 2023-06-26 00:16:09 +02:00
Steve Ireland
8db87fd5ab In dev mode, allow blank root password. 2023-06-25 12:16:51 -04:00
Steve Ireland
ab8989c3cd Correct dockerignore to pick up changes to path folder names. 2023-06-25 08:32:09 -04:00
jekkos
00f54ef3f9 Simplify docker config (#3584) 2023-06-20 23:10:57 +02:00
jekkos
218e825f63 Do not install openssl (#3584) 2023-06-20 21:25:57 +02:00
jekkos
4429e48a9a Bump docker base image (#3584) 2023-06-17 00:54:23 +02:00
jekkos
f323ec06e8 Enable apt update again (#3584) 2023-06-16 22:45:24 +02:00
jekkos
7e85cb168d Remove package update for now (#3584) 2023-06-14 23:47:59 +02:00
jekkos
92e064d752 Fix ownership of /app (#3584) 2023-06-14 09:03:20 +02:00
jekkos
958a93b7ac Add missing whitespace (#3584) 2023-06-14 08:58:39 +02:00
jekkos
091614e928 Add privileged flag to node (#3584) 2023-06-13 23:51:39 +02:00
jekkos
5ec5c69615 Set default hostname to localhost (#3584) 2023-06-13 23:32:28 +02:00
jekkos
b9af9df444 Set CI_ENVIRONMENT in compose files 2023-06-13 00:25:52 +02:00
jekkos
9a615fa4de Set dev container to development mode (#3584) 2023-06-12 22:40:20 +02:00
jekkos
17d7b74950 Update compose files (#3584) 2023-06-12 19:54:15 +02:00
jekkos
2f3bde3d1e Use ci4 composer image (#3584) 2023-06-12 00:21:17 +02:00
jekkos
7812626f83 Add tag to sqlscript image (#3584) 2023-06-11 23:57:25 +02:00
jekkos
3f87a92816 Fix path to database (#3584) 2023-06-11 23:42:12 +02:00
jekkos
5ef3717774 Add back database Dockerfile (#3584) 2023-06-11 23:25:38 +02:00
jekkos
54ee2ddc62 Update node image name (#3584) 2023-06-11 23:08:18 +02:00
jekkos
c8af68fb38 Update .travis.yml 2023-06-11 22:26:31 +02:00
Steve Ireland
13e0011841 Resolved a couple of issues with the Reports panel, one of which was reported on #3754 2023-06-10 21:36:27 -04:00
Steve Ireland
bef33fa3c9 Resolved various issues with item kit maintenance, one of which was reported on #3754 2023-06-10 18:45:14 -04:00
Steve Ireland
43781c8231 Add fabrication of database.sql to gulp build. 2023-06-05 20:28:45 -04:00
Steve Ireland
97dfdf2f78 setAttribute should be setTextAttribute for a group separator symbol. 2023-06-04 08:47:12 -04:00
Steve Ireland
9ee0bb1ed4 In Token_lib change App\Models\tokens\Token to App\Models\Tokens\Toke 2023-05-30 20:58:55 -04:00
Steve Ireland
c143c353b3 Fix favicon path in header.php 2023-05-30 08:51:30 -04:00
Steve Ireland
1cdefef7fd With this commit we are moving from bower and grunt to gulp in order to build the project. 2023-05-29 12:10:27 -04:00
Steve Ireland
6b8e267c95 Save Gulp in preparation for migrating these changes over to the ci4 branch 2023-05-27 19:17:00 -04:00
jekkos
f6a5b0b01c Revert compose file to v2 (#3754) 2023-05-07 15:05:59 +02:00
jekkos
01c129eb0c Bump docker base image to php8 2023-05-02 00:23:53 +02:00
Steve Ireland
93536001d2 For #3749, added the exit() statement after the header was updated. 2023-05-01 08:46:25 -04:00
Steve Ireland
836ffaf0dd Fixes #3749. This seems to resolve issues with employee maintenance. After this commit I was able to add/change employees. 2023-04-28 08:52:09 -04:00
Steve Ireland
65c85ab111 Merge remote-tracking branch 'origin/ci4-upgrade' into ci4-upgrade
# Conflicts:
#	app/Config/App.php
#	app/Language/ar-EG/Bootstrap_tables.php
#	app/Language/ar-EG/Common.php
#	app/Language/ar-EG/Config.php
#	app/Language/ar-EG/Customers.php
#	app/Language/ar-EG/Employees.php
#	app/Language/ar-EG/Expenses.php
#	app/Language/ar-EG/Expenses_categories.php
#	app/Language/ar-EG/Giftcards.php
#	app/Language/ar-EG/Item_kits.php
#	app/Language/ar-EG/Items.php
#	app/Language/ar-EG/Login.php
#	app/Language/ar-EG/Module.php
#	app/Language/ar-EG/Receivings.php
#	app/Language/ar-EG/Reports.php
#	app/Language/ar-EG/Sales.php
#	app/Language/ar-EG/Taxes.php
#	app/Language/ar-LB/Bootstrap_tables.php
#	app/Language/ar-LB/Common.php
#	app/Language/ar-LB/Config.php
#	app/Language/ar-LB/Customers.php
#	app/Language/ar-LB/Employees.php
#	app/Language/ar-LB/Expenses.php
#	app/Language/ar-LB/Expenses_categories.php
#	app/Language/ar-LB/Giftcards.php
#	app/Language/ar-LB/Item_kits.php
#	app/Language/ar-LB/Items.php
#	app/Language/ar-LB/Login.php
#	app/Language/ar-LB/Module.php
#	app/Language/ar-LB/Receivings.php
#	app/Language/ar-LB/Reports.php
#	app/Language/ar-LB/Sales.php
#	app/Language/ar-LB/Taxes.php
#	app/Language/az-AZ/Config.php
#	app/Language/da/Sales.php
#	app/Language/en-GB/Cashups.php
#	app/Language/en-GB/Common.php
#	app/Language/en-GB/Config.php
#	app/Language/en-GB/Customers.php
#	app/Language/en-GB/Employees.php
#	app/Language/en-GB/Expenses.php
#	app/Language/en-GB/Expenses_categories.php
#	app/Language/en-GB/Giftcards.php
#	app/Language/en-GB/Item_kits.php
#	app/Language/en-GB/Items.php
#	app/Language/en-GB/Login.php
#	app/Language/en-GB/Module.php
#	app/Language/en-GB/Receivings.php
#	app/Language/en-GB/Reports.php
#	app/Language/en-GB/Sales.php
#	app/Language/en-GB/Suppliers.php
#	app/Language/en-GB/Taxes.php
#	app/Language/en-US/Config.php
#	app/Language/en-US/Customers.php
#	app/Language/en-US/Sales.php
#	app/Language/en-US/Taxes.php
#	app/Language/es/Sales.php
#	app/Language/fr/Config.php
#	app/Language/fr/Customers.php
#	app/Language/fr/Expenses_categories.php
#	app/Language/id/Config.php
#	app/Language/id/Customers.php
#	app/Language/id/Expenses_categories.php
#	app/Language/id/Login.php
#	app/Language/id/Sales.php
#	app/Language/id/Taxes.php
#	app/Language/lo/Attributes.php
2023-04-27 21:58:27 -04:00
Steve Ireland
e7218b2904 For #3741. Manual migration of commits from master to branch through April 22, 2023. 2023-04-27 21:55:06 -04:00
Steve Ireland
3c931a91e7 For #3741. Manual migration of commits from master to branch through April 3, 2023. 2023-04-27 21:55:06 -04:00
Steve Ireland
3bcddd6b78 For #3741. Manual migration of commits from master to branch through April 3, 2023 - through commit 89d7fcc. 2023-04-27 21:54:52 -04:00
Steve Ireland
d92225c6f7 For #3741. Manual migration of commits from master to branch through March 29, 2023. 2023-04-27 21:54:43 -04:00
Steve Ireland
1ab8c95412 For #3741. Manual migration of commits from master to branch through March 29, 2023, commit dac42b1. 2023-04-27 21:54:34 -04:00
Steve Ireland
f7b9c3bc1b For #3741. Manual migration of commits from master to branch through March 19, 2023 commits. 2023-04-27 21:54:27 -04:00
Steve Ireland
b3678baa63 For #3698. Cleanup Attribute.php 2023-04-27 21:54:20 -04:00
Steve Ireland
9b8081191d For #3698. I'm pleased to announce that this set of changes seems to allow a simple order to be completed. 2023-04-27 21:54:20 -04:00
Aril Apria Susanto
95ba062aa5 Trying my hand at cherry picking master changes into CI4. 2023-04-27 21:54:20 -04:00
Steve Ireland
1f52958380 For #3739. More adjustments for removing esc() 2023-04-27 21:54:13 -04:00
Steve Ireland
2fbc9a4a79 For #3739. More adjustments for removing esc() 2023-04-27 21:54:13 -04:00
Steve Ireland
2847d36f48 For #3732. Fixes for reported item maintenance issues. 2023-04-27 21:54:13 -04:00
Steve Ireland
29fabc0522 For #3739. Removed unnecessary escaping from customer maintenance. 2023-04-27 21:54:13 -04:00