Code

Merge in SP23 Main#20

Code

Merged

warrenlet merged 126 commits intomaincs169/snapcon:mainfrom sp23-maincs169/snapcon:sp23-mainCopy head branch name to clipboardMar 8, 2024

Commits

Commits on Feb 16, 2023

• initial

  

  Justin Pau

  committed
  ca8817c

  Copy full SHA for ca8817c

• init

  

  Justin Pau

  committed
  6bba07d

  Copy full SHA for 6bba07d

• fullcalendar

  

  Justin Pau

  committed
  c704cb0

  Copy full SHA for c704cb0

• jquery

  

  Justin Pau

  committed
  44559b7

  Copy full SHA for 44559b7

Commits on Feb 17, 2023

• Updated ReadMe

  monis24

  authored
  51b350e

  Copy full SHA for 51b350e

• created ruby workflow

  monis24

  authored
  ff84b13

  Copy full SHA for ff84b13

• added status badges

  monis24

  authored
  cdda7a7

  Copy full SHA for cdda7a7

• updated ruby workflow

  monis24

  authored
  5a400d9

  Copy full SHA for 5a400d9

Commits on Feb 18, 2023

• bluejay file

  

  Justin Pau

  committed
  df1f2fe

  Copy full SHA for df1f2fe

• Merge branch 'master' of https://github.com/cs169/snapcon

  

  Justin Pau

  committed
  2955d8d

  Copy full SHA for 2955d8d

Commits on Feb 22, 2023

• README EDIT - Capital Forked From

  adamsalguero

  committed
  3a1a785

  Copy full SHA for 3a1a785

• Merge branch 'master' of https://github.com/cs169/snapcon

  Show description for f9ab7de
  adamsalguero

  committed
  f9ab7de

  Copy full SHA for f9ab7de

• Updated Gemfile to require 2.6.6 or greater instead of 2.7

  adamsalguero

  committed
  639f215

  Copy full SHA for 639f215

• Updated Gemfile.lockfor JQuery build issue

  adamsalguero

  committed
  aba7bb8

  Copy full SHA for aba7bb8

• changed requirment for ruby version to be bellow 3 and regenerated GemFile

  adamsalguero

  committed
  0a9243c

  Copy full SHA for 0a9243c

Commits on Mar 1, 2023

• Merge remote-tracking branch 'upstream/main' into merge

  

  Justin Pau

  committed
  c384a51

  Copy full SHA for c384a51

• gemlock

  

  Justin Pau

  committed
  1bd6de0

  Copy full SHA for 1bd6de0

• Merge pull request #1 from cs169/merge

  Show description for 62ecd55
  Juapu

  authored
  62ecd55

  Copy full SHA for 62ecd55

Commits on Mar 2, 2023

• Update INSTALL_SNAPCON.md

  Juapu

  authored
  8a63f75

  Copy full SHA for 8a63f75

• Update INSTALL_SNAPCON.md

  Juapu

  authored
  094ea48

  Copy full SHA for 094ea48

• Delete main.yml

  monis24

  authored
  5573108

  Copy full SHA for 5573108

Commits on Mar 7, 2023

• env file

  

  Justin Pau

  committed
  5731f8a

  Copy full SHA for 5731f8a

• spec file

  

  Justin Pau

  committed
  1b3887c

  Copy full SHA for 1b3887c

Commits on Mar 8, 2023

• Update info.yml

  Juapu

  authored
  056cde0

  Copy full SHA for 056cde0

• Update README.md

  Juapu

  authored
  ae238f7

  Copy full SHA for ae238f7

• .env

  

  Justin Pau

  committed
  51f8cbd

  Copy full SHA for 51f8cbd

• Merge branch 'main' of https://github.com/cs169/snapcon

  

  Justin Pau

  committed
  59f1dc8

  Copy full SHA for 59f1dc8

• Revert "Merge branch 'main' of https://github.com/cs169/snapcon"

  Show description for 7b664f0
  

  Justin Pau

  committed
  7b664f0

  Copy full SHA for 7b664f0

• Revert "Revert "Merge branch 'main' of https://github.com/cs169/snapcon""

  Show description for 96ab2d8
  

  Justin Pau

  committed
  96ab2d8

  Copy full SHA for 96ab2d8

• goes back to 5731f8a

  

  Justin Pau

  committed
  b7e6ac5

  Copy full SHA for b7e6ac5

