Update from upstream repo erxes/erxes@master#4
Open
backstroke-bot wants to merge 10000 commits intoitdevsamurai:masterfrom
Open
Update from upstream repo erxes/erxes@master#4backstroke-bot wants to merge 10000 commits intoitdevsamurai:masterfrom
backstroke-bot wants to merge 10000 commits intoitdevsamurai:masterfrom
Conversation
Enkhtuvshin0513
force-pushed
the
master
branch
7 times, most recently
from
14e8ec8 to
7f17432
Compare
Enkhtuvshin0513
force-pushed
the
master
branch
10 times, most recently
from
a222487 to
80518a7
Compare
Enkhtuvshin0513
force-pushed
the
master
branch
from
eb27b10 to
2c1d36c
Compare
Enkhtuvshin0513
force-pushed
the
master
branch
from
bbfb4b9 to
a0cc18b
Compare
Enkhtuvshin0513
force-pushed
the
master
branch
from
6cfb873 to
7b64c85
Compare
Enkhtuvshin0513
force-pushed
the
master
branch
6 times, most recently
from
22699c8 to
67196c9
Compare
Enkhtuvshin0513
force-pushed
the
master
branch
3 times, most recently
from
2e03d80 to
e48de57
Compare
- Add loyalty message broker integration in core - Merge score campaign related fields in customer - Set vouchers, coupons, and score logs to new merged customer - Add database indexes for owner-based queries - Clear selected options when relation changes in BoardSelectContainer
- Add dedicated import file upload endpoint in workers service - Configure FileUpload component to use workers upload endpoint - Handle local file storage for imports without unnecessary downloads - Remove debug console.log statements from CommonBuilder - Clean up trailing whitespace and formatting inconsistencies
- Add custom fields support to customer merge interface - Create new CustomersMerge container to fetch field groups - Update merge logic to handle custom fields data properly - Fix event handler issues in customer list state changes - Remove unused code in loyalty plugin filter - Clean up formatting and remove trailing whitespace
- Add .filter(Boolean) to defaultFileList in constructor - Add .filter(Boolean) to defaultFileList in componentWillReceiveProps - Prevents null/undefined/false values from being added to attachments state
- Add "Product Categories" dimension option - Group deals by product category and join - Format report date fields in Asia/Ulaanbaatar timezone
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hello!
The upstream repository
erxes/erxes@masterhas some new changes that aren't in this fork. So, here they are, ready to be merged! 🎉If this pull request can be merged without conflict, you can publish your software with these new changes. Otherwise, fix any merge conflicts by clicking the
Resolve Conflictsbutton.If you like Backstroke, consider donating to help us pay for infrastructure here. Backstroke is a completely open source project that's free to use, but we survive on sponsorships and donations. Thanks for your support! Help out Backstroke.
Created by Backstroke (I'm a bot!)