Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 3.x into v4 #990

Draft
wants to merge 146 commits into
base: develop
Choose a base branch
from
Draft

Merge 3.x into v4 #990

wants to merge 146 commits into from

Conversation

sampoyigi
Copy link
Member

No description provided.

sampoyigi and others added 20 commits May 20, 2022 10:13
@sampoyigi
Drop asset minification feature to fix JS issue with admin not able t…
b9df4df 
…o login and unable to edit mail templates. #970 #948

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@ryanmitchell @sampoyigi
Add allergens relation to 3.x branch (#978)
ed16a6d 
* Fix #975

* fix missing menu item option values

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>

Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
minor fix
e8d8717 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fix location_options issue when creating a location #981
ccbba69 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
minor fixes
721943a 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Remove unique validation rule on allergen, category, location, mealti…
20a9e62 
…me, menu and table requests

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add permissions to order, reservation delete bulk action #986
16f24e0 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add padding to modal form fields container
bc9ceb1 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add branch name to split GA
f70ccc7 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@thienvu18
New admin.list.extendRecords event (#989)
aeb055b
@sampoyigi
Minor fix
f499635 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Use locale dates formats in order and reservation emails
3f5303e 
fixes tastyigniter/ti-ext-reservation#30

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Minor refactor to assignables
d5fd36c 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add location logo mail variables
d91683e 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Move allocate table logic from booking manager to reservation model
a4530bd 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Minor fix
4d9bdeb 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add migration to drop all foreign keys due to irritating foreign key …
ec0542b 
…errors

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Ensure list column names do not much model relation name
5e84a71 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Check foreign key/index exists before dropping
bbaa079 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@ryanmitchell @sampoyigi
Use customer email as replyTo when appropriate (#1002)
4635985 
* Use customer email as replyTo when appropriate

* Use mailGetReplyTo method instead

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>

* Use mailGetReplyTo method instead

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>

Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
ryanmitchell and others added 9 commits July 5, 2022 21:21
@ryanmitchell @sampoyigi
Ensure guest_num and duration have minimum values (#1001)
a3f024a 
Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
use lowest menu option price when menu item price is 0
137734c 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add location options as HasMany relation
652cb6e 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fix location list order type filter
68e405b 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Add comment column to reservations list tastyigniter/ti-ext-reservati…
3016c2f 
…on#32

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Sort menu item option dropdown alphabetically
f30bbff 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fix issue where cart item option quantity type calculated value is no…
f2c500c 
…t properly displayed

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Update README.md
b3732a3
@sampoyigi
Install core update first instead of ignoring non-core updates
2a754e4 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
sampoyigi and others added 30 commits June 17, 2023 22:16
@sampoyigi
Refactor chart initialization, add locale to dashboard container, and…
21df1e4 
… format date display in widget toolbar.

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fix bug in LocationAwareWidget.php where getAll() method was called i…
9167041 
…nstead of getIdOrAll().

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi @StyleCIBot
Apply fixes from StyleCI (#1041)
2e5711b 
[ci skip] [skip ci]

Co-authored-by: StyleCI Bot <bot@styleci.io>
@mrdezzods @sampoyigi
Use environment variable for admin uri (#1040)
21433fc 
Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Allow deselecting select options
eb45338 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Code refactor
f667e3f 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Refactor Reservations_model::getNextBookableTable() to only retrieve …
d678090 
…confirmed reservations.

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Refactor LogUserLastSeen.php to support multiple authentication servi…
cf3403c 
…ces and update last seen time for each authenticated user.

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Escape richeditor, markdowneditor eidget values to avoid XSS attacks
e92c6e4 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Remove option to configure sendmail path by admin
502b49b 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@Concreta09
Menu priority rule (#1050)
e4ed076 
Priority cannot be null, change rule to 'min:0'
@sampoyigi
Fix UI issue with markdown editor
2682642 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fixes issue with attaching media
0fdd266 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fix issue with assignee not populating when assignee group is selected
3472490 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Apply locationable on status editor assignee dropdown
4e0d636 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@mrdezzods
system.urlPolicy config can be set from env variable (#1063)
1c262c4
@Concreta09 @sampoyigi
Resolve temporarily open_basedir issue (#1061)
f916a34 
* open_basedir issue

Resolve open_basedir issue adding dot for relativize filename path

* Fix code style

* add comments

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>

---------

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Catch broken dashboard widgets exception
9555751 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Update composer.json
638836e
@sampoyigi
Restore config backup when extracting core files fails
1ddc4ac 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Minor fix
f108493 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
Fix missing closing parenthesis in form.js
1f8323f 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@heyanlong @sampoyigi
Clean JS files for case-insensitive file systems (#1057)
f45c55c 
* remove locales cache

* restore locales

---------

Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@antoniozh @sampoyigi
Update $defaultFormat in Country.php (#1067)
60da13e 
Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@dependabot
Bump follow-redirects from 1.15.2 to 1.15.4 in /app/admin/assets (#1065)
f68d525 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mindflowgo @sampoyigi
Fixed path to the Menus-v2 image file in demo theme. (#1077)
d1f380d 
* Fixed path to the Menus-v2 image so demo theme doesn't show broken image link.

* fix path

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>

---------

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi
compile assets
8c80545 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi @github-actions
Compile Assets
b801e67 
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@sampoyigi
Fixes #1075
bc67034 
Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
@sampoyigi @github-actions
Compile Assets
ac39e52 
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Status: In Progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@sampoyigi @mindflowgo @ryanmitchell @thienvu18 @CupNoodles @philipxyc @mrdezzods @Concreta09 @heyanlong @antoniozh