Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fc84a67
Bump autocompleter from 6.1.3 to 10.0.0
dependabot[bot] Oct 7, 2026
14f1756
Bump @fortawesome/fontawesome-free from 5.15.4 to 7.3.1
dependabot[bot] Oct 7, 2026
0097dc1
Bump fullcalendar from 5.11.5 to 7.1.0
dependabot[bot] Oct 7, 2026
e4dd2a1
Bump cssnano from 5.1.15 to 9.2.2
dependabot[bot] Oct 7, 2026
9ea3c45
Bump actions/download-artifact from 4 to 7
dependabot[bot] Oct 7, 2026
a5d8aa5
Bump docker/build-push-action from 6 to 7
dependabot[bot] Oct 7, 2026
2a62c47
Bump actions/checkout from 4 to 7
dependabot[bot] Oct 7, 2026
a696e25
Bump actions/upload-artifact from 4 to 6
dependabot[bot] Oct 7, 2026
6625a1a
Bump docker/metadata-action from 5 to 6
dependabot[bot] Oct 7, 2026
4d91c89
Bump the npm-minor-patch group across 1 directory with 6 updates
dependabot[bot] Oct 14, 2026
a3bb3da
Bump the python-minor-patch group across 1 directory with 6 updates
dependabot[bot] Oct 14, 2026
4875009
Bump node from 24-slim to 26-slim
dependabot[bot] Oct 14, 2026
f9e284f
Merge remote-tracking branch 'origin/dependabot/uv/python-minor-patch…
jb3 Oct 14, 2026
b9b7c34
Merge remote-tracking branch 'origin/dependabot/github_actions/docker…
jb3 Oct 14, 2026
f3f5922
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
jb3 Oct 14, 2026
98f92bb
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
jb3 Oct 14, 2026
404ce85
Merge remote-tracking branch 'origin/dependabot/github_actions/docker…
jb3 Oct 14, 2026
6aa2167
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
jb3 Oct 14, 2026
c84962e
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/cssnano-…
jb3 Oct 14, 2026
35f1c61
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/fullcale…
jb3 Oct 14, 2026
395c913
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/fortawes…
jb3 Oct 14, 2026
b3c1243
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/autocomp…
jb3 Oct 14, 2026
4c0dd48
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/npm-mino…
jb3 Oct 14, 2026
3a9fb23
fix: keep fullcalendar at 5.x, v7 is a rewrite with a different API a…
jb3 Oct 14, 2026
58ec10b
feat: migrate calendar to fullcalendar 7 and fix font awesome 7 font …
jb3 Oct 14, 2026
606b5f9
fix: remove trailing blank line in screen.scss
jb3 Oct 14, 2026
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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libcairo2-dev
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
DATABASE_ENGINE: sqlite3
DATABASE_NAME: db.sqlite3
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libcairo2-dev
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- platform: linux/arm64
runner: ubuntu-24.04-arm
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- uses: docker/setup-buildx-action@v4

Expand All @@ -113,7 +113,7 @@ jobs:

- id: build
name: Build (and push by digest on master)
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: .
platforms: ${{ matrix.platform }}
Expand All @@ -132,7 +132,7 @@ jobs:

- name: Upload digest
if: github.event_name == 'push'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: digests-${{ strategy.job-index }}
path: ${{ runner.temp }}/digests/*
Expand All @@ -150,7 +150,7 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v7
with:
path: ${{ runner.temp }}/digests
pattern: digests-*
Expand All @@ -166,7 +166,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ghcr.io/${{ github.repository }}
tags: |
Expand Down
2 changes: 1 addition & 1 deletion RIGS/templates/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

calendar = new FullCalendar.Calendar(calendarEl, {
firstDay: 1,
themeSystem: 'standard',
aspectRatio: 1.5,
eventTimeFormat: {
'hour': '2-digit',
Expand Down Expand Up @@ -65,6 +64,7 @@
'start': item.earliest,
'end': end,
'className': 'modal-href',
'contrastColor': 'black',
'title': item.title,
'url': item.url,
'allDay': allDay
Expand Down
2 changes: 1 addition & 1 deletion compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ services:

# Rebuilds the CSS/JS bundles into pipeline/built_assets whenever the sources change
assets:
image: node:24-slim
image: node:26-slim
working_dir: /app
volumes:
- .:/app
Expand Down
10 changes: 8 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ function fonts(done) {

function styles(done) {
const bs_select = ["tom-select.bootstrap5.css"]
const fullcalendar = ["skeleton.css", "theme.css", "palette.css"]
return gulp.src(['pipeline/source_assets/scss/**/*.scss',
'node_modules/fullcalendar/main.css',
'node_modules/fullcalendar/skeleton.css',
'node_modules/fullcalendar/themes/classic/theme.css',
'node_modules/fullcalendar/themes/classic/palette.css',
'node_modules/tom-select/dist/css/tom-select.bootstrap5.css',
'node_modules/easymde/dist/easymde.min.css'
])
Expand All @@ -38,6 +41,7 @@ function styles(done) {
silenceDeprecations: ['import'],
}).on('error', sass.logError))
.pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.css')))
.pipe(gulpif(function(file) { return file.path.includes('node_modules/fullcalendar/') && fullcalendar.includes(file.relative);}, con('main.css')))
.pipe(postcss([ autoprefixer(), cssnano() ]))
.pipe(sourcemaps.write())
.pipe(gulp.dest('pipeline/built_assets/css'))
Expand All @@ -55,14 +59,16 @@ function scripts() {
'node_modules/html5sortable/dist/html5sortable.min.js',
'node_modules/clipboard/dist/clipboard.min.js',
'node_modules/moment/moment.js',
'node_modules/fullcalendar/main.js',
'node_modules/fullcalendar/all/global.js',
'node_modules/fullcalendar/themes/classic/global.js',
'node_modules/tom-select/dist/js/tom-select.complete.js',
'node_modules/easymde/dist/easymde.min.js',
'node_modules/konami/konami.js',
'pipeline/source_assets/js/**/*.js',])
.pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js')))
.pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js')))
.pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
.pipe(gulpif(function(file) { return file.path.includes('node_modules/fullcalendar/');}, con('main.js')))
.pipe(gulpif(function(file) { return ["bootstrap.bundle.js", "helpers.js"].includes(file.relative);}, con('jpop.js')))
.pipe(flatten())
// Only minify if filename does not already denote it as minified
Expand Down
Loading
Loading