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

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

Mono Color

• 959097286c Stop the navbar from sticking to the top of screen FreneticScribbler 2020-03-18 15:13:17 +00:00
• 264b306b2f Add a skip link for keyboard users FreneticScribbler 2020-03-18 15:07:29 +00:00
• e42989637e Ditch custom loading in favour of BS4 inbuilt FreneticScribbler 2020-03-18 01:46:13 +00:00
• 12d8b46f86 First pass at reworked rigboard layout on mobile FreneticScribbler 2020-03-18 01:39:21 +00:00
• 89ddb09459 Port (most) RIGS urls to path() FreneticScribbler 2020-03-18 00:32:53 +00:00
• f4f8c6b417 Delete obsolete code FreneticScribbler 2020-03-18 00:30:23 +00:00
• 36556dea33 Add the usual set of fields to supplier and update form accordingly FreneticScribbler 2020-03-17 20:07:14 +00:00
• b9d318e675 Whitelist ins/del tags in activity popovers FreneticScribbler 2020-03-17 18:40:52 +00:00
• b8931a64c8 Remove unused dependencies FreneticScribbler 2020-03-16 23:25:45 +00:00
• cfe0a264e7 Pagination fixes FreneticScribbler 2020-03-16 23:23:37 +00:00
• 8fbe9f9026 Bring colours back to the rigboard FreneticScribbler 2020-03-16 23:12:21 +00:00
• fe0e4063d7 Work on event archive template FreneticScribbler 2020-03-16 22:47:38 +00:00
• 0bd4b281d1 Convert some urls to path FreneticScribbler 2020-03-16 22:47:26 +00:00
• 7de778a57e Work on event creation form FreneticScribbler 2020-03-16 22:35:48 +00:00
• 88b34740f6 Asset list/CRUD template updates FreneticScribbler 2020-03-16 21:45:04 +00:00
• e0e4e8d11e pycodestyle FreneticScribbler 2020-03-16 21:19:09 +00:00
• c1d277be9c Authorisation template work FreneticScribbler 2020-03-15 23:06:54 +00:00
• 4a71dd0d95 AssetList template update FreneticScribbler 2020-03-15 21:33:05 +00:00
• 2bfecb9c0f Improvements to generic list + use for supplier FreneticScribbler 2020-03-15 18:38:51 +00:00
• 3814f5abfc Generic list template FreneticScribbler 2020-03-15 18:24:38 +00:00
• 4c34e4e43e Reimpl custom css - Open Sans is back! FreneticScribbler 2020-03-15 17:14:12 +00:00
• 3f36f66b8a Fix up header search FreneticScribbler 2020-03-15 15:19:39 +00:00
• 7cef4d03c0 Contain the navbar FreneticScribbler 2020-03-15 13:48:30 +00:00
• 6970c5c490 Activity feed updates FreneticScribbler 2020-03-15 10:33:08 +00:00
• b8ea3d3d42 Dependency update FreneticScribbler 2020-03-15 10:10:33 +00:00
• 366a14408b More messing with the rigboard FreneticScribbler 2020-03-15 03:10:33 +00:00
• 270b1fc5bb Various template changes FreneticScribbler 2020-03-15 02:53:12 +00:00
• 7786512dc2 Inital work on adding development livereload FreneticScribbler 2020-03-13 13:08:09 +00:00
• 88ac1b93ae Re-enable calendar FreneticScribbler 2020-03-10 18:03:05 +00:00
• 4d845309c9 btn-default -> btn-secondary FreneticScribbler 2020-03-10 17:20:13 +00:00
• 3b8789e49e More refactoring of rigboard FreneticScribbler 2020-03-10 16:46:53 +00:00
• 1526a2f22b Start to move search bar into header FreneticScribbler 2020-03-10 14:33:50 +00:00
• fe71f7640f Migrate user urls to PyRIGS module FreneticScribbler 2020-03-10 14:08:47 +00:00
• b57716f7fc Port from glyphicons to Font Awesome FreneticScribbler 2020-03-09 23:18:56 +00:00
• 320c43e472 Initial refactor of rigboard template FreneticScribbler 2020-03-09 22:44:46 +00:00
• 1e5fcbdba0 Mostly reimplement rigboard navbar FreneticScribbler 2020-03-09 22:36:22 +00:00
• 1df1784d02 Move rigboard templates up a level FreneticScribbler 2020-03-09 21:44:09 +00:00
• 6c72f070f2 Begin moving to NPM/Gulp based build system FreneticScribbler 2020-03-07 23:00:39 +00:00
• 02d40d1b39 FIX: Patch for choices being none FreneticScribbler 2020-03-07 16:47:30 +00:00
• 8568c591a9 Update Python Dependencies (#404) Arona Jones 2020-03-07 16:21:48 +00:00
• e1b84f5182 FIX: Bloody smartquotes python_deps_2020 FreneticScribbler 2020-03-07 15:43:33 +00:00
• 7773bf96c8 Better fix for previous commit FreneticScribbler 2020-03-07 15:32:40 +00:00
• 739913a2c9 FIX: Re-add overridden login view FreneticScribbler 2020-03-07 15:25:58 +00:00
• eab031b3cb Fix for events with no access time misc FreneticScribbler 2020-03-07 15:16:58 +00:00
• 5c5ccd244d Merge branch 'master' into python_deps_2020 Arona Jones 2020-03-06 19:57:14 +00:00
• d274ea4606 FIX: Prevent setting access time after start time FreneticScribbler 2020-03-03 20:04:02 +00:00
• abf977b47e FIX: Allow null on nickname CharField FreneticScribbler 2020-03-03 19:40:07 +00:00
• 2bfde0510c Merge branch 'master' into assets_audit Arona Jones 2020-03-03 19:36:25 +00:00
• a1eb237f94 pep eiiiiiiight :-| FreneticScribbler 2020-03-02 17:59:10 +00:00
• 805f573b7d Add nickname field to assets FreneticScribbler 2020-03-02 17:53:39 +00:00
• 2b0aa3e673 Merge branch 'master' into misc FreneticScribbler 2020-03-02 17:38:59 +00:00
• 797ad778a9 Improve search logic and allow search of event archive (#248) David Taylor 2020-02-29 11:57:33 +00:00
• 4f088fb426 Merge branch 'master' into search search FreneticScribbler 2020-02-29 11:47:35 +00:00
• a05a5d5ccc Merge branch 'master' into assets_audit Arona Jones 2020-02-29 11:43:38 +00:00
• 9deb8ebb14 [requires.io] dependency update requires-io-master requires.io 2020-02-29 11:34:58 +00:00
• 4a4d4a5cf3 Add authorisation process for sign ups and allow access to EventDetail for basic users (#399) Arona Jones 2020-02-29 11:34:50 +00:00
• 3868cb39a2 Merge branch 'master' into open open Arona Jones 2020-02-29 11:29:05 +00:00
• 9cd90d0d52 Move cabletype menu links into 'Assets' dropdown Arona Jones 2020-02-27 10:39:25 +00:00
• a707fe847e FIX: Update tests to match new UX Arona Jones 2020-02-27 10:06:50 +00:00
• 24284f9d55 FIX?: What about this way... Arona Jones 2020-02-27 09:55:27 +00:00
• 1f663c8919 FIX?: Up WebDriverWait timeout for modal tests Arona Jones 2020-02-27 09:28:57 +00:00
• aa4977edb5 Potentially make modal tests more consistent FreneticScribbler 2020-02-25 16:37:05 +00:00
• 742e90fa13 Remember to test the tests Arona FreneticScribbler 2020-02-24 17:40:00 +00:00
• 94412da545 Improve asset audit testing FreneticScribbler 2020-02-24 17:36:04 +00:00
• db7440e9da Some deduplication for testing code FreneticScribbler 2020-02-23 23:39:11 +00:00
• da0c9ba87b Start tests for audit FreneticScribbler 2020-02-23 23:31:12 +00:00
• b7dcb2ccc5 Whoops, helps if one installs pycodestyle... FreneticScribbler 2020-02-21 12:26:23 +00:00
• 16b10333d5 Bit too heavy handed with the dep purge there... FreneticScribbler 2020-02-21 12:22:57 +00:00
• cf7934974e Swap to pycodestyle rather than pep8 in Travis FreneticScribbler 2020-02-21 12:20:44 +00:00
• 3cf13299eb Add newlines to the paperwork print test event FreneticScribbler 2020-02-21 12:08:06 +00:00
• 6a65d14e5e Refactor dependency file FreneticScribbler 2020-02-21 11:48:45 +00:00
• b497ec11a0 FIX: Fix some Django4 deprecation warnings FreneticScribbler 2020-02-21 02:09:04 +00:00
• 79ec9214f9 FIX: Fix broken newlining in PDFs FreneticScribbler 2020-02-21 01:56:16 +00:00
• 2be88c8927 Revert "Disable password reset as temporary fix to vulnerability (#396)" FreneticScribbler 2020-02-19 16:41:25 +00:00
• e315c458de FIX: Remaining tests FreneticScribbler 2020-02-19 16:06:47 +00:00
• 1559f9098d FIX: Fix supplier sort FreneticScribbler 2020-02-19 14:46:39 +00:00
• 1dacbc1444 FIX: Correct static use in templates FreneticScribbler 2020-02-19 14:31:42 +00:00
• 8c981cc366 FIX: Update auth framework FreneticScribbler 2020-02-19 14:23:28 +00:00
• a8261e0e7e FIX: Broken migrations FreneticScribbler 2020-02-19 13:48:10 +00:00
• 0d9acc413b FIX: Set duplicated event status to provisional FreneticScribbler 2020-02-19 13:39:48 +00:00
• 09d1b42728 FIX: Meta migrations... :> FreneticScribbler 2020-02-18 18:40:27 +00:00
• e7324e2d10 FIX: pep8/remove debug print FreneticScribbler 2020-02-18 18:37:54 +00:00
• d1ccb561f5 FIX: Prevent creating duplicate cable types FreneticScribbler 2020-02-18 18:35:39 +00:00
• c60771e613 CRUD and ordering FreneticScribbler 2020-02-18 18:00:03 +00:00
• 386fec1f01 Move relevant fields and create migration to autogen cable types FreneticScribbler 2020-02-18 17:00:46 +00:00
• e5a1830b00 FIX: Migrations FreneticScribbler 2020-02-18 16:04:03 +00:00
• da48a75073 FIX: Hide asset detail buttons for basic users FreneticScribbler 2020-02-18 16:00:33 +00:00
• 6dffaa4f21 Update README.md Arona Jones 2020-02-18 12:17:23 +00:00
• b9434dc576 FIX: Stop quickbuttons being tab-selected FreneticScribbler 2020-02-17 21:27:26 +00:00
• 75660644eb FEAT: More handy buttons FreneticScribbler 2020-02-17 21:25:25 +00:00
• 6e15f12fbf FIX: Fix asset sample data command when run alone FreneticScribbler 2020-02-17 16:29:25 +00:00
• e8c44a6346 [requires.io] dependency update requires.io 2020-02-17 15:21:44 +00:00
• 68891dccd2 FEAT: Add buttons for some common defaults on audit form FreneticScribbler 2020-02-17 13:10:51 +00:00
• 759faf30f1 FIX: Gracefully handle 404s in audit search FreneticScribbler 2020-02-17 13:00:35 +00:00
• 1ba765a884 [requires.io] dependency update requires.io 2020-02-17 08:32:20 +00:00
• 0c12a3efdb Improve sample data generator FreneticScribbler 2020-02-16 18:46:12 +00:00
• 20d9a71a9e FIX: Remove assets from to-be-audited table when audited FreneticScribbler 2020-02-16 15:49:53 +00:00
• 54ec38f7e1 Various UX Improvements FreneticScribbler 2020-02-16 15:37:09 +00:00
• ed5339925e FIX: Revert partialising of asset search FreneticScribbler 2020-02-16 02:41:36 +00:00
• 0b2fc6d57c Added cable functionality to audit form FreneticScribbler 2020-02-16 02:34:33 +00:00