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

Revert default currency branch #379

Closed
wants to merge 61 commits into from
Closed

Revert default currency branch #379

wants to merge 61 commits into from

Conversation

owennny
Copy link
Contributor

@owennny owennny commented Apr 29, 2024

Pivotal Tracker Link

What this PR does:

This pull request fixes|implements (pick one...) ______.

Include screenshots, videos, etc.

Who authored this PR?

How should this PR be tested?

  • Is there a deploy we can view?
  • What do the specs/features test?
  • Are there edge cases to watch out for?

Are there any complications to deploying this?

Checklist:

  • Has this been deployed to a staging environment or reviewed by a customer?
  • Tag someone for code review (either a coach / team member)
  • I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay)

Edge7481 and others added 30 commits March 15, 2024 10:51
@Edge7481 @warrenlet
Merge branch '18712145-add-ticket-purchase-currency-selector' of gith…
1cfa242 
…ub.com:cs169/snapcon into 187153142-impl-currency-for-payments-page
@warrenlet
Update .codeclimate.yml
f90435e
@warrenlet
merge
29b0d55
@warrenlet
Merge branch '187121440_Materials_Bulk_Upload'
a1c116d
@warrenlet
Merge branch '187153142-impl-currency-for-payments-page'
4c6c4ee
@warrenlet
Merge remote-tracking branch 'origin/187153142-impl-currency-for-paym…
4537e98 
…ents-page'
@warrenlet
merge
bf76578
@warrenlet
Merge branch 'main' of github.com:cs169/snapcon
f19a779
@warrenlet
Add upload csv schedule button
4a4df63
@warrenlet
Add comment code to enable button funcionality
2022ffb
@tiffanylamm
added enable_public_submission to event_types model need to implement…
b1375b5 
… in views
@tiffanylamm
admin vs non-admin dropdown and descriptions event types working
784d50f
@Edge7481
Merge pull request #31 from cs169/187153142-impl-currency-for-payment…
23cbde8 
…s-page

187153142 Implement payment in multiple currencies
@tiffanylamm
finished applying enable-public-submission plus tests
a988487
@warrenlet
Merge branch 'main' of github.com:cs169/snapcon
b932d80
@warrenlet
Migrate include_committee to splash pages
28e75c6
@tiffanylamm
proposals work for not signed in user
8a8f9de
@warrenlet
Add organizers pic on the splashpage
d4061ac
@warrenlet
Merge pull request #28 from cs169/187121440_Materials_Bulk_Upload
adc8282 
187121440 materials bulk upload
@warrenlet
add profile link to organizer
81b174e
@warrenlet
Merge branch 'main' of github.com:cs169/snapcon
773adb5
@warrenlet
Update .rubocop_todo.yml
ecba0fb 
adjust PerceivedComplexity limit by 1 to accommodate the adding committee boolean in conference controller
@warrenlet
Update .rubocop_todo.yml
a41141f 
Revert to the previous setting
@Edge7481
Set up button and style
4b1555c
@Edge7481
add javascript to scroll to closest event
1e4a646
@tiffanylamm
Merge branch 'main' into 187217062-enable-public-submission-event-types
2a721c5
@Edge7481
add test and fix error
3b847b6
@warrenlet
Merge branch 'main' of github.com:cs169/snapcon
8370e05
@Edge7481
parse upload url to check if it is a embeddable snap project
fb3950a
Upload CSV Added
6a89df6
Edge7481 and others added 28 commits April 22, 2024 16:35
@Edge7481
remove unused import
3c73c95
add upload CSV function
4389a31
@tiffanylamm
fixed CI error in controller
8d10eca
@tiffanylamm
fixed multiple ticket at registration view
af0754b
@tiffanylamm
added testing for conference_registration_controller
1b7a9ae
@tiffanylamm
fixed ticket_turnover_total failing model spec
e66a075
@tiffanylamm
spelling mistake
aef231a
@tiffanylamm
Merge branch 'main' into 187376318-ticket-purchases-curr-conversion
f514259
@Edge7481
Merge pull request #34 from cs169/187391447-schedule-jump-to-time-button
99f5306 
Add jump to current event button to schedule
@Edge7481
Merge pull request #35 from cs169/187436622-commercials-embed-snap
25f99fb 
187436622 commercials embed snap
Resolve merge conflicts by regenerating schema.rb
25e381f
@Edge7481
Merge pull request #36 from cs169/187376318-ticket-purchases-curr-con…
4fb8f3f 
…version

187376318 ticket purchases curr conversion
Fix RuboCop offenses in schedules controller
0e228b8
Fix RuboCop offenses in schedules controller2
645f95a
Fix RuboCop offenses in schedules controller3
3842184
Refactored for add event by csv
6ba98dd
Fix RuboCop offenses in schedules controller
c847c3a
Fix code style issues
cf52a84
Fix code style issues
b7999bc
@owennny
Merge pull request #38 from cs169/187216987_add_event_by_CSV
9e65549 
187216987 add event by csv
@warrenlet
Merge branch 'main' of github.com:cs169/snapcon
9eb8779
@warrenlet
Merge branch 'main' into 187391225_Add_committees_info
66d3fe5
@warrenlet
Merge branch 'main' into 187391225_Add_committees_info
ec4603a
@warrenlet
Merge pull request #32 from cs169/187391225_Add_committees_info
e3a8b0b 
187391225 add committees info
@warrenlet
delete event enable
62ff980
@warrenlet
rubocop styling fix
8aab77e
@warrenlet
Merge pull request #40 from cs169/187460419_Support_delete_event
76cb323 
187460419 support delete event
@owennny
Revert "Revert "187121499 enable default currency""
1787ba7 
This reverts commit ca55c9a.
@owennny owennny closed this Apr 29, 2024
@cycomachead cycomachead deleted the revert_default_currency_branch branch August 1, 2024 02:09
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@owennny @Edge7481 @warrenlet @tiffanylamm