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

[Iteration 1]Merge spring 24 main to snp-cloud main #356

Merged
merged 132 commits into from
Mar 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
ca8817c
initial
Feb 16, 2023
6bba07d
init
Feb 16, 2023
c704cb0
fullcalendar
Feb 16, 2023
44559b7
jquery
Feb 16, 2023
51b350e
Updated ReadMe
monis24 Feb 17, 2023
ff84b13
created ruby workflow
monis24 Feb 17, 2023
cdda7a7
added status badges
monis24 Feb 17, 2023
5a400d9
updated ruby workflow
monis24 Feb 17, 2023
df1f2fe
bluejay file
Feb 18, 2023
2955d8d
Merge branch 'master' of https://github.com/cs169/snapcon
Feb 18, 2023
3a1a785
README EDIT - Capital Forked From
adamsalguero Feb 22, 2023
f9ab7de
Merge branch 'master' of https://github.com/cs169/snapcon
adamsalguero Feb 22, 2023
639f215
Updated Gemfile to require 2.6.6 or greater instead of 2.7
adamsalguero Feb 22, 2023
aba7bb8
Updated Gemfile.lockfor JQuery build issue
adamsalguero Feb 22, 2023
0a9243c
changed requirment for ruby version to be bellow 3 and regenerated Ge…
adamsalguero Feb 22, 2023
c384a51
Merge remote-tracking branch 'upstream/main' into merge
Mar 1, 2023
1bd6de0
gemlock
Mar 1, 2023
62ecd55
Merge pull request #1 from cs169/merge
Juapu Mar 1, 2023
8a63f75
Update INSTALL_SNAPCON.md
Juapu Mar 2, 2023
094ea48
Update INSTALL_SNAPCON.md
Juapu Mar 2, 2023
5573108
Delete main.yml
monis24 Mar 2, 2023
5731f8a
env file
Mar 7, 2023
1b3887c
spec file
Mar 7, 2023
056cde0
Update info.yml
Juapu Mar 8, 2023
ae238f7
Update README.md
Juapu Mar 8, 2023
51f8cbd
.env
Mar 8, 2023
59f1dc8
Merge branch 'main' of https://github.com/cs169/snapcon
Mar 8, 2023
7b664f0
Revert "Merge branch 'main' of https://github.com/cs169/snapcon"
Mar 8, 2023
96ab2d8
Revert "Revert "Merge branch 'main' of https://github.com/cs169/snapc…
Mar 8, 2023
b7e6ac5
goes back to 5731f8a
Mar 8, 2023
89cb436
Update info.yml
Juapu Mar 8, 2023
8d6a5f3
revert json dependencies
Mar 8, 2023
1b47caf
Merge pull request #4 from cs169/jsonPkg
Juapu Mar 8, 2023
a28bc38
extra tab and dotenvexample file
Mar 9, 2023
e5d3ef7
moving env variables
Mar 9, 2023
eec43ab
cucumber
Mar 9, 2023
7e2f2fa
simplecov 0.21.2
Mar 15, 2023
edc6cd9
added simplecov-cobertura
Mar 15, 2023
539b916
added simplecov_json_formatter
Mar 15, 2023
3b863c5
adding json formatter to simplecov
Mar 15, 2023
030aaec
matrix.suite on spec
Mar 15, 2023
1ed88ac
change simplecov version + fix some linting errors
Mar 16, 2023
b7b5f2b
pushing gemfile.lock
Mar 16, 2023
b933958
fixed more lint errors, removed json formatter for simplecov
Mar 16, 2023
a5082d3
fixed more linting errors
Mar 16, 2023
3d1db39
added gemfile.lock
Mar 16, 2023
033f309
updated rubocop
Mar 16, 2023
4a32473
Merge pull request #6 from cs169/specWorkflow
monis24 Mar 23, 2023
949f980
migrations for email subject and email body
Mar 23, 2023
f9178ba
this updates the plaintext and html that gets sent to users to confir…
Apr 4, 2023
6ef6862
put subject in subject line, removed from body
monis24 Apr 5, 2023
c5328f9
default values for email subject and body when registering
monis24 Apr 5, 2023
25317bf
fix lint error
monis24 Apr 6, 2023
9a8bb42
Merge pull request #7 from cs169/tickets-add-attr-email
Juapu Apr 11, 2023
c0b71fb
Merge pull request #8 from cs169/new_email_subject
Juapu Apr 11, 2023
15d571f
adding front-end templates
monis24 Apr 11, 2023
f00523d
added mailbot functionality
monis24 Apr 11, 2023
8e43b56
added to help partial
monis24 Apr 11, 2023
a8c5092
generate mail method
Apr 11, 2023
3066258
Merge pull request #9 from cs169/ticket-purchase-model-generate-mail
monis24 Apr 11, 2023
12957fb
added confirmation template, fixed some mailbot logic
monis24 Apr 11, 2023
5a63112
functionality for more variables w/ gsub
monis24 Apr 11, 2023
f8ae95e
ticket sub and body test
Apr 12, 2023
13c4fe9
fixed some lint errors
monis24 Apr 12, 2023
03ef207
saving
Apr 12, 2023
48b5c3f
Merge branch 'new_email_subject' into ticket-sub-body-tests
monis24 Apr 12, 2023
d0486f4
Merge pull request #10 from cs169/ticket-sub-body-tests
monis24 Apr 12, 2023
6bf3bc0
fixed spec test
monis24 Apr 12, 2023
7169ce1
whitespace fix
monis24 Apr 12, 2023
210008a
some rubcop fixes
monis24 Apr 12, 2023
be5601c
more rubcop fixes
monis24 Apr 12, 2023
bb43f2f
Update PULL_REQUEST_TEMPLATE.md
cycomachead Apr 19, 2023
eec6280
added service object email_template_parser
monis24 Apr 19, 2023
ea49eef
fixed some rubocop errors
monis24 Apr 19, 2023
5794368
fixed end statement error
monis24 Apr 19, 2023
79f403b
fixed some spec/codeclimate/lint errors, added new help partial
monis24 Apr 19, 2023
a536fe9
Merge pull request #16 from cs169/cycomachead-patch-1
cycomachead Apr 21, 2023
71f9ef5
made changes to pass spec:model
monis24 Apr 25, 2023
638f279
fixed some rubocop errors
monis24 Apr 25, 2023
dcea5bf
refactored help partial for ticket + emails, removed old partials
monis24 Apr 26, 2023
e2a0dff
lint errors should be gone
monis24 Apr 27, 2023
295d3cf
Merge pull request #11 from cs169/new_email_subject
monis24 Apr 28, 2023
8d091d0
fixed some merge conflicts
Apr 20, 2023
85ac543
create migration updated model relationship
Apr 18, 2023
318b1bb
conferences
Apr 18, 2023
858e9af
new curr conv model
Apr 20, 2023
11c9d73
MVC for currency_conversions
Apr 20, 2023
5fe819f
routes are working except update
Apr 22, 2023
98f93b0
moved currency to be under donations
Apr 22, 2023
3308a52
rspec tests for currency conversions
Apr 27, 2023
36b8123
row one for rspec
Apr 27, 2023
e8b5ebe
trying as a button
Apr 27, 2023
b1e606f
delete
Apr 27, 2023
434a9c2
login as admin for rspec tests
Apr 27, 2023
f707f8c
factories and testing delete
Apr 27, 2023
68b5f66
renaming id for curr conv index form cause of linter err
Apr 28, 2023
7b2e833
validats that no two rows in a the same conference curr conv tbl have…
Apr 28, 2023
71bf707
Merge branch 'main' into main
Juapu Apr 28, 2023
3a08318
edit curr conv test and a warning not to add curr conv
Apr 29, 2023
ddf7dbf
extra space before click_link edit
Apr 29, 2023
269cb83
extra line
Apr 29, 2023
bfdabc4
quick fix for email subject feature
monis24 May 1, 2023
246e43d
Merge pull request #19 from cs169/email_fix
monis24 May 1, 2023
9da4771
Merge pull request #18 from cs169/rebased-currency-in-sidebar
cycomachead May 17, 2023
aed239e
Merge branch 'main' into sp23-main
cycomachead Feb 13, 2024
99821a4
merge main/osem-master
cycomachead Feb 13, 2024
720ecf6
Resolve lockfile simplecov versions
cycomachead Feb 13, 2024
ac4a9b4
Re-add CI platform to lockfile??
cycomachead Feb 13, 2024
55f85e9
Merge branch 'main' of github.com:snap-cloud/snapcon into sp23-main
cycomachead Feb 13, 2024
9006ab1
attempt a workflow file update
cycomachead Feb 13, 2024
cc2eaba
Obviously, this is a bad idea
cycomachead Feb 13, 2024
cf5fcb1
Clean up legacy code from SP23 Main
warrenlet Feb 17, 2024
9eb4898
fix admin toggle showing and is confirm toggleable
Edge7481 Feb 20, 2024
16d8faa
changed 'Submission instructions' to 'Submission Template' in new eve…
tiffanylamm Feb 23, 2024
1503b90
update INSTALL_SNAPCON.md
Feb 23, 2024
af0df46
Update .codeclimate.yml
warrenlet Feb 23, 2024
2a934a9
Update .codeclimate.yml
warrenlet Feb 23, 2024
debc26a
Update .codeclimate.yml
warrenlet Feb 18, 2024
d8f9625
Merge branch 'main' into sp23-main
warrenlet Feb 23, 2024
6543594
renamed event_types attribute submission_instructions to submission_t…
tiffanylamm Feb 26, 2024
c47dd47
Give up on using partials and just follow the same structure as OSEM'…
Edge7481 Feb 27, 2024
496fa43
Merge branch 'main' of github.com:cs169/snapcon into 187057653-fix-pr…
Edge7481 Feb 27, 2024
27240a2
Update style from checkbox to yes-no toggle
Edge7481 Feb 27, 2024
fe586cd
get rid of dead code
Edge7481 Feb 27, 2024
e3accb7
Merge branch 'sp23-main' into 187057754-event-types-submission-template
tiffanylamm Mar 1, 2024
bbe5451
Merge pull request #23 from cs169/187057754-event-types-submission-te…
warrenlet Mar 1, 2024
da9b573
Merge pull request #22 from cs169/187057653-fix-profile-admin-toggle
warrenlet Mar 1, 2024
a15365e
Merge pull request #24 from cs169/187057751-update-INSTALL_SNAPCON
warrenlet Mar 8, 2024
fcb1f10
Merge pull request #20 from cs169/sp23-main
warrenlet Mar 8, 2024
73e97e8
Merge branch 'main' into main
warrenlet Mar 8, 2024
ec3a085
tidy empty newline
cycomachead Mar 8, 2024
fb46a02
remove newline
cycomachead Mar 12, 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
attempt a workflow file update
  • Loading branch information
cycomachead committed Feb 13, 2024
commit 9006ab1c38141ad795c077157fd669c9b3408d24
4 changes: 2 additions & 2 deletions .github/workflows/spec.yml
Original file line number Diff line number Diff line change
@@ -82,5 +82,5 @@ jobs:
run: |
export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
$CCTR sum-coverage coverage/codeclimate.*.json
$CCTR upload-coverage --id $CCTR_ID
$CCTR after-build --id $CCTR_ID
$CCTR upload-coverage --id ${{ secrets.CC_TEST_REPORTER_ID }}
$CCTR after-build --id ${{ secrets.CC_TEST_REPORTER_ID }}