Skip to content

merge develop into bootstrap 5 - #628

Merged
tallen42 merged 2 commits into
bootstrap-5from
patch-webpack
Oct 5, 2026
Merged

tallen42 merged 2 commits into
bootstrap-5from
patch-webpack

Conversation

@tallen42

@tallen42 tallen42 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor
  • fix: Disable sentry based on if in local development or not

  • fix: Make SENTRY_ENV variable only default on null

  • docs: Document the changes to how Sentry is enabled

NickJ-7010 and others added 2 commits October 2, 2026 19:21
* fix: Disable sentry based on if in local development or not

* fix: Make SENTRY_ENV variable only default on null

* docs: Document the changes to how Sentry is enabled
@csh-sonarqube-community

Copy link
Copy Markdown

Passed Quality Gate passed

Issues

Measures

Project ID: ComputerScienceHouse_conditional_b4074151-bbfd-4fc3-b87d-10f1c1f625ab

View in SonarQube

@tallen42
tallen42 merged commit 81c19ce into bootstrap-5 Oct 5, 2026
2 checks passed
@tallen42
tallen42 deleted the patch-webpack branch October 5, 2026 01:13
BigSpaceships added a commit that referenced this pull request Oct 19, 2026
Merged Squashed commit of the following:

* fix: close'r? hardly know er

* fix: dark mode doesn't flicker

* feat: standardize the alerts

* fix: change redirect uri env variable name

* fix: add the modal

* fix: change the redirect uri back

* feat: template conditional modal

* fix: condtiional modal does shit

* fix: adhoc name shows up

* automigrate (#630)

    * automigrate

    * remove trailing space

* Merge pull request #629 from ComputerScienceHouse/env-setup

    * Updates to config section

* Updates to config section

* trying to figure out merge conflicts is borderline impossible

* Merge pull request #628 from ComputerScienceHouse/develop

    * merge develop into bootstrap 5

* Merge branch 'bootstrap-5' into patch-webpack

* Merge remote-tracking branch 'origin/develop' into bootstrap-5

* fix: nav and table toggle

* fix: attendance submission not working

* Merge branch 'develop' into bootstrap-5

* Merge remote-tracking branch 'origin/develop' into bootstrap-5

* Merge remote-tracking branch 'origin/develop' into bootstrap-5

* fix: addressed pr feedback

* fix: slideshows work now

* feat: last sonarqube

* feat: make the collapses better

* fix: more sonarqube

* fix: more sonarqube + cleanup

* fix: make nav stuff buttons

* Fixed some sonarqube issues

* fix: cleanup css files

* feat: round logo

* fix: not always become active

* fix: sonarqube issues

* feat: use color mode in bs package

* fix: ignore too many variables

* fix: cleanup old ldap function stuff

* Merge branch 'develop' into bootstrap-5

* fix: update footer and fix housing bug

* feat: different colors

* feat: better eval pages

* feat: major project at spring evals

* fix: fix colors and spacing

* fix: fixed colors for slider on light mode

* fix: spacing on dashboard

* fix: navbar + update bootstrap

* fix: intro hosted seminars is right

* fix: excusing people

* Merge branch 'develop' into bootstrap-5

* feat: financial member management

* fix: active button shows up now

* fix: user group overrides

* feat: member management cleaned up

* feat: edit member modal

* feat: coop management

* fix: reviewing seminars and directorship bug

* feat: hm attendance and history editing

* feat: styled attendance history

* feat: attendance history

* feat: ts attendance

* feat: more directorship attendance

* feat: directorship attendance

* feat: housing page

* feat: coop form

* fix: better formatting the images

* feat: more major project stuff

* feat: cleanup intro and gatekeep evals stuff

* Merge branch 'develop' into bootstrap-5

* fix: center active button

* feat: cleanup fetch utils

* feat: swal2 stuff for creating conditionals

* feat: datepicker for conditional creation

* feat: new bootstrap version

* csh bootstrap 5.3.10

* feat: link icons for headers

* feat: styled spring evals table

* fix: evals tables not showing up

* chore: consolidated nav and nav_protected and made everything inherit
    from base

* fix: fixed broken bootstrap install, also swal2

* feat: update bootstrap

* fix: spelling on dashboard

* Merge branch 'develop' into bootstrap-5

* updated for updating from dev

* more small fixes

* started working on conditionals

* more fixing things

* spring evals

* made things more compact

* table toggle

* intro evals table stuff

* intro evals basic info

* reordered dashboard

* dashboard is done

* major project stuff

* more updating dashboard

* fixing more dashboard

* fix webpack stuff

* Fixing dashboard

* working nav
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants