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

Merge in SP23 Main #344

Merged
merged 128 commits into from
Mar 12, 2024
Merged

Merge in SP23 Main #344

merged 128 commits into from
Mar 12, 2024

Conversation

cycomachead
Copy link
Member

@cycomachead cycomachead commented Feb 13, 2024 •
edited
Loading

Spring 2023 CS169L Work

  • Email templates w/tickets
  • start currency conversion features
  • small improvements?

Remaining Tasks Before Merging

  • Resolve all code comments
  • cleanup read me
  • fix rubocop version in yml config
  • ...

Justin Pau and others added 30 commits February 16, 2023 15:06
initial
ca8817c
init
6bba07d
fullcalendar
c704cb0
jquery
44559b7
@monis24
Updated ReadMe
51b350e
@monis24
created ruby workflow
ff84b13
@monis24
added status badges
cdda7a7
@monis24
updated ruby workflow
5a400d9
bluejay file
df1f2fe
Merge branch 'master' of https://github.com/cs169/snapcon
2955d8d
@adamsalguero
README EDIT - Capital Forked From
3a1a785
@adamsalguero
Merge branch 'master' of https://github.com/cs169/snapcon
f9ab7de 
Build test.
@adamsalguero
Updated Gemfile to require 2.6.6 or greater instead of 2.7
639f215
@adamsalguero
Updated Gemfile.lockfor JQuery build issue
aba7bb8
@adamsalguero
changed requirment for ruby version to be bellow 3 and regenerated Ge…
0a9243c 
…mFile
Merge remote-tracking branch 'upstream/main' into merge
c384a51
gemlock
1bd6de0
@Juapu
Merge pull request #1 from cs169/merge
62ecd55 
Merge
@Juapu
Update INSTALL_SNAPCON.md
8a63f75
@Juapu
Update INSTALL_SNAPCON.md
094ea48
@monis24
Delete main.yml
5573108
env file
5731f8a
spec file
1b3887c
@Juapu
Update info.yml
056cde0
@Juapu
Update README.md
ae238f7
.env
51f8cbd
Merge branch 'main' of https://github.com/cs169/snapcon
59f1dc8
Revert "Merge branch 'main' of https://github.com/cs169/snapcon"
7b664f0 
This reverts commit 59f1dc8, reversing
changes made to 51f8cbd.
Revert "Revert "Merge branch 'main' of https://github.com/cs169/snapcon…
96ab2d8 
…""

This reverts commit 7b664f0.
goes back to 5731f8a
b7e6ac5
@cycomachead
Copy link
Member Author

Woo, specs are passing! But it's code climate that's being a pain right now

@warrenlet warrenlet force-pushed the sp23-main branch 4 times, most recently from a00072e to 6cd9b45 Compare February 18, 2024 07:18
warrenlet and others added 10 commits February 23, 2024 12:56
@warrenlet
Merge branch 'main' into sp23-main
d8f9625
@tiffanylamm
renamed event_types attribute submission_instructions to submission_t…
6543594 
…emplate
@Edge7481
Give up on using partials and just follow the same structure as OSEM'…
c47dd47 
…s repo
@Edge7481
Merge branch 'main' of github.com:cs169/snapcon into 187057653-fix-pr…
496fa43 
…ofile-admin-toggle
@Edge7481
Update style from checkbox to yes-no toggle
27240a2
@Edge7481
get rid of dead code
fe586cd
@tiffanylamm
Merge branch 'sp23-main' into 187057754-event-types-submission-template
e3accb7
@warrenlet
Merge pull request #23 from cs169/187057754-event-types-submission-te…
bbe5451 
…mplate

187057754 event types submission template
@warrenlet
Merge pull request #22 from cs169/187057653-fix-profile-admin-toggle
da9b573 
187057653 fix "edit profile" shows admin and confirmed toggles as a non-admin
@warrenlet
Merge pull request #24 from cs169/187057751-update-INSTALL_SNAPCON
a15365e 
update INSTALL_SNAPCON.md
@warrenlet warrenlet mentioned this pull request Mar 8, 2024
Merged
5 tasks
@cycomachead cycomachead merged commit fcb1f10 into snap-cloud:main Mar 12, 2024
1 of 3 checks passed
@cycomachead cycomachead deleted the sp23-main branch August 1, 2024 02:08
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.
7 participants
@cycomachead @monis24 @adamsalguero @Juapu @warrenlet @Edge7481 @tiffanylamm