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

Improving Tickets UX #929

Merged
merged 27 commits into from
Nov 19, 2018
Merged

Improving Tickets UX #929

merged 27 commits into from
Nov 19, 2018

Conversation

bordoni
Copy link
Member

@bordoni bordoni commented Nov 16, 2018 •
edited by paulmskim
Loading

@paulmskim needs to make sure we are not deleting changes made on this Repo.
Related: the-events-calendar/tribe-common#828

@bordoni bordoni added code review Status: requires a code review. hold Status: on hold–do not proceed with other status items. labels Nov 16, 2018
@bordoni bordoni mentioned this pull request Nov 16, 2018
Closed
@bordoni bordoni requested a review from mitogh November 16, 2018 17:37
bordoni and others added 19 commits November 16, 2018 15:40
@bordoni
Diff avoid Showing Snap Files
969baf2
@paulmskim
resolve simple merge conflicts
3be2eef
@paulmskim
resolve conflict with is ticket valid
e8ba0a0
@paulmskim
resolve conflicts with ticket selectors test
78bf45c
@paulmskim
resolve ticket details conflict
00487ca
@paulmskim
resolve conflicts for ticket sagas
6eb51a1
@paulmskim
resolve ticket selector conflicts
bfc1523
@paulmskim
resolve more conflicts
48d8675
@paulmskim
remove unused ticket display container and edit container files
35a9a4c
@paulmskim
remove unused settings template
9122084
@paulmskim
add in hasTicketsPlus check
e0f2ee0
@paulmskim
change get capacity to string, add get capacity int
e3c17a5
@paulmskim
add has tickets plus class to ticket block
34bbb5e
@paulmskim
fix selectors and selector tests
fa642e0
@paulmskim
remove duplicate declarations, fix broken references
080321d
@paulmskim
fix ticket not being selected when adding ticket
b1bd01b
@paulmskim
add in has tickets plus functionality
708d720
@paulmskim
remove console log
6281b29
@paulmskim
Merge branch 'release/F18.3' into fix/rebased-tickets-block-clean-up
7766fb0 
Conflicts:
	src/modules/data/blocks/ticket/__tests__/__snapshots__/selectors.test.js.snap
	src/modules/data/blocks/ticket/reducers/__tests__/__snapshots__/ticket.test.js.snap
	src/modules/data/blocks/ticket/reducers/__tests__/__snapshots__/tickets.test.js.snap
	src/modules/data/blocks/ticket/sagas.js
@paulmskim paulmskim removed the hold Status: on hold–do not proceed with other status items. label Nov 17, 2018
@paulmskim
Copy link
Contributor

OK @mitogh @nealfennimore this is finally ready for CR. A few things to note:

  • You can look at the entire diff, but it's quite large and will take a while to get through.
  • To look at merge conflict resolutions, start from 3be2eef and work your way down. Make sure that the work you did previously is not overwritten.
  • Tests have not yet been resolved. I will handle this later.

nealfennimore
nealfennimore approved these changes Nov 17, 2018
View reviewed changes
Copy link
Contributor

@nealfennimore nealfennimore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me Paul. Just fix those tests when you're able 👍

@bordoni
Copy link
Member Author

bordoni commented Nov 19, 2018

👍

@bordoni bordoni added merge Status: ready to merge. and removed code review Status: requires a code review. labels Nov 19, 2018
@paulmskim paulmskim merged commit 94be8cb into release/F18.3 Nov 19, 2018
@paulmskim paulmskim deleted the fix/rebased-tickets-block-clean-up branch November 19, 2018 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mitogh mitogh mitogh approved these changes

@nealfennimore nealfennimore nealfennimore approved these changes

Assignees

@paulmskim paulmskim

Labels
merge Status: ready to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bordoni @paulmskim @mitogh @nealfennimore