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/multi-c22e25d29b

dependabot/pip/zipp-3.19.1

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

#625

#626

#627

#628

#628

#629

#630

#633

#633

Mono Color

• 0b2fc6d57c Added cable functionality to audit form FreneticScribbler 2020-02-16 02:34:33 +00:00
• 1ec277978e Filter asset audit list by never-audited FreneticScribbler 2020-02-15 12:54:31 +00:00
• e656b90a22 Improve audit search bar FreneticScribbler 2020-02-15 12:54:12 +00:00
• 3a7dc061bb Use a tooltip to help explain the UX FreneticScribbler 2020-02-15 12:33:18 +00:00
• 7c42ad853c WIP: Javascript shenanigans for asset audit search FreneticScribbler 2020-02-14 15:13:47 +00:00
• d5f54b1d88 Merge branch 'master' into search Arona Jones 2020-02-14 13:23:22 +00:00
• e7fcaa36bb WIP: Audit modal works FreneticScribbler 2020-02-14 11:45:42 +00:00
• b9e6747918 [requires.io] dependency update requires.io 2020-02-12 20:51:35 +00:00
• e9a9250027 WIP: Basic work on audit FreneticScribbler 2020-02-09 00:04:54 +00:00
• c3934e09bd Server starts... FreneticScribbler 2020-02-08 14:07:33 +00:00
• fc938c897c [requires.io] dependency update requires.io 2020-02-08 13:52:14 +00:00
• ae151ed45e Add assets test suite (#400) Arona Jones 2020-02-08 13:52:07 +00:00
• 3e114484fe Merge branch 'master' into assets-testing assets-testing Arona Jones 2020-02-08 13:12:27 +00:00
• 116c497590 Bump pillow from 5.1.0 to 6.2.0 (#371) dependabot[bot] 2020-02-08 13:09:09 +00:00
• f6f3149036 Merge pull request #397 from nottinghamtec/imgbot Arona Jones 2020-02-08 13:00:00 +00:00
• ea696deb1e Merge branch master into assets-testing FreneticScribbler 2020-02-07 22:18:21 +00:00
• b8a4a70133 Fix broken search test FreneticScribbler 2020-02-07 21:57:32 +00:00
• 3028c053d4 Test visibility of form errors FreneticScribbler 2020-02-07 21:53:15 +00:00
• 3e16075b34 404 tests and test that everything requires authentication FreneticScribbler 2020-02-07 21:36:08 +00:00
• 762af5a1eb Asset search tests FreneticScribbler 2020-02-07 20:43:29 +00:00
• d312634f68 Asset duplicate tests FreneticScribbler 2020-02-07 19:56:56 +00:00
• ca553137b6 Add supplier create/edit tests FreneticScribbler 2020-02-07 18:50:12 +00:00
• 1c577cdbee Helps if I add the migration... FreneticScribbler 2020-02-07 17:37:21 +00:00
• eaeb56f9f9 Add supplier list page + tests FreneticScribbler 2020-02-07 17:35:16 +00:00
• b8d9d24e2c Add delete sample data test for completeness FreneticScribbler 2020-02-07 00:17:28 +00:00
• 731f9865c6 Delete unused code FreneticScribbler 2020-02-06 23:59:49 +00:00
• be9d4115d0 Add access level tests FreneticScribbler 2020-02-06 23:18:08 +00:00
• c6c8501640 Asset edit tests are here FreneticScribbler 2020-02-06 22:14:50 +00:00
• 2641e80832 Basic asset create validation testing FreneticScribbler 2020-02-06 18:15:31 +00:00
• 7c30522906 Add cable asset creation test FreneticScribbler 2020-02-06 13:29:42 +00:00
• b93bb29777 CHORE: Frickin pep8... FreneticScribbler 2020-02-05 20:32:21 +00:00
• bf6d22bc38 Add non-cable asset creation test FreneticScribbler 2020-02-05 20:28:51 +00:00
• 5265ef835e Added Asset Create and Edit forms Matthew Smith 2020-02-05 15:35:07 +00:00
• 39b22690f1 CHORE: pep8... FreneticScribbler 2020-02-05 13:33:14 +00:00
• 2a99e0912b FEAT: Adapt unit tests from RIGS to assets FreneticScribbler 2020-02-05 13:21:19 +00:00
• 3d00b935fc FEAT: Basic testing of search FreneticScribbler 2020-02-04 18:02:44 +00:00
• a3e0f3ed03 FIX: Stop 404 on failed search, again FreneticScribbler 2020-02-04 17:07:47 +00:00
• 724d09734b Revert "FEAT: Add omnisearch to header" FreneticScribbler 2020-02-04 17:01:22 +00:00
• 459a9b5b05 FIX: Select the event form, not the search one in tests! FreneticScribbler 2020-02-04 16:50:36 +00:00
• 9889889f9a CHORE: Conform old code to pep8 FreneticScribbler 2020-02-04 16:32:32 +00:00
• 6bcb242d6b FEAT: Add omnisearch to header FreneticScribbler 2020-02-04 15:48:30 +00:00
• 94184a33c4 FIX: Missing date field breaking archive view FreneticScribbler 2020-02-04 15:24:03 +00:00
• 196d3d3e1d FIX: Minor code improvements FreneticScribbler 2020-01-26 17:39:38 +00:00
• 18f771d508 FIX: Use a setting for cooldown FreneticScribbler 2020-01-26 15:35:04 +00:00
• 3157741860 CHORE: Squash migrations FreneticScribbler 2020-01-26 15:34:44 +00:00
• a920b207c1 Merged branch master into search FreneticScribbler 2020-01-26 14:08:55 +00:00
• 7aad1b2983 FIX: Wrong perms syntax for history pages FreneticScribbler 2020-01-26 13:51:03 +00:00
• 8ad2a899f9 FIX: Remove event modal history deadlink for basic users FreneticScribbler 2020-01-26 13:47:02 +00:00
• f19286efb0 FEAT: Add a fifteen min cooldown between emails to admins FreneticScribbler 2020-01-25 00:56:16 +00:00
• c049874e5f FIX: Whoops, undo accidental whitespace change FreneticScribbler 2020-01-24 00:58:04 +00:00
• 806b8a3f00 FEAT: Add admin email notif when an account is activated and awaiting approval FreneticScribbler 2020-01-24 00:56:44 +00:00
• a25c41150e Started POM and assets test Matthew Smith 2020-01-23 18:29:18 +00:00
• 0da392563c FIX: Remove mitigation for #264 FreneticScribbler 2020-01-23 16:44:45 +00:00
• 4dd89c0b73 FIX: Re-prevent basic seeing reversion FreneticScribbler 2020-01-23 16:29:10 +00:00
• 20a6cca9d3 FIX: Use has_oembed decorator for events FreneticScribbler 2020-01-23 16:20:46 +00:00
• b74dfac33d Merge remote-tracking branch 'origin/master' into open FreneticScribbler 2020-01-23 16:11:11 +00:00
• 8ca55f2696 Added migration for name change feature/invoiceHistory Matthew Smith 2020-01-22 03:06:29 +00:00
• 228592a0f3 Creating an invoice now appears in its history. Rudimentary tracking of payments is also implemented Matthew Smith 2020-01-22 02:24:58 +00:00
• 81e7bf6d46 [ImgBot] Optimize images ImgBotApp 2020-01-21 16:46:49 +00:00
• 79f97bb05f Merge pull request #395 from nottinghamtec/misc Arona Jones 2020-01-21 16:40:00 +00:00
• 6ba87b0a5a CHANGE: Restructure the asset embed a bit FreneticScribbler 2020-01-21 01:06:46 +00:00
• 1e03b5107e FIX: Rig Creation Test breaking on CI FreneticScribbler 2020-01-18 16:55:23 +00:00
• 39dbdd7ce4 FIX: Prevent long text breaking out of desc/notes FreneticScribbler 2020-01-17 17:32:16 +00:00
• 1a953073be Merge branch 'master' into misc Arona Jones 2020-01-17 15:36:24 +00:00
• 630011aff7 FEAT: Add oembed for assets (#393) Arona Jones 2020-01-17 15:28:29 +00:00
• aaaa9fc742 Merge branch 'master' into assets_embed assets_embed Arona Jones 2020-01-17 15:12:13 +00:00
• e0c6a56263 Disable password reset as temporary fix to vulnerability (#396) Matthew Smith 2020-01-17 13:13:16 +00:00
• 1e00b23479 fix pep8 hotfix-disable-password-reset Matthew Smith 2020-01-17 12:38:02 +00:00
• b5e61adde5 Disabled password reset and left message notifying user of problem. In response to CVE-2019-19844 Matthew Smith 2020-01-17 12:29:15 +00:00
• 87d460c799 FIX: Prevent long text breaking out of changelog popover FreneticScribbler 2020-01-14 19:37:47 +00:00
• 295397b32d CHANGE: Prevent both person and org being left blank for a Rig FreneticScribbler 2020-01-14 18:10:37 +00:00
• 10add5ab33 CHANGE: New SU Branding FreneticScribbler 2020-01-14 14:59:48 +00:00
• 7e3e8f37e2 FIX: Do not display auth warnings when duplicating events FreneticScribbler 2020-01-13 22:13:37 +00:00
• 3a25b85e95 FEAT: Add conditional formatting to whole auth panel FreneticScribbler 2020-01-13 21:05:09 +00:00
• 16b950c3b2 FIX: Make 'authorised at' datetime formatting match all the others FreneticScribbler 2020-01-13 20:57:55 +00:00
• f616017423 CHANGE: Remove phone number field from initial registration FreneticScribbler 2020-01-13 20:36:50 +00:00
• 1480ae17fa CHORE: Update README.md. It was about time. FreneticScribbler 2020-01-13 20:24:16 +00:00
• 6aba0478f0 Merge branch 'master' into assets_embed Arona Jones 2020-01-11 21:24:09 +00:00
• 4ad12ab40a FIX: Prevent basic users seeing individual asset version history FreneticScribbler 2020-01-11 21:09:15 +00:00
• 13205770f1 FIX: Correct template for AssetVersionHistory FreneticScribbler 2020-01-11 21:00:40 +00:00
• dfb612367b Fix embeds not actually working for unauthenticated users FreneticScribbler 2020-01-11 20:54:01 +00:00
• 0ee393725e FIX: Require login on events and event embeds again FreneticScribbler 2020-01-11 20:24:37 +00:00
• ea12bfa607 Prevent unapproved users logging in through embeds FreneticScribbler 2020-01-11 19:25:50 +00:00
• 4d722fd5cb Superusers bypass approval check FreneticScribbler 2020-01-11 19:15:02 +00:00
• b7d1d86486 Add testing of approval mechanism FreneticScribbler 2020-01-11 18:46:23 +00:00
• 7458b56138 FIX: Legacy Profiles are now auto-approved correctly FreneticScribbler 2020-01-11 18:33:11 +00:00
• d06273c215 CHORE: Fix CI FreneticScribbler 2020-01-11 18:26:35 +00:00
• 479977ef58 CHANGE: New user signups now require admin approval FreneticScribbler 2020-01-11 18:18:08 +00:00
• 68af9c8779 Merge remote-tracking branch 'origin/master' into open FreneticScribbler 2020-01-10 14:40:47 +00:00
• 4fb0a0ffe7 FIX Copy paste error ;D FreneticScribbler 2020-01-08 20:53:27 +00:00
• 7361605ffa FEAT: Add oembed for assets FreneticScribbler 2020-01-08 20:13:58 +00:00
• 6bb0c88c72 FIX: Migrations Arona Jones 2020-01-03 22:21:50 +00:00
• 82a30ca77d Miscellaneous changes to the Asset DB (#390) Arona Jones 2020-01-03 21:46:39 +00:00
• 5696cf73ce Refactored away "assets" property on "Supplier" by using "related_name" instead assets_misc Matthew Smith 2020-01-03 21:33:23 +00:00
• 096ca24336 Fixed supplier not working on all the create asset template Matthew Smith 2020-01-03 21:09:45 +00:00
• c779c24d63 FIX: Squash migrations FreneticScribbler 2020-01-02 20:42:33 +00:00
• dad9797f74 FEAT: Statuses can have a CSS class defined in the admin panel FreneticScribbler 2020-01-02 19:43:16 +00:00
• 69facd5dc6 FIX: Order asset categories/statuses alphabetically FreneticScribbler 2020-01-02 19:34:02 +00:00
• 406a9dad36 FEAT #386: Asset search searches serial number. FreneticScribbler 2020-01-02 18:34:38 +00:00
• 81c32baa8e Potential fix for #380 FreneticScribbler 2019-12-31 20:01:16 +00:00