• Update info.yml

  Show description for 89cb436
  Juapu

  authored
  89cb436

  Copy full SHA for 89cb436

• revert json dependencies

  

  Justin Pau

  committed
  8d6a5f3

  Copy full SHA for 8d6a5f3

• Merge pull request #4 from cs169/jsonPkg

  Show description for 1b47caf
  Juapu

  authored
  1b47caf

  Copy full SHA for 1b47caf

Commits on Mar 9, 2023

• extra tab and dotenvexample file

  

  Justin Pau

  committed
  a28bc38

  Copy full SHA for a28bc38

• moving env variables

  

  Justin Pau

  committed
  e5d3ef7

  Copy full SHA for e5d3ef7

• cucumber

  

  Justin Pau

  committed
  eec43ab

  Copy full SHA for eec43ab

Commits on Mar 15, 2023

• simplecov 0.21.2

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  7e2f2fa

  Copy full SHA for 7e2f2fa

• added simplecov-cobertura

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  edc6cd9

  Copy full SHA for edc6cd9

• added simplecov_json_formatter

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  539b916

  Copy full SHA for 539b916

• adding json formatter to simplecov

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  3b863c5

  Copy full SHA for 3b863c5

• matrix.suite on spec

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  030aaec

  Copy full SHA for 030aaec

Commits on Mar 16, 2023

• change simplecov version + fix some linting errors

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  1ed88ac

  Copy full SHA for 1ed88ac

• pushing gemfile.lock

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  b7b5f2b

  Copy full SHA for b7b5f2b

• fixed more lint errors, removed json formatter for simplecov

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  b933958

  Copy full SHA for b933958

• fixed more linting errors

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  a5082d3

  Copy full SHA for a5082d3

• added gemfile.lock

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  3d1db39

  Copy full SHA for 3d1db39

• updated rubocop

  

  Monis Mohiuddin

  authored and

  Monis Mohiuddin

  committed
  033f309

  Copy full SHA for 033f309

Commits on Mar 23, 2023

• Merge pull request #6 from cs169/specWorkflow

  monis24

  authored
  4a32473

  Copy full SHA for 4a32473

• migrations for email subject and email body

  

  Justin Pau

  committed
  949f980

  Copy full SHA for 949f980

Commits on Apr 4, 2023

• this updates the plaintext and html that gets sent to users to confirm purchase of ticket

  

  Justin Pau

  committed
  f9178ba

  Copy full SHA for f9178ba

Commits on Apr 5, 2023

• put subject in subject line, removed from body

  monis24

  committed
  6ef6862

  Copy full SHA for 6ef6862

• default values for email subject and body when registering

  monis24

  committed
  c5328f9

  Copy full SHA for c5328f9

Commits on Apr 6, 2023

• fix lint error

  monis24

  committed
  25317bf

  Copy full SHA for 25317bf

Commits on Apr 11, 2023

• Merge pull request #7 from cs169/tickets-add-attr-email

  Show description for 9a8bb42
  Juapu

  authored
  9a8bb42

  Copy full SHA for 9a8bb42

• Merge pull request #8 from cs169/new_email_subject

  Show description for c0b71fb
  Juapu

  authored
  c0b71fb

  Copy full SHA for c0b71fb

• adding front-end templates

  monis24

  committed
  15d571f

  Copy full SHA for 15d571f

• added mailbot functionality

  monis24

  committed
  f00523d

  Copy full SHA for f00523d

• added to help partial

  monis24

  committed
  8e43b56

  Copy full SHA for 8e43b56

• generate mail method

  

  Justin Pau

  committed
  a8c5092

  Copy full SHA for a8c5092

• Merge pull request #9 from cs169/ticket-purchase-model-generate-mail

  Show description for 3066258
  monis24

  authored
  3066258

  Copy full SHA for 3066258

• added confirmation template, fixed some mailbot logic

  monis24

  committed
  12957fb

  Copy full SHA for 12957fb

• functionality for more variables w/ gsub

  monis24

  committed
  5a63112

  Copy full SHA for 5a63112

Commits on Apr 12, 2023

• ticket sub and body test

  

  Justin Pau

  committed
  f8ae95e

  Copy full SHA for f8ae95e

• fixed some lint errors

  monis24

  committed
  13c4fe9

  Copy full SHA for 13c4fe9

