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

• 2e4b84c94e Merge branch 'master' into subhire FreneticScribbler 2023-02-25 18:19:08 +00:00
• 8863d86ed0 Add description field to TrainingItems (#523) Arona Jones 2023-02-22 21:07:43 +00:00
• 6550ed2318 Build(deps): Bump django from 3.2.17 to 3.2.18 (#522) dependabot[bot] 2023-02-16 11:10:11 +00:00
• c9759a6339 Build(deps): Bump qs and browser-sync (#521) dependabot[bot] 2023-02-09 14:56:22 +00:00
• b637c4e452 Build(deps): Bump http-cache-semantics from 4.1.0 to 4.1.1 (#520) dependabot[bot] 2023-02-04 10:20:18 +00:00
• 8986b94b07 Build(deps): Bump django from 3.2.16 to 3.2.17 (#519) dependabot[bot] 2023-02-04 10:20:04 +00:00
• 87f2de46a1 Add subhire handling to ical feed Arona Jones 2022-12-30 12:32:39 +00:00
• 1615e27767 Rework of subhire list Arona Jones 2022-12-19 17:33:01 +00:00
• 773f55ac84 Break up RIGS models into seperate files Arona Jones 2022-12-19 16:26:25 +00:00
• 63a2f6d47b Add URLField for linking to uploaded quotes Arona Jones 2022-12-16 14:48:54 +00:00
• 8393e85b74 Add appropriate permissions for subhire Arona Jones 2022-12-16 14:25:55 +00:00
• 311c02d554 Fix associated events being discarded on subhire edit Arona Jones 2022-12-16 14:14:43 +00:00
• e100f5a1d4 Initial work on productions dashboard Arona Jones 2022-12-16 14:06:06 +00:00
• eb07990f4c More template work Arona Jones 2022-12-16 13:33:18 +00:00
• 7b7c1b86de Update for use with github codespaces Arona Jones 2022-12-16 12:35:52 +00:00
• 2b8945c513 Update subhire detail template Arona Jones 2022-12-16 12:35:08 +00:00
• eb3638b93a Merge remote-tracking branch 'origin/master' into subhire Arona Jones 2022-12-16 12:05:41 +00:00
• 86c033ba97 Update django.yml Arona Jones 2022-12-11 14:18:05 +00:00
• 52fd662340 Update django.yml Arona Jones 2022-12-11 14:13:47 +00:00
• 9818ed995f Update django.yml Arona Jones 2022-12-11 14:13:33 +00:00
• 5178614d71 Update django.yml Arona Jones 2022-12-11 01:01:01 +00:00
• 1660f51e55 Merge branch 'master' into subhire FreneticScribbler 2022-12-11 00:53:27 +00:00
• a7bf990666 FIX: Do not specify minor version of python in CI Arona Jones 2022-12-11 00:51:19 +00:00
• 9feea56211 Draft "upcoming subhire" view FreneticScribbler 2022-12-11 00:49:56 +00:00
• 951227e68b Make calendar work reasonably on mobile FreneticScribbler 2022-12-11 00:44:14 +00:00
• a4a28a6130 Add nickname field to assets FreneticScribbler 2022-12-11 00:29:30 +00:00
• e3d8cf8978 Dependency update FreneticScribbler 2022-12-11 00:19:32 +00:00
• 6e8779c81b Revamped calendar basically there FreneticScribbler 2022-12-06 15:30:35 +00:00
• e0da6a3120 Remove rogue print statement from JS FreneticScribbler 2022-12-06 15:03:57 +00:00
• 0c80ef1b72 More calendar work FreneticScribbler 2022-12-06 15:03:27 +00:00
• 0f127d8ca4 Entirely new concept FreneticScribbler 2022-12-06 13:20:07 +00:00
• 626779ef25 Turn off RA reminders for non-rigs FreneticScribbler 2022-12-05 21:30:24 +00:00
• fa1dc31639 FIX: Only require login for viewing RAs/ECs Arona Jones 2022-11-26 12:58:15 +00:00
• d69543e309 FIX: Only require login to view training profiles Arona Jones 2022-11-26 12:54:42 +00:00
• 04ec728972 Reimplemented calendar mostly working FreneticScribbler 2022-11-21 22:40:33 +00:00
• a24e6d4495 Build(deps): Bump pillow from 9.0.1 to 9.3.0 (#516) dependabot[bot] 2022-11-22 17:33:42 +00:00
• fa5792914a Build(deps): Bump engine.io from 6.2.0 to 6.2.1 (#515) dependabot[bot] 2022-11-22 17:33:14 +00:00
• bede8b4176 Merge branch 'master' into subhire FreneticScribbler 2022-11-21 11:39:25 +00:00
• 0117091f3e FEAT #513: Implement email reminders to complete risk assessments (#514) Arona Jones 2022-11-19 15:34:15 +00:00
• 8cade512d1 Initial work at reimplementing the calendar in python FreneticScribbler 2022-11-18 16:16:06 +00:00
• 418219940b Add subhire link to new event page FreneticScribbler 2022-11-18 14:58:59 +00:00
• 37101d3340 Update lockfile FreneticScribbler 2022-11-18 14:29:44 +00:00
• de4bed92a4 Build(deps): Generally update JS & Python deps (#512) Arona Jones 2022-11-17 12:06:21 +00:00
• 3767923175 Build(deps): Bump yargs-parser and yargs (#507) dependabot[bot] 2022-11-15 15:52:49 +00:00
• 1d77cf95d3 Build(deps): Bump scss-tokenizer and node-sass (#506) dependabot[bot] 2022-11-15 15:44:25 +00:00
• 1f21d0b265 Build(deps): Bump engine.io and browser-sync (#508) dependabot[bot] 2022-11-15 15:33:50 +00:00
• 9b16cf6333 Merge dependabot/npm_and_yarn/engine.io-and-browser-sync-6.2.0 into combine-prs-branch combine-prs-branch github-actions[bot] 2022-11-14 18:21:26 +00:00
• 7846a6d31e Rename combine-prs to combine-prs.yml Arona Jones 2022-11-14 18:20:57 +00:00
• d28b73a0b8 Create combine-prs Arona Jones 2022-11-14 16:30:55 +00:00
• 7798f5c368 Build(deps): Bump engine.io and browser-sync dependabot[bot] 2022-11-14 15:14:28 +00:00
• 5c2e8b391c Build(deps): Bump moment from 2.29.2 to 2.29.4 (#505) dependabot[bot] 2022-11-14 15:08:05 +00:00
• 548bc1df81 Build(deps): Bump socket.io-parser from 3.3.2 to 3.3.3 (#503) dependabot[bot] 2022-11-13 16:17:08 +00:00
• c1d2bce8fb Build(deps): Bump minimatch from 3.0.4 to 3.0.8 (#504) dependabot[bot] 2022-11-13 16:16:51 +00:00
• c71beab278 Change: Only supervisors have edit access to the training database FreneticScribbler 2022-10-24 16:23:18 +01:00
• 259932a548 FIX #502: Possibility to choose 'no selection' in session log form FreneticScribbler 2022-10-23 10:52:55 +01:00
• 7526485837 FEAT: Add periodic cleanup command FreneticScribbler 2022-10-21 00:04:53 +01:00
• 948a41f43a Initial work on associating events with subhires Arona Jones 2022-10-20 12:56:42 +01:00
• 4449efcced Add subhire detail view FreneticScribbler 2022-10-20 00:00:57 +01:00
• 39ed5aefb4 Set printed PDF title == filename Arona Jones 2022-10-18 12:48:13 +01:00
• 8b0cd13159 Initially create subhire model and form FreneticScribbler 2022-10-15 19:09:51 +01:00
• e7e760de2e Fix copy to clipboard buttons on authorisation request form FreneticScribbler 2022-10-15 17:58:07 +01:00
• 9091197639 Minor audit fix Arona Jones 2022-06-02 15:28:19 +01:00
• 4f4baa62c1 Fix tests FreneticScribbler 2022-05-30 22:33:55 +01:00
• b9f8621e1a Migrations fix FreneticScribbler 2022-05-26 16:23:51 +01:00
• 4b1dc37a7f Rename 'salvage value' to 'replacement cost' FreneticScribbler 2022-05-26 10:29:53 +01:00
• 16d845ad3a Initial noodling data-ingest Arona Jones 2022-05-20 17:43:46 +01:00
• 9273ca35cf Build(deps): Bump django from 3.2.12 to 3.2.13 (#493) dependabot[bot] 2022-05-16 18:35:20 +01:00
• 4a4b7fa30d Build(deps): Bump pypdf2 from 1.26.0 to 1.27.5 (#492) dependabot[bot] 2022-05-16 18:14:04 +01:00
• a44a532c7d Create manual deployment Github Action Arona Jones 2022-05-16 16:54:47 +01:00
• 3a2e5c943b Fix typo II Arona Jones 2022-05-16 16:19:26 +01:00
• 426a9088cc Fix typo Arona Jones 2022-05-03 16:33:30 +01:00
• 1369a2f978 Build(deps): Bump moment from 2.29.1 to 2.29.2 (#491) dependabot[bot] 2022-04-13 09:43:32 +01:00
• 38eafbced3 Only require item prerequisites on competency assessed FreneticScribbler 2022-03-07 16:43:00 +00:00
• 900002bf71 Modalise training item qualification edit FreneticScribbler 2022-03-06 18:30:03 +00:00
• 2869c9fcc3 FIX(T): 500 error editing training item qualifications FreneticScribbler 2022-03-06 17:30:11 +00:00
• 00eb4e0e27 FEAT(T): Add ability to view users passed out in a certain training item FreneticScribbler 2022-03-03 19:30:31 +00:00
• 23e17b0e34 FIX(T): Training level requirement changes spamming recent changes FreneticScribbler 2022-03-03 19:14:20 +00:00
• bf268a4566 Minor branding tweak FreneticScribbler 2022-03-03 19:10:05 +00:00
• dedb8d81fe FEAT(T): Add ability to log items at various depths during a session FreneticScribbler 2022-03-01 18:36:17 +00:00
• 7d785f4f1b Hotfix: Unable to add training item in requirements form FreneticScribbler 2022-02-27 22:16:39 +00:00
• 5eb113156b FEAT(T): First version of the 'session log' form FreneticScribbler 2022-02-27 21:20:34 +00:00
• ab03ad081a Markdownify event description in tables FreneticScribbler 2022-02-24 20:20:57 +00:00
• cd5889f60e Wrong place... Arona Jones 2022-02-24 14:52:52 +00:00
• f18bf3b077 Add total asset number to list page Arona Jones 2022-02-24 14:52:19 +00:00
• 3d36d986a4 Add basic validation of item prerequisites FreneticScribbler 2022-02-23 16:01:00 +00:00
• 41f5a23ef0 Redesign label sheet to have variable (csa based) label size FreneticScribbler 2022-02-22 23:21:07 +00:00
• 09f48f740d Redesign cable label to increase asset number readability FreneticScribbler 2022-02-22 20:54:38 +00:00
• 805d77af20 Move access/meet times to above start/end in event list FreneticScribbler 2022-02-22 15:00:39 +00:00
• fabab87e23 Add moved templates to git FreneticScribbler 2022-02-16 15:21:57 +00:00
• a95779e04e FEAT: Add ability to generate RA printouts FreneticScribbler 2022-02-16 15:01:38 +00:00
• 24e6ba540d Embolden item headers on paperwork FreneticScribbler 2022-02-16 13:14:53 +00:00
• 14d3522b81 Do not require supervisor consultation for big power FreneticScribbler 2022-02-16 13:14:25 +00:00
• e4cfaba57d Markdown enable generic note fields FreneticScribbler 2022-02-15 12:13:50 +00:00
• d9664422c5 Fix asset sample data command FreneticScribbler 2022-02-15 02:40:20 +00:00
• 27bb3f1d8e Port/fix asset tests FreneticScribbler 2022-02-15 02:28:19 +00:00
• 151ac8b3bd Add fallback initial asset id FreneticScribbler 2022-02-15 01:58:40 +00:00
• c2dcd86d5d Calendar changes FreneticScribbler 2022-02-15 01:00:47 +00:00
• 6c14b30c13 Disable auth request button for authorised events FreneticScribbler 2022-02-15 00:29:29 +00:00
• 5215af349a Tweak asset ID autogeneration FreneticScribbler 2022-02-15 00:16:33 +00:00
• a5e888fef5 Make salvage value a required field on asset FreneticScribbler 2022-02-14 23:45:06 +00:00