Commit Graph

Select branches

Hide Pull Requests

PSSC-Values

asset_fixes

assets

assets-testing

assets_audit

assets_cabletypes

assets_embed

assets_legacy

assets_misc

assets_reversion

auth_fixes

bs4

bugfix-datetime-field-testing

checkin

combine-prs-branch

combine-prs-branch1

data-ingest

dependabot/npm_and_yarn/eazy-logger-4.1.0

dependabot/npm_and_yarn/follow-redirects-1.16.0

dependabot/npm_and_yarn/immutable-3.8.3

dependabot/npm_and_yarn/lodash-4.18.1

dependabot/npm_and_yarn/multi-57404e07ab

dependabot/npm_and_yarn/picomatch-2.3.2

dependabot/npm_and_yarn/svgo-2.8.2

dependabot/npm_and_yarn/yaml-1.10.3

dependabot/pip/zipp-3.19.1

dependabot/uv/requests-2.33.0

dependabot/uv/sqlparse-0.5.4

dependabot/uv/tornado-6.5.5

dependabot/uv/urllib3-2.6.3

django2

django5

embed_improvements

estates-compliance

feature/builds

feature/discourse-auth

feature/discourse-auth-app

feature/ember

feature/invoice-query

feature/invoiceHistory

feature/subhire

forms

heroku-upgrade

hotfix-disable-password-reset

hotfix/formatting

hotfix/ical

hotfix/su-branding

imgbot

master

misc

open

optimisation

python_deps_2020

requires-io-master

revert-594-jb3/features/power-test-export

risk-assessment

search

subgrid

subhire

telegram

training_legacy

travis-fix

update-stack

web-calendar

#167

#177

#191

#194

#200

#201

#207

#208

#211

#214

#217

#220

#229

#234

#246

#248

#250

#252

#253

#253

#254

#258

#258

#260

#263

#265

#268

#268

#269

#270

#271

#272

#272

#273

#275

#277

#280

#283

#285

#288

#288

#289

#290

#292

#293

#294

#295

#296

#297

#298

#299

#300

#301

#302

#303

#304

#306

#306

#307

#308

#310

#311

#312

#313

#314

#315

#317

#318

#318

#324

#325

#328

#329

#331

#332

#333

#334

#335

#336

#337

#338

#339

#340

#341

#359

#361

#363

#371

#373

#378

#382

#383

#387

#389

#390

#393

#395

#396

#397

#399

#400

#401

#402

#403

#404

#406

#407

#408

#409

#411

#412

#416

#417

#418

#420

#425

#427

#428

#429

#430

#432

#433

#434

#435

#436

#441

#442

#448

#449

#450

#458

#459

#460

#461

#462

#463

#464

#466

#467

#468

#471

#484

#485

#489

#491

#492

#493

#494

#495

#496

#503

#504

#505

#506

#507

#508

#509

#510

#511

#512

#514

#515

#516

#517

#518

#519

#520

#521

#522

#523

#526

#527

#529

#530

#531

#532

#536

#541

#542

#544

#545

#550

#551

#553

#554

#556

#557

#558

#559

#561

#563

#564

#565

#566

#567

#569

#570

#571

#572

#574

#575

#576

#577

#578

#579

#580

#581

#583

#584

#585

#586

#588

#589

#589

#590

#591

#594

#595

#596

#598

#599

#600

#601

#602

#604

#606

#607

#610

#611

#613

#614

#616

#617

#618

#619

#620

#621

#624

#625

#626

#627

#628

#628

#629

#630

#633

#633

#634

#635

#635

#636

#636

#637

#637

#638

#638

#639

#639

#641

#641

#642

#642

#643

#643

#644

#644

#645

#646

#646

#647

#647

#648

#648

Mono Color

