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.

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

187216987 add event by csv #375

Merged
merged 27 commits into from
Jul 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1cfa242
Merge branch '18712145-add-ticket-purchase-currency-selector' of gith…
Edge7481 Mar 15, 2024
f90435e
Update .codeclimate.yml
warrenlet Feb 23, 2024
29b0d55
merge
warrenlet Mar 15, 2024
a1c116d
Merge branch '187121440_Materials_Bulk_Upload'
warrenlet Mar 15, 2024
4c6c4ee
Merge branch '187153142-impl-currency-for-payments-page'
warrenlet Mar 15, 2024
4537e98
Merge remote-tracking branch 'origin/187153142-impl-currency-for-paym…
warrenlet Mar 15, 2024
bf76578
merge
warrenlet Mar 15, 2024
f19a779
Merge branch 'main' of github.com:cs169/snapcon
warrenlet Mar 18, 2024
4a4df63
Add upload csv schedule button
warrenlet Mar 19, 2024
2022ffb
Add comment code to enable button funcionality
warrenlet Mar 28, 2024
6a89df6
Upload CSV Added
Apr 22, 2024
4389a31
add upload CSV function
Apr 23, 2024
99f5306
Merge pull request #34 from cs169/187391447-schedule-jump-to-time-button
Edge7481 Apr 26, 2024
25f99fb
Merge pull request #35 from cs169/187436622-commercials-embed-snap
Edge7481 Apr 26, 2024
25e381f
Resolve merge conflicts by regenerating schema.rb
Apr 26, 2024
0e228b8
Fix RuboCop offenses in schedules controller
Apr 28, 2024
645f95a
Fix RuboCop offenses in schedules controller2
Apr 28, 2024
3842184
Fix RuboCop offenses in schedules controller3
Apr 28, 2024
6ba98dd
Refactored for add event by csv
Apr 28, 2024
c847c3a
Fix RuboCop offenses in schedules controller
Apr 28, 2024
cf52a84
Fix code style issues
Apr 28, 2024
b7999bc
Fix code style issues
Apr 28, 2024
78563c1
merge commerical updates
cycomachead Jul 20, 2024
92fa560
fix commericals function call
cycomachead Jul 20, 2024
d602335
merge
cycomachead Jul 20, 2024
021a24b
Fixup events admin table
cycomachead Jul 20, 2024
3619bfb
Fixup db schema
cycomachead Jul 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge
cycomachead committed Jul 20, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit d602335a98c04d6943fc1c762dafade27d1c3505
2 changes: 1 addition & 1 deletion app/models/commercial.rb
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ def self.render_from_url(url)
end
end

def self.geenerate_snap_embed(url)
def self.generate_snap_embed(url)
return url unless url

uri = URI.parse(url)
You are viewing a condensed version of this merge commit. You can view the full changes here.