rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

WIP: "CMB - notifications when JO is cancelled or rejected" #1311

Draft
korina.cordero wants to merge 5 commits from 433-cmb-notifications-when-jo-is-cancelled-or-rejected into 424-cmb-release
pull from: 433-cmb-notifications-when-jo-is-cancelled-or-rejected
merge into: rgutierrez:424-cmb-release
Conversation 5 Commits 5 Files changed 10 +501
korina.cordero commented 2020-06-30 03:40:48 +00:00 (Migrated from gitlab.com)
Copy link

Closes #433

Closes #433
korina.cordero commented 2020-06-30 06:47:54 +00:00 (Migrated from gitlab.com)
Copy link

added 86 commits

  • 944fff8d...818a8fff - 81 commits from branch 424-cmb-release
  • e9981b24 - Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 432-cmb-display-details-in-jo
  • 32c83aa4 - Add odometer and pictures when viewing JO. #432
  • 7aed2001 - Fix displaying of images. #432
  • 9717effb - Add signature and email address to display. Separate the before and after images. #432
  • 0b8b462f - Add Notification entity. Modify User and JobOrder entities for notifications. #433

Compare with previous version

added 86 commits <ul><li>944fff8d...818a8fff - 81 commits from branch <code>424-cmb-release</code></li><li>e9981b24 - Merge branch &#39;424-cmb-release&#39; of gitlab.com:jankstudio/resq into 432-cmb-display-details-in-jo</li><li>32c83aa4 - Add odometer and pictures when viewing JO. #432</li><li>7aed2001 - Fix displaying of images. #432</li><li>9717effb - Add signature and email address to display. Separate the before and after images. #432</li><li>0b8b462f - Add Notification entity. Modify User and JobOrder entities for notifications. #433</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/500/diffs?diff_id=98333806&start_sha=944fff8d9584db43edc1481ac9125e39e2fc754f)
korina.cordero commented 2020-06-30 06:48:47 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>101565a2 - Add NotificationType. #433</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/500/diffs?diff_id=98333947&start_sha=0b8b462f8f924e7fcfd47c5739feeb0e49576c41)
korina.cordero commented 2020-06-30 11:05:00 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>fc6cf188 - Add notification controller and entity. #433</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/500/diffs?diff_id=98393017&start_sha=101565a251f7c3e28d5fd0f9cd1154f8188134c6)
korina.cordero commented 2020-07-10 04:14:30 +00:00 (Migrated from gitlab.com)
Copy link

added 23 commits

  • fc6cf188...87348711 - 22 commits from branch 424-cmb-release
  • 00ae6208 - Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into...

Compare with previous version

added 23 commits <ul><li>fc6cf188...87348711 - 22 commits from branch <code>424-cmb-release</code></li><li>00ae6208 - Merge branch &#39;424-cmb-release&#39; of gitlab.com:jankstudio/resq into...</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/500/diffs?diff_id=100180765&start_sha=fc6cf1883b5e3a6cada10f25ccaedf336723df65)
korina.cordero commented 2020-07-10 09:55:02 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 3a57c484 - Mark notifications as read when user views the JO. User is redirected to the...

Compare with previous version

added 1 commit <ul><li>3a57c484 - Mark notifications as read when user views the JO. User is redirected to the...</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/500/diffs?diff_id=100235591&start_sha=00ae62087801f1d87b9d24f55e194079b4e218e3)
This pull request has changes conflicting with the target branch.
  • config/menu.yaml
  • src/Entity/JobOrder.php
  • src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 433-cmb-notifications-when-jo-is-cancelled-or-rejected:433-cmb-notifications-when-jo-is-cancelled-or-rejected
git checkout 433-cmb-notifications-when-jo-is-cancelled-or-rejected

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout 424-cmb-release
git merge --no-ff 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git checkout 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git rebase 424-cmb-release
git checkout 424-cmb-release
git merge --ff-only 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git checkout 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git rebase 424-cmb-release
git checkout 424-cmb-release
git merge --no-ff 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git checkout 424-cmb-release
git merge --squash 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git checkout 424-cmb-release
git merge --ff-only 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git checkout 424-cmb-release
git merge 433-cmb-notifications-when-jo-is-cancelled-or-rejected
git push origin 424-cmb-release
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: rgutierrez/resq#1311
No description provided.
Delete branch "433-cmb-notifications-when-jo-is-cancelled-or-rejected"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?