• 953b691cc2 Switch magic flexy rigboard layout to use *container* width queries rather than *screen* width queries FreneticScribbler 2024-04-06 19:14:23 +01:00
• 17fa447861 Reimplement .dl-horizontal, dropped in Bootstrap 3 and apparently still used in our templates in some places FreneticScribbler 2024-04-06 18:13:32 +01:00
• 409125c8a3 PSSC Values (Three Phase) (#576) bobbinz 2024-03-26 19:25:29 +00:00
• 7835d38f9d Update ec_power_info.html PSSC-Values bobbinz 2024-03-26 18:17:45 +00:00
• 83f5990050 Update ec_power_info.html bobbinz 2024-03-26 18:13:03 +00:00
• 03d996eb66 Build(deps-dev): Bump follow-redirects from 1.15.4 to 1.15.6 (#574) dependabot[bot] 2024-03-25 20:19:20 +00:00
• 1e40916a94 Build(deps): Bump es5-ext from 0.10.62 to 0.10.64 (#572) dependabot[bot] 2024-03-03 17:14:37 +00:00
• eae3f762b7 Build(deps): Bump ip from 2.0.0 to 2.0.1 (#571) dependabot[bot] 2024-03-03 17:14:29 +00:00
• 7a387e8724 Build(deps): Bump axios and browser-sync (#570) dependabot[bot] 2024-03-03 17:14:20 +00:00
• 4f42219821 Build(deps-dev): Bump follow-redirects from 1.15.2 to 1.15.4 (#569) dependabot[bot] 2024-01-21 19:44:08 +00:00
• d7d2f93295 Fix typo in non-event display FreneticScribbler 2024-01-21 19:43:47 +00:00
• 3ec904e3d3 Fix typo in nonevent display subgrid FreneticScribbler 2024-01-21 19:39:15 +00:00
• 2a2ce742b0 Reimplement rigboard page in a fully responsive manner (#567) FreneticScribbler 2023-12-17 18:01:49 +00:00
• f8508ad876 Updates to all three layouts FreneticScribbler 2023-12-17 12:43:29 +00:00
• 8020dc63bf Update app.json FreneticScribbler 2023-10-22 20:49:26 +01:00
• 20fefaac36 Revive this concept for 2023 FreneticScribbler 2023-10-22 20:07:14 +01:00
• 68d3605230 Build(deps): Bump urllib3 from 1.26.17 to 1.26.18 (#566) dependabot[bot] 2023-10-21 16:59:35 +01:00
• 1fff150566 Fix ID10T error FreneticScribbler 2023-10-21 16:57:55 +01:00
• 240ff25c63 Don't automatically deactivate anyone that's never logged in FreneticScribbler 2023-10-21 16:28:29 +01:00
• e265ad58a6 Tweak awaiting approval count to better ignore inactive users FreneticScribbler 2023-10-11 21:10:08 +01:00
• 1a32ef424b Make calendar first day Monday, not Sunday FreneticScribbler 2023-10-10 20:16:39 +01:00
• 44c92fc859 Build(deps): Bump urllib3 from 1.26.16 to 1.26.17 (#563) dependabot[bot] 2023-10-06 23:04:13 +01:00
• 1af182eaa1 Build(deps): Bump postcss from 8.4.23 to 8.4.31 (#565) dependabot[bot] 2023-10-05 16:03:39 +01:00
• 425a697743 Build(deps): Bump pillow from 9.3.0 to 10.0.1 (#564) dependabot[bot] 2023-10-05 16:03:25 +01:00
• cbe651957d Create 'upcoming events list' with very limited data estates-compliance Arona Jones 2023-09-23 19:47:00 +00:00
• ef2826ab0a Added 'is on campus' field to venue Arona Jones 2023-09-23 18:54:29 +00:00
• b7011e368b Build(deps): Bump tornado from 6.3.2 to 6.3.3 (#561) dependabot[bot] 2023-09-23 19:04:36 +01:00
• 7d2f8d2dc8 Partial revert 769d983 which deleted more than it meant to Arona Jones 2023-09-23 18:54:09 +01:00
• 5a54092771 Update power_detail.html - fix copy paste error Arona Jones 2023-08-30 18:41:45 +00:00
• e8a8f2bf0d Build(deps): Bump semver from 5.7.1 to 5.7.2 (#557) dependabot[bot] 2023-08-01 10:15:23 +01:00
• 3984c17605 Build(deps): Bump certifi from 2023.5.7 to 2023.7.22 (#559) dependabot[bot] 2023-08-01 10:07:48 +01:00
• b2209eef4e Build(deps): Bump pygments from 2.7.4 to 2.15.0 (#558) dependabot[bot] 2023-08-01 10:07:37 +01:00
• e7c4f7f73d Move flaky test out of class so that it can properly xfail FreneticScribbler 2023-07-09 23:07:58 +01:00
• 769d983e3d Remove ability to delete level requirements from level detail FreneticScribbler 2023-07-09 22:37:36 +01:00
• 303005a32b Mark problematic test as expected to fail FreneticScribbler 2023-07-09 22:26:49 +01:00
• c722773586 Add explanations to payment methods, remove 'SU Core' method as now obsolete FreneticScribbler 2023-07-09 22:24:36 +01:00
• 0c2e677786 Build(deps): Bump tough-cookie and node-sass (#556) dependabot[bot] 2023-07-09 18:05:52 +01:00
• 9719581977 Build(deps): Bump django from 3.2.19 to 3.2.20 (#554) dependabot[bot] 2023-07-07 15:52:05 +01:00
• b838dde30b Clarify check-in banner (#553) James Herbert 2023-07-01 10:32:28 +01:00
• 387fa56442 Exclude non-rigs from the 'now' checkin list FreneticScribbler 2023-06-29 12:32:48 +01:00
• f35ce88acc Fix another copy paste error FreneticScribbler 2023-06-28 16:31:42 +01:00
• ee5468fdd7 Fix indenting, because apparently it had been sufficient time since I last pushed a pep8 mistake FreneticScribbler 2023-06-28 13:39:54 +01:00
• 1ce6ec3284 Re-do fix for #537 without regression FreneticScribbler 2023-06-28 13:39:10 +01:00
• 677f352524 Fix #549: 500 error when reviewing power tests FreneticScribbler 2023-06-28 13:06:03 +01:00
• 8b3102b136 Only consider new users when sending 'users for approval' email FreneticScribbler 2023-06-28 13:01:45 +01:00
• e2b1dc1d05 Tweak things to allow easier location of new users for approval FreneticScribbler 2023-06-28 13:01:29 +01:00
• c9ba228bd2 Filter inactive/unapproved users out of SecureAPI requests. Fixes #552 FreneticScribbler 2023-06-28 12:55:42 +01:00
• 9f4cd41d23 FIX #537: recent changes 500 server error FreneticScribbler 2023-06-28 12:38:31 +01:00
• 2049d0f76d Revert "Another stab at error-tolerant versioning" FreneticScribbler 2023-06-28 12:02:04 +01:00
• 29db3b5a0c Another stab at error-tolerant versioning FreneticScribbler 2023-06-28 11:53:15 +01:00
• 53b09e47b8 Open event thread drafts in new tab FreneticScribbler 2023-06-27 17:34:08 +01:00
• 097e7c2481 Another stab at resolving weird null error ref #537 FreneticScribbler 2023-06-27 17:32:00 +01:00
• 16874073e9 "Create forum post" button on a rig page (#551) Arona Jones 2023-06-27 13:00:51 +01:00
• d03a4e115f Correct URL on power test edit save (#550) Leo Riley 2023-06-22 18:36:23 +01:00
• e1b87b412a Temporarily remove power MIC defaulting to MIC in RAs Arona Jones 2023-06-05 20:50:00 +01:00
• 54b44404ba Fix various minor issues (#545) Arona Jones 2023-05-29 10:50:04 +00:00
• 26942b80dd Build(deps): Bump tornado from 6.3.1 to 6.3.2 (#544) dependabot[bot] 2023-05-28 17:31:56 +01:00
• 888300490c Build(deps): Bump socket.io-parser from 4.2.2 to 4.2.3 (#542) dependabot[bot] 2023-05-24 10:50:41 +01:00
• 9201f9d896 Update level_list.html Arona Jones 2023-05-24 10:32:22 +01:00
• 9fae129e26 Update level_list.html Arona Jones 2023-05-24 10:22:19 +01:00
• 8d45e260dd Build(deps): Bump requests from 2.25.1 to 2.31.0 (#541) dependabot[bot] 2023-05-23 21:36:41 +01:00
• 7d8dddb952 Update 0047_auto_20230517_0944.py Arona Jones 2023-05-19 12:56:39 +00:00
• 1104f10c91 Update 0047_auto_20230517_0944.py Arona Jones 2023-05-19 12:20:25 +00:00
• 3d5efba0af sigh Arona Jones 2023-05-19 11:49:14 +00:00
• 9a44aaf557 Update 0047_auto_20230517_0944.py Arona Jones 2023-05-19 11:37:16 +00:00
• 550eff83ee Update 0046_create_powertests.py Arona Jones 2023-05-19 11:25:18 +00:00
• bf3da5ae25 Update 0046_create_powertests.py Arona Jones 2023-05-19 11:13:17 +00:00
• 87aa87bc0f Update 0046_create_powertests.py Arona Jones 2023-05-19 10:47:50 +00:00
• 01a0b8f831 Add event checkin functionality, seperate power tests into a different form (#536) Arona Jones 2023-05-19 10:28:51 +00:00
• b151e1fcf3 Checkin only requires login (no perms) and block users from editing other checkins at Django level checkin FreneticScribbler 2023-05-18 13:34:32 +01:00
• 013922bd90 Add data migration for crew/vehicles FreneticScribbler 2023-05-18 13:10:09 +01:00
• f72b611e77 pep8 FreneticScribbler 2023-05-17 12:23:17 +01:00
• 8da90ba670 Implement codedoctor suggestions FreneticScribbler 2023-05-17 09:45:46 +01:00
• 0d1beeaead Minor fixes arona 2023-05-16 17:22:42 +01:00
• 51ff06fadd Add power record status chip, checklist status chip displays number of checklists arona 2023-05-16 16:01:27 +01:00
• 06137ab180 Register check in model with the admin site arona 2023-05-16 14:45:54 +01:00
• e7dd8f4cf9 Clicking check out does not redirect the user arona 2023-05-16 14:42:56 +01:00
• 2fb8b8c81b UI work arona 2023-05-15 13:40:15 +01:00
• dd02df4a17 Checkin button turns into checkout button where applicable FreneticScribbler 2023-05-15 01:31:56 +01:00
• 8cc40fe9fa Minor improvement to homepage UI FreneticScribbler 2023-05-15 01:28:50 +01:00
• 904ef1f180 Add homepage checkin for events happening now FreneticScribbler 2023-05-15 01:26:54 +01:00
• 417ec8ff3d Basic checkin/out logic complete FreneticScribbler 2023-05-15 01:12:04 +01:00
• 97dac51a52 Add ability to edit checkins, more validation FreneticScribbler 2023-05-15 00:36:57 +01:00
• fc8bb2dc4b Fix tests after form split FreneticScribbler 2023-05-14 22:22:55 +01:00
• 67d2f80815 Merge branch 'master' into checkin FreneticScribbler 2023-05-14 22:14:04 +01:00
• 724762a1e8 Rookie error...pep8ify! FreneticScribbler 2023-05-12 11:20:09 +01:00
• 6ea5dc9698 General dependency update FreneticScribbler 2023-05-12 10:30:30 +01:00
• eb45db8950 Combined PR (#532) github-actions[bot] 2023-05-12 08:09:38 +01:00
• dfaeb41080 Merge dependabot/npm_and_yarn/engine.io-and-socket.io-6.4.2 into combine-prs-branch1 combine-prs-branch1 github-actions[bot] 2023-05-12 07:03:36 +00:00
• 16671c6e1e Merge dependabot/pip/django-3.2.19 into combine-prs-branch1 github-actions[bot] 2023-05-12 07:03:36 +00:00
• 15a9a03200 Further work on checkin, add role field etc FreneticScribbler 2023-05-10 18:24:51 +01:00
• 0cd75cb313 Build(deps): Bump django from 3.2.18 to 3.2.19 dependabot[bot] 2023-05-09 22:20:19 +00:00
• 676cee164b Very initial version of checkin form arona 2023-05-09 21:37:25 +01:00
• cccb84e4dc Remove old 'vehicle/crew' stuff arona 2023-05-09 20:47:41 +01:00
• 742836486e Revamp H&S overview, remove individual lists. FreneticScribbler 2023-05-08 19:59:58 +01:00
• e774b06ac4 Split power related parts of event checklist into a seperate form FreneticScribbler 2023-05-08 19:46:35 +01:00
• b2c16cefad Build(deps): Bump engine.io and socket.io dependabot[bot] 2023-05-04 00:56:05 +00:00
• b1a2859f1b Do not export inactive training items FreneticScribbler 2023-03-03 11:15:06 +00:00
• dc71c2de62 "Passed out" -> "Competency assessed" FreneticScribbler 2023-03-03 11:12:49 +00:00
• a4f240e581 Minor fiddling subhire FreneticScribbler 2023-02-25 18:47:11 +00:00