• saving

  

  Justin Pau

  committed
  03ef207

  Copy full SHA for 03ef207

• Merge branch 'new_email_subject' into ticket-sub-body-tests

  monis24

  authored
  48b5c3f

  Copy full SHA for 48b5c3f

• Merge pull request #10 from cs169/ticket-sub-body-tests

  Show description for d0486f4
  monis24

  authored
  d0486f4

  Copy full SHA for d0486f4

• fixed spec test

  monis24

  committed
  6bf3bc0

  Copy full SHA for 6bf3bc0

• whitespace fix

  monis24

  committed
  7169ce1

  Copy full SHA for 7169ce1

• some rubcop fixes

  monis24

  committed
  210008a

  Copy full SHA for 210008a

• more rubcop fixes

  monis24

  committed
  be5601c

  Copy full SHA for be5601c

Commits on Apr 19, 2023

• Update PULL_REQUEST_TEMPLATE.md

  Show description for bb43f2f
  cycomachead

  authored
  bb43f2f

  Copy full SHA for bb43f2f

• added service object email_template_parser

  monis24

  committed
  eec6280

  Copy full SHA for eec6280

• fixed some rubocop errors

  monis24

  committed
  ea49eef

  Copy full SHA for ea49eef

• fixed end statement error

  monis24

  committed
  5794368

  Copy full SHA for 5794368

• fixed some spec/codeclimate/lint errors, added new help partial

  monis24

  committed
  79f403b

  Copy full SHA for 79f403b

Commits on Apr 21, 2023

• Merge pull request #16 from cs169/cycomachead-patch-1

  Show description for a536fe9
  cycomachead

  authored
  a536fe9

  Copy full SHA for a536fe9

Commits on Apr 25, 2023

• made changes to pass spec:model

  monis24

  committed
  71f9ef5

  Copy full SHA for 71f9ef5

• fixed some rubocop errors

  monis24

  committed
  638f279

  Copy full SHA for 638f279

Commits on Apr 26, 2023

• refactored help partial for ticket + emails, removed old partials

  monis24

  committed
  dcea5bf

  Copy full SHA for dcea5bf

Commits on Apr 27, 2023

• lint errors should be gone

  monis24

  committed
  e2a0dff

  Copy full SHA for e2a0dff

Commits on Apr 28, 2023

• Merge pull request #11 from cs169/new_email_subject

  Show description for 295d3cf
  monis24

  authored
  295d3cf

  Copy full SHA for 295d3cf

• fixed some merge conflicts

  

  Justin Pau

  committed
  8d091d0

  Copy full SHA for 8d091d0

• create migration updated model relationship

  

  Justin Pau

  committed
  85ac543

  Copy full SHA for 85ac543

• conferences

  

  Justin Pau

  committed
  318b1bb

  Copy full SHA for 318b1bb

• new curr conv model

  

  Justin Pau

  committed
  858e9af

  Copy full SHA for 858e9af

• MVC for currency_conversions

  

  Justin Pau

  committed
  11c9d73

  Copy full SHA for 11c9d73

• routes are working except update

  

  Justin Pau

  committed
  5fe819f

  Copy full SHA for 5fe819f

• moved currency to be under donations

  

  Justin Pau

  committed
  98f93b0

  Copy full SHA for 98f93b0

• rspec tests for currency conversions

  

  Justin Pau

  committed
  3308a52

  Copy full SHA for 3308a52

• row one for rspec

  

  Justin Pau

  committed
  36b8123

  Copy full SHA for 36b8123

• trying as a button

  

  Justin Pau

  committed
  e8b5ebe

  Copy full SHA for e8b5ebe

• delete

  

  Justin Pau

  committed
  b1e606f

  Copy full SHA for b1e606f

• login as admin for rspec tests

  

  Justin Pau

  committed
  434a9c2

  Copy full SHA for 434a9c2

• factories and testing delete

  

  Justin Pau

  committed
  f707f8c

  Copy full SHA for f707f8c

• renaming id for curr conv index form cause of linter err

  

  Justin Pau

  committed
  68b5f66

  Copy full SHA for 68b5f66

• validats that no two rows in a the same conference curr conv tbl have the same from curr and to curr

  

  Justin Pau

  committed
  7b2e833

  Copy full SHA for 7b2e833

• Merge branch 'main' into main

  Juapu

  authored
  71bf707

  Copy full SHA for 71bf707

