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

• eef0682e4f FIX: Tweak supplier list to make detail view accessible FreneticScribbler 2019-12-31 19:20:51 +00:00
• 2465390889 FEAT: Add associated assets to supplier detail view FreneticScribbler 2019-12-31 19:17:58 +00:00
• fc9ce9f01c FIX #388: Prevent assets losing supplier data on edit FreneticScribbler 2019-12-31 18:50:04 +00:00
• 97c0dffbd3 Order revisions by date created (#389) David Taylor 2019-12-31 16:42:56 +00:00
• 3b28eafc82 Order RIGSVersions by date David Taylor 2019-12-31 16:33:43 +00:00
• ca8253894a FIX #321: Authorisation time shown as 'None' in emails (#378) Arona Jones 2019-12-31 12:45:38 +00:00
• 081a9eadfe Merge branch 'master' into auth_fixes auth_fixes Arona Jones 2019-12-31 12:34:08 +00:00
• 01a87e0e0b FEAT: Add revision history to assets and suppliers (#387) Arona Jones 2019-12-31 12:25:42 +00:00
• 5c3c84fd07 CHORE: pep8 assets_reversion Arona Jones 2019-12-31 12:08:50 +00:00
• 5054858585 Refactored out duplicated code from `AssetVersionHistory Matthew Smith 2019-12-29 22:36:32 +00:00
• d3ba770400 CHORE: *sings* And a pep8 in a broken tree... FreneticScribbler 2019-12-26 14:20:18 +00:00
• 2ca6786745 FEAT: Make revision history for suppliers accessible FreneticScribbler 2019-12-26 14:12:55 +00:00
• 08600daf7c FIX: Individual asset version history is now correctly filtered FreneticScribbler 2019-12-26 14:05:17 +00:00
• 9953ac0dc1 FIX: Asset history table 'branding' FreneticScribbler 2019-12-18 13:16:54 +00:00
• f803dbb028 CHORE: Fix pep8 FreneticScribbler 2019-12-17 20:44:49 +00:00
• d50a2e8423 FEAT: Initial implementation of asset activity stream FreneticScribbler 2019-12-17 19:30:01 +00:00
• 206b54dab0 FEAT: Initial work on revision history for assets FreneticScribbler 2019-12-13 20:19:17 +00:00
• 7c876348d7 Asset fixes (#383) Matthew Smith 2019-12-10 22:50:28 +00:00
• 1b3dca04a2 Remove broken migration asset_fixes David Taylor 2019-12-10 22:44:49 +00:00
• 3731c5bba0 Merge branch 'master' into asset_fixes David Taylor 2019-12-10 22:42:14 +00:00
• 61a46fa1c2 Removed bad migrator, made data addition atomic in migration 0008 Matthew Smith 2019-12-06 21:28:41 +00:00
• ddc23ce4e5 FIX: Prefix field still too limited for legacy data FreneticScribbler 2019-12-06 00:58:35 +00:00
• 602ccc15ea FIX: Fix missing import FreneticScribbler 2019-12-06 00:40:56 +00:00
• b77615b9b9 Fix handling of prefixed Asset IDs and sorting of the asset list (#382) Matthew Smith 2019-12-06 00:28:54 +00:00
• dea628e7a2 Merge branch 'master' into asset_fixes Arona Jones 2019-12-06 00:25:08 +00:00
• 171d5d633e CMULTI is a thing, and therefore a max prefix length of 5 cannot be a thing Matthew Smith 2019-12-05 20:43:47 +00:00
• 294c839bc3 Ensured hidden asset fields are completed on every database write Matthew Smith 2019-12-05 20:00:34 +00:00
• 228d72b7b2 Automatically run migrations on deploy David Taylor 2019-12-05 17:26:02 +00:00
• 73e8bc3326 Fixed missed migration Matthew Smith 2019-12-05 17:01:37 +00:00
• 5a081a97c4 Fixed pep8 Matthew Smith 2019-12-05 16:50:23 +00:00
• 1f0dc9f1ae Changed generateSampleAssetsData.py to include prefices on some cables. Matthew Smith 2019-12-05 15:28:07 +00:00
• 8ad0bdf5f3 Moved across assets_id sorting to use proper numeric values. Also mofifies SQL command to find free asset IDs so that it works on postgres. Matthew Smith 2019-12-05 15:02:48 +00:00
• faa86dbe8d FIX: Remove misleading admin site title FreneticScribbler 2019-12-05 13:26:35 +00:00
• 62541194ee CHORE: Fix pep8 FreneticScribbler 2019-12-05 13:10:08 +00:00
• 0d8fd99d92 FIX: Permission errors FreneticScribbler 2019-12-05 13:00:47 +00:00
• 9d51a82f31 FIX: Fix asset sample data generation FreneticScribbler 2019-12-05 12:56:22 +00:00
• c059227d5d Revert "CHANGE: Restrict viewing asset DB to keyholders." FreneticScribbler 2019-12-05 12:42:05 +00:00
• 2c334196d5 CHANGE: Restrict viewing asset DB to keyholders. FreneticScribbler 2019-12-04 23:59:39 +00:00
• 4f036af85a Create the Asset Database (#363) Arona Jones 2019-12-04 23:14:27 +00:00
• cd73b6cafe Fixed #370 , asset categories that are default selected are now shown assets Matthew Smith 2019-12-04 23:02:28 +00:00
• 68e977d749 CHANGE: Further tweak colouration FreneticScribbler 2019-12-04 21:28:03 +00:00
• 4bf399090b FIX: Update table row colouration for production statuses FreneticScribbler 2019-12-04 21:11:33 +00:00
• c249cf7c60 CHORE: Fix RIGS Sample Data test FreneticScribbler 2019-12-04 20:47:26 +00:00
• da384fbae1 CHORE: Delete duplicate risk assessment migration FreneticScribbler 2019-12-04 20:39:00 +00:00
• 43b7d5178d Merge branch 'master' into assets FreneticScribbler 2019-12-04 20:25:51 +00:00
• e22b288984 CHORE: Fix pep8 FreneticScribbler 2019-12-04 20:25:18 +00:00
• 15acc02f74 Switched URL to use asset_id rather than the database ID Matthew Smith 2019-12-04 20:13:09 +00:00
• c4cad76653 Removed unused imports Matthew Smith 2019-12-04 19:18:43 +00:00
• bb44b0c88b Made changes following the review from David Taylor Matthew Smith 2019-12-04 19:07:21 +00:00
• 30b323cd7b CHANGE: First pass at opening up RIGS #233 FreneticScribbler 2019-11-27 21:14:02 +00:00
• 8e27dae895 FIX: Additionally fix datestamp on HTML client emails (#321) FreneticScribbler 2019-11-26 20:10:20 +00:00
• 22ef6b8e3a FIX #321: Authorisation Success emails dated 'None' FreneticScribbler 2019-11-26 18:18:49 +00:00
• 5210afc772 Combine client authorisation information in rig detail (#373) Arona Jones 2019-11-26 17:26:32 +00:00
• d335ab3a80 Fixed asset picker backend Matthew Smith 2019-11-25 13:40:16 +00:00
• 127b22fe71 Attempt at fancy supplier search FreneticScribbler 2019-11-24 14:36:53 +00:00
• 22f0041eaf Add ability to search supplier list. Partial #374 FreneticScribbler 2019-11-24 14:13:47 +00:00
• 0a724e645f Improved colouring of list items so that Lost & Binned are actually visible to the human eye Matthew Smith 2019-10-31 19:35:41 +00:00
• d7e5e61b49 Fixed outdated link to old duplicate Matthew Smith 2019-10-31 19:33:37 +00:00
• 4da8040351 Only display embedded scrollbars when required David Taylor 2019-10-30 13:16:14 +00:00
• a5da5ad7a8 Remove top right form buttons from create/update Arona Jones 2019-10-23 13:11:46 +01:00
• 7bc47f708c Hide asset list quicklinks on mobile. Partial #336. Arona Jones 2019-10-23 13:09:08 +01:00
• 3d148a7196 Add RIGS hyperlink to assets header. Closes #367. FreneticScribbler 2019-10-22 17:56:56 +01:00
• b2916c53b5 pep8 compliance, again FreneticScribbler 2019-10-22 17:34:14 +01:00
• aa177712b6 Improved validation check on models Matthew Smith 2019-10-20 01:07:49 +01:00
• c8e522d400 Fixed selenium "Object reference chain is too long" exception. Matthew Smith 2019-10-18 02:17:55 +01:00
• 52f13a53a0 Added asset database link to the rigs main page. Matthew Smith 2019-10-17 21:21:57 +01:00
• 7864b06ddd Fixed statuses other rhan "In service" not being hidden by default. Matthew Smith 2019-10-17 21:10:08 +01:00
• b39f835a38 Fixed asset permissions Matthew Smith 2019-10-17 20:54:39 +01:00
• 9f9ccd3b0c Fix sample asset data command to pass pep8 Arona Jones 2019-10-17 11:44:48 +01:00
• 1b12953803 Improved asset DB's sample data generation Matthew Smith 2019-10-17 11:10:19 +01:00
• ed956f975f Allow asset sample data command in staging FreneticScribbler 2019-10-16 23:41:14 +01:00
• 9495fa2fdb Merged all sample data generation. Matthew Smith 2019-10-16 21:47:45 +01:00
• 9de6c1046c Fixed date persistence, Fixes #362 Matthew Smith 2019-10-16 20:31:23 +01:00
• 3079ee0814 Select now store selections between forms.Partial: #362 Matthew Smith 2019-10-16 20:06:08 +01:00
• 3de58740c6 Added multi-option search along. Added auto hiding of categories in search unless selected. Added field allowing to choose whether category auto-hidden Matthew Smith 2019-10-16 18:23:08 +01:00
• 2d84a598f7 Fixes #357, removes the ability to delete assets Matthew Smith 2019-10-16 14:11:20 +01:00
• 458059fd06 Update to heroku-18 stack heroku-upgrade David Taylor 2019-10-15 23:39:39 +01:00
• 8ec27eb075 Added asset_id autofill for asset creation and duplication Matthew Smith 2019-10-14 15:50:05 +01:00
• 64439ff53b Merge assetforms -> main assets branch Arona Jones 2019-10-14 14:16:24 +01:00
• 85a20dac26 Assets now conforms to pep8 Matthew Smith 2019-10-14 14:07:06 +01:00
• 743d290405 Assets are now ordered by asset_id. Fixes #355 Matthew Smith 2019-10-14 00:19:38 +01:00
• d2ba39bc60 Merge of cable additions Matthew Smith 2019-10-14 00:09:33 +01:00
• aac900318e Cables are now a thing, unfortunately by making a monolithic Asset model Matthew Smith 2019-10-14 00:05:18 +01:00
• f5fc41ce30 Initial work on asset DB perms FreneticScribbler 2019-10-11 13:30:22 +01:00
• b7e14b7dc3 Added form validation * Asset IDs must be unique * Asset IDs that are legacy and unchange have no validation applied * Asset IDs must be alphanumeric * Values must be >=0 * Lengths, CSAs, Circuits and Cores of cables must all be >0 Matthew Smith 2019-10-08 22:33:41 +01:00
• 1d6208414f Fix old duplicate link FreneticScribbler 2019-10-08 18:32:49 +01:00
• 5c9d7466c2 Change asset buttons - added cancel button, moved stuff FreneticScribbler 2019-10-08 18:01:15 +01:00
• dc68a1f808 Improve handling of really long strings FreneticScribbler 2019-10-08 17:51:33 +01:00
• 1811cc98ba Oops. Create is an edit state... FreneticScribbler 2019-10-08 17:04:10 +01:00
• 1b124a9da9 Partialize alllllll the things FreneticScribbler 2019-10-08 16:49:10 +01:00
• bfd4a380f3 Wrap cableform input groups FreneticScribbler 2019-10-08 13:56:56 +01:00
• f9c851b960 Sod it. Cable form display now depends only on checkbox state FreneticScribbler 2019-10-08 13:53:24 +01:00
• f8a9062b8e Merge branch 'asset-assetforms' of https://github.com/nottinghamtec/PyRIGS into asset-assetforms Matthew Smith 2019-10-08 01:34:01 +01:00
• fe1541acbf Cables can now be created. Matthew Smith 2019-10-08 01:33:38 +01:00
• d30bd9850d Align text against buttons (middle) in asset list Arona Jones 2019-10-07 16:46:15 +01:00
• b8b82c0970 Prettify search/filter a bit Arona Jones 2019-10-07 16:41:52 +01:00
• 98b9697366 Temporary fix to cable_form tag. No cable functionality has actually been added, that can be done once the frontend is in place to handle it. Matthew Smith 2019-10-07 10:45:23 +01:00
• 85db26bdb1 Changed functionality of asset search - now IDs are always searched even if the string is under 3 characters in length Matthew Smith 2019-10-06 01:13:26 +01:00
• 7b795ac332 Fixed some bugs with search Matthew Smith 2019-10-06 01:03:41 +01:00
• d944f99e1f Fixed cable form fields not appearing, and made the 'cable details' group appearing more reliable Matthew Smith 2019-10-05 23:19:22 +01:00