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

• a22956cc62 Initial work on cable template things FreneticScribbler 2019-10-05 22:42:21 +01:00
• 3d5272d722 Fixed incorrecty data being sent to the date_sold field in the asset_update template. Fixes last of dates not being passed around correctly Matthew Smith 2019-10-05 21:58:49 +01:00
• 1c06bf3ba4 Merge branch 'asset-assetforms' of https://github.com/nottinghamtec/PyRIGS into asset-assetforms Matthew Smith 2019-10-05 21:16:58 +01:00
• d5f08a8bff Started adding functionality for assets and cables forms to be dynamically swapped Matthew Smith 2019-10-05 21:16:42 +01:00
• 7359e05427 Started adding functionality for assets and cables forms to be dynamically swapped Matthew Smith 2019-10-05 21:16:03 +01:00
• 366d9c4130 Label the collection 'set parent' field as such FreneticScribbler 2019-10-05 20:33:03 +01:00
• e3cbcbd151 Fixed search and implemented an asset search api Matthew Smith 2019-10-05 20:17:26 +01:00
• 1d253aa452 Fixed edit always being invalid due to always failing form validation Matthew Smith 2019-10-05 15:07:41 +01:00
• 3aa3498d3a Split out create and duplicate templates, got both working Matthew Smith 2019-10-05 14:59:15 +01:00
• a4adc8bc7b Now asset_ids are going to be editable, removed that limitation from form Matthew Smith 2019-10-05 14:54:19 +01:00
• 769137fabd Started work on improving asset form update and validation - requires de-spaghettifying of asset_update.html before continuing Matthew Smith 2019-10-05 01:44:54 +01:00
• 5bfa737f6b First pass at filters FreneticScribbler 2019-10-02 22:49:54 +01:00
• 8599a2ae5b Improved handling of asset ID when searching Matthew Smith 2019-10-02 21:54:39 +01:00
• 63eb0fc3ce Merge branch 'assets' of https://github.com/nottinghamtec/PyRIGS into assets Matthew Smith 2019-10-02 21:14:03 +01:00
• 207bf7bd7a Added dependency django-polymorphic Model change to take advantage of said polymorphism Implemented asset search Matthew Smith 2019-10-02 21:12:24 +01:00
• e591ebe05a Show purchase and collection details side by side FreneticScribbler 2019-10-02 19:38:05 +01:00
• 3d7fc18fb7 Fix unclosed tags in asset_update FreneticScribbler 2019-10-02 18:58:52 +01:00
• 6c68343653 Add status colors to asset list FreneticScribbler 2019-10-02 18:34:34 +01:00
• 5cb668fd7a Fix delete confirmation modal styling FreneticScribbler 2019-10-02 17:38:32 +01:00
• 7aba164a46 Added .pytest_cache to gitignore Matthew Smith 2019-10-02 17:32:57 +01:00
• 42a63f035c Asset detail view button improvements FreneticScribbler 2019-10-02 17:17:35 +01:00
• 15113c4fbc Fix asset list quicklinks FreneticScribbler 2019-10-02 16:51:45 +01:00
• 721599d35e Delete Materialize FreneticScribbler 2019-10-02 12:41:14 +01:00
• 9bcff7cd5f Supplier bootstrap port warlordjones 2019-10-02 12:40:55 +01:00
• f3c7f89f31 Initial bootstrap port of asset_update warlordjones 2019-10-02 12:08:52 +01:00
• 8c60f6cb1d created separate base for RIGS and assets. Fixed create asset form Matthew Smith 2019-10-01 22:46:48 +01:00
• a9a05b06fa Begin bootstrap port warlordjones 2019-10-01 19:59:02 +01:00
• d89d449ab1 Fix sample data generator warlordjones 2019-10-01 19:22:15 +01:00
• 36ac122f7a Add requirements from assets warlordjones 2019-10-01 18:45:38 +01:00
• 6cff7c090c Modified configs so that templates are rendered. Functionality and styling are NOT complete (need to change css framework) Matthew Smith 2019-10-01 18:10:34 +01:00
• 1df971bbba Updated RIGS configs to allow for extra assets info Matthew Smith 2019-10-01 13:29:52 +01:00
• 39e3898c7d Merge branch 'master' of PyAssets into assets Matthew Smith 2019-10-01 13:24:47 +01:00
• 1e1f3037f8 Preparing files for transfer to PyRIGS Matthew Smith 2019-10-01 13:22:16 +01:00
• 1a49bb50e5 Further version history improvements David Taylor 2019-07-28 23:40:35 +01:00
• 86b349f60e Tidy up version history for risk assessments David Taylor 2019-07-28 23:32:54 +01:00
• 35997aa882 Add API hook for logging risk assessment completion (#341) David Taylor 2019-07-28 23:08:18 +01:00
• 82b9e26aa1 Add API hook for logging risk assessment completion risk-assessment David Taylor 2019-07-28 22:47:48 +01:00
• faa4573f6d Add dash to date range David Taylor 2019-07-14 23:15:13 +01:00
• 7babaee44c Add link to pre-filled risk assessment form David Taylor 2019-07-14 23:09:44 +01:00
• c0fe176495 Add docker dev instructions David Taylor 2019-07-14 23:04:12 +01:00
• b269069b6a Improve embedding style David Taylor 2019-06-20 00:56:11 +01:00
• 7e06b5a162 Increase height of forum embeds David Taylor 2019-06-20 00:29:10 +01:00
• a18bb07d78 Update views.py David Taylor 2019-06-20 00:15:16 +01:00
• bd28d2054e Remove autofocus from form David Taylor 2019-06-20 00:13:24 +01:00
• d881ce3a96 Update login_embed.html embed_improvements David Taylor 2019-06-20 00:04:47 +01:00
• e3fd84c1b6 Change option David Taylor 2019-06-19 22:28:14 +01:00
• 7683dc37ff Increase embed height David Taylor 2019-06-19 22:23:41 +01:00
• 85a835ed0d Remove autofocus from embedded login form David Taylor 2019-06-19 22:20:02 +01:00
• 14836f135c Update subhire form location David Taylor 2019-02-25 21:29:14 +00:00
• 5aafa36d2a Tidy up logic for which links to show, made comments duplicate Harry Bridge 2019-01-31 20:03:49 +00:00
• 1ef60943ea Put duplication into one view Harry Bridge 2019-01-31 20:03:08 +00:00
• 9480f697ff Merge branch 'master' into duplicate_asset Johnathan Graydon 2019-01-13 16:49:03 +00:00
• 7478068a14 Fix defaults, will close #3 Johnathan Graydon 2019-01-13 16:30:45 +00:00
• c0a7e962b7 Add asset duplication Johnathan Graydon 2019-01-13 15:28:37 +00:00
• 2717133d1c Style adjustments Johnathan Graydon 2019-01-12 16:25:59 +00:00
• c03902d76b Add minor customisation to backend Johnathan Graydon 2019-01-12 15:46:48 +00:00
• 932739b505 Add default for acquired and status to base model Johnathan Graydon 2019-01-12 15:22:03 +00:00
• 5e15622cdf Migration for some changes that happened in the past Harry Bridge 2019-01-11 22:52:35 +00:00
• 393d3a1f49 Made asset list title less massive Harry Bridge 2019-01-08 00:23:29 +00:00
• 905eea7792 Updated sample data creation Harry Bridge 2019-01-08 00:22:46 +00:00
• f24a510a8e Added crud for suppliers Harry Bridge 2019-01-08 00:21:58 +00:00
• 51aec6f597 Added basic api Harry Bridge 2019-01-05 22:52:39 +00:00
• d8440ad9e5 Updated admin and settings Harry Bridge 2019-01-05 20:05:41 +00:00
• ef8ddf3642 Removed old template Harry Bridge 2019-01-05 20:05:14 +00:00
• 779fc42f26 Added views Harry Bridge 2019-01-05 20:04:58 +00:00
• e8fcfd3a50 Sass updates Harry Bridge 2019-01-05 20:01:19 +00:00
• b72bc63560 Templatetags for better field rendering Harry Bridge 2019-01-05 20:01:02 +00:00
• fbfd8f272b Working asset edit/create template Harry Bridge 2019-01-05 20:00:00 +00:00
• 9f3c1f7f3c Updated asset list Harry Bridge 2019-01-05 19:59:05 +00:00
• 502a2c4e0e Importer scripts for old asset DB Harry Bridge 2019-01-05 19:58:17 +00:00
• a4cfe17f74 Migrations for model updates Harry Bridge 2019-01-05 19:57:31 +00:00
• 5ec0a179eb Started on PAT models Harry Bridge 2019-01-05 19:56:43 +00:00
• c418678fe2 Updated asset model to remove collections Harry Bridge 2019-01-05 19:56:25 +00:00
• 5f8a77586a Revert "Add warning" David Taylor 2018-09-13 14:01:44 +01:00
• e5b7fdbae1 Add warning David Taylor 2018-09-13 14:01:44 +01:00
• f1c8dca8c4 [ImgBot] optimizes images (#339) imgbot[bot] 2018-08-19 19:08:35 +01:00
• 4c11371f0c Remove unnecessary JS files Harry Bridge 2018-07-16 14:40:51 +01:00
• 47c46f4cc4 Updated new template locations Harry Bridge 2018-07-16 00:30:39 +01:00
• 44d84f10c9 Moved some templates around and added styling Harry Bridge 2018-07-16 00:28:42 +01:00
• 116b228de3 Added materialize sass Harry Bridge 2018-07-16 00:27:47 +01:00
• 843b76d8ea [requires.io] dependency update on master branch (#336) David Taylor 2018-05-25 16:22:07 +01:00
• 1be1b1abd7 Add invoice versioning to templates. Tom Price 2018-05-15 17:42:13 +01:00
• 42e1931e72 Add revision history to invoices & payments Johnathan Graydon 2018-05-14 15:57:06 +01:00
• e81af9e479 Merge pull request #335 from nottinghamtec/requires-io-master David Taylor 2018-05-08 17:57:11 +01:00
• efab8c8cef [requires.io] dependency update requires.io 2018-05-08 16:41:37 +01:00
• 3f7531e157 [requires.io] dependency update requires.io 2018-05-02 03:12:55 +01:00
• 988f3dced4 [requires.io] dependency update requires.io 2018-04-30 19:49:11 +01:00
• bd3240c2bc [requires.io] dependency update requires.io 2018-04-28 20:25:35 +01:00
• 7fbbe2871f [requires.io] dependency update requires.io 2018-04-22 00:34:34 +01:00
• 109ece508b [requires.io] dependency update requires.io 2018-04-19 07:36:06 +01:00
• 971144c2e6 [requires.io] dependency update requires.io 2018-04-18 11:16:00 +01:00
• a3c6edda0b Merge pull request #334 from nottinghamtec/requires-io-master David Taylor 2018-04-16 23:59:36 +01:00
• 71bb4696b8 [requires.io] dependency update requires.io 2018-04-16 23:19:10 +01:00
• 2a3ed0b763 [requires.io] dependency update requires.io 2018-04-12 01:29:58 +01:00
• 632fa56353 [requires.io] dependency update requires.io 2018-04-11 06:08:19 +01:00
• f3020fc783 [requires.io] dependency update requires.io 2018-04-10 19:16:12 +01:00
• 9fdf5e674e [requires.io] dependency update requires.io 2018-04-10 12:08:43 +01:00
• cfe03a8628 [requires.io] dependency update requires.io 2018-04-10 05:17:39 +01:00
• eccf224b63 [requires.io] dependency update requires.io 2018-04-03 04:33:32 +01:00
• 0b2c86ebb5 [requires.io] dependency update requires.io 2018-04-03 00:19:18 +01:00