Commits on Apr 29, 2023

• edit curr conv test and a warning not to add curr conv

  

  Justin Pau

  committed
  3a08318

  Copy full SHA for 3a08318

• extra space before click_link edit

  

  Justin Pau

  committed
  ddf7dbf

  Copy full SHA for ddf7dbf

• extra line

  

  Justin Pau

  committed
  269cb83

  Copy full SHA for 269cb83

Commits on May 1, 2023

• quick fix for email subject feature

  monis24

  committed
  bfdabc4

  Copy full SHA for bfdabc4

• Merge pull request #19 from cs169/email_fix

  Show description for 246e43d
  monis24

  authored
  246e43d

  Copy full SHA for 246e43d

Commits on May 17, 2023

• Merge pull request #18 from cs169/rebased-currency-in-sidebar

  Show description for 9da4771
  cycomachead

  authored
  9da4771

  Copy full SHA for 9da4771

Commits on Feb 13, 2024

• Merge branch 'main' into sp23-main

  cycomachead

  authored
  aed239e

  Copy full SHA for aed239e

• merge main/osem-master

  cycomachead

  committed
  99821a4

  Copy full SHA for 99821a4

• Resolve lockfile simplecov versions

  cycomachead

  committed
  720ecf6

  Copy full SHA for 720ecf6

• Re-add CI platform to lockfile??

  cycomachead

  committed
  ac4a9b4

  Copy full SHA for ac4a9b4

• Merge branch 'main' of github.com:snap-cloud/snapcon into sp23-main

  Show description for 55f85e9
  cycomachead

  committed
  55f85e9

  Copy full SHA for 55f85e9

• attempt a workflow file update

  cycomachead

  committed
  9006ab1

  Copy full SHA for 9006ab1

• Obviously, this is a bad idea

  cycomachead

  committed
  cc2eaba

  Copy full SHA for cc2eaba

Commits on Feb 18, 2024

• Clean up legacy code from SP23 Main

  warrenlet

  committed
  cf5fcb1

  Copy full SHA for cf5fcb1

Commits on Feb 20, 2024

• fix admin toggle showing and is confirm toggleable

  Edge7481

  committed
  9eb4898

  Copy full SHA for 9eb4898

Commits on Feb 23, 2024

• changed 'Submission instructions' to 'Submission Template' in new event types view

  tiffanylamm

  committed
  16d8faa

  Copy full SHA for 16d8faa

• update INSTALL_SNAPCON.md

  

  Owen Yang

  authored and

  Owen Yang

  committed
  1503b90

  Copy full SHA for 1503b90

• Update .codeclimate.yml

  warrenlet

  committed
  debc26a

  Copy full SHA for debc26a

• Merge branch 'main' into sp23-main

  warrenlet

  authored
  d8f9625

  Copy full SHA for d8f9625

Commits on Feb 26, 2024

• renamed event_types attribute submission_instructions to submission_template

  tiffanylamm

  committed
  6543594

  Copy full SHA for 6543594

Commits on Feb 27, 2024

• Give up on using partials and just follow the same structure as OSEM's repo

  Edge7481

  committed
  c47dd47

  Copy full SHA for c47dd47

• Merge branch 'main' of github.com:cs169/snapcon into 187057653-fix-profile-admin-toggle

  Edge7481

  committed
  496fa43

  Copy full SHA for 496fa43

• Update style from checkbox to yes-no toggle

  Edge7481

  committed
  27240a2

  Copy full SHA for 27240a2

• get rid of dead code

  Edge7481

  committed
  fe586cd

  Copy full SHA for fe586cd

Commits on Mar 1, 2024

• Merge branch 'sp23-main' into 187057754-event-types-submission-template

  tiffanylamm

  authored
  e3accb7

  Copy full SHA for e3accb7

• Merge pull request #23 from cs169/187057754-event-types-submission-template

  Show description for bbe5451
  warrenlet

  authored
  bbe5451

  Copy full SHA for bbe5451

• Merge pull request #22 from cs169/187057653-fix-profile-admin-toggle

  Show description for da9b573
  warrenlet

  authored
  da9b573

  Copy full SHA for da9b573

Commits on Mar 8, 2024

• Merge pull request #24 from cs169/187057751-update-INSTALL_SNAPCON

  Show description for a15365e
  warrenlet

  authored
  a15365e

  Copy full SHA for a15365e