arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 13:32:15 +00:00
Code Issues Projects Releases Wiki Activity
1,652 Commits 54 Branches 0 Tags
39dbdd7ce4e9825c12a0cc452fd1348c15ddc9a6
Commit Graph

728 Commits

Author SHA1 Message Date
FreneticScribbler
39dbdd7ce4 FIX: Prevent long text breaking out of desc/notes 
Just for good measure
 2020-01-17 17:32:16 +00:00
Arona Jones
1a953073be Merge branch 'master' into misc 2020-01-17 15:36:24 +00:00
Matthew Smith
e0c6a56263 Disable password reset as temporary fix to vulnerability (#396) 
Disabled password reset and left message notifying user of problem. In response to CVE-2019-19844
 2020-01-17 13:13:16 +00:00
FreneticScribbler
87d460c799 FIX: Prevent long text breaking out of changelog popover 
Might even be nicely hypenated on some platforms...

Closes #259
 2020-01-14 19:38:26 +00:00
FreneticScribbler
295397b32d CHANGE: Prevent both person and org being left blank for a Rig 
Of course, there's no requirement that either of those have any actual contact details...

Closes #276.
 2020-01-14 18:10:37 +00:00
FreneticScribbler
10add5ab33 CHANGE: New SU Branding 
Odds on it becoming outdated in less time than it took us to change it...

Closes #278.
 2020-01-14 14:59:48 +00:00
FreneticScribbler
7e3e8f37e2 FIX: Do not display auth warnings when duplicating events 
Closes #326.
 2020-01-13 22:13:37 +00:00
FreneticScribbler
3a25b85e95 FEAT: Add conditional formatting to whole auth panel 
Matches the formatting on the button
 2020-01-13 21:07:09 +00:00
FreneticScribbler
16b950c3b2 FIX: Make 'authorised at' datetime formatting match all the others 
Closes #385
 2020-01-13 21:07:09 +00:00
FreneticScribbler
f616017423 CHANGE: Remove phone number field from initial registration 
Closes #354
 2020-01-13 21:07:09 +00:00
Arona Jones
82a30ca77d Miscellaneous changes to the Asset DB (#390) 
* FIX #388: Prevent assets losing supplier data on edit

* FEAT: Add associated assets to supplier detail view

* FIX: Tweak supplier list to make detail view accessible

* Potential fix for #380

No idea if it works because I can't reproduce locally. S/O Reckons it should... :P

* FEAT #386: Asset search searches serial number.

Pending addition of advanced search.

* FIX: Order asset categories/statuses alphabetically

Instead of by pk because that's silly.

* FEAT: Statuses can have a CSS class defined in the admin panel

This replaces the hardcoding of colours in the asset list.

* FIX: Squash migrations

* Fixed supplier not working on all the create asset template

* Refactored away "assets" property on "Supplier" by using "related_name" instead

Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
 2020-01-03 21:46:39 +00:00
David Taylor
97c0dffbd3 Order revisions by date created (#389) 2019-12-31 16:42:56 +00:00
David Taylor
3b28eafc82 Order RIGSVersions by date 2019-12-31 16:33:43 +00:00
Arona Jones
ca8253894a FIX #321: Authorisation time shown as 'None' in emails (#378) 
* FIX #321: Authorisation Success emails dated 'None'

* FIX: Additionally fix datestamp on HTML client emails (#321)
 2019-12-31 12:45:38 +00:00
Arona Jones
01a87e0e0b FEAT: Add revision history to assets and suppliers (#387) 
* FEAT: Initial work on revision history for assets

The revision history for individual items mostly works, though it shows database ID where it should show asset ID. Recent changes feed isn't yet done.

* FEAT: Initial implementation of asset activity stream

* CHORE: Fix pep8

* FIX: Asset history table 'branding'

* FIX: Individual asset version history is now correctly filtered

* FEAT: Make revision history for suppliers accessible

* CHORE: *sings* And a pep8 in a broken tree...

* Refactored out duplicated code from `AssetVersionHistory

* CHORE: pep8

And another random bit of wierd whitespace I found

Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>

Closes #358
 2019-12-31 12:25:42 +00:00
FreneticScribbler
c059227d5d Revert "CHANGE: Restrict viewing asset DB to keyholders." 
This reverts commit 2c334196d5.
 2019-12-05 12:42:05 +00:00
FreneticScribbler
2c334196d5 CHANGE: Restrict viewing asset DB to keyholders. 
This is in line with what it was when it was on the Shared Drive.
 2019-12-04 23:59:39 +00:00
Arona Jones
4f036af85a Create the Asset Database (#363) 2019-12-04 23:14:27 +00:00
Arona Jones
5210afc772 Combine client authorisation information in rig detail (#373) 
* Combine client authorisation information in rig detail

* Fix stuff for CI

pep8 compliance
migration
 2019-11-26 17:26:32 +00:00
David Taylor
4da8040351 Only display embedded scrollbars when required 2019-10-30 13:16:14 +00:00
David Taylor
1a49bb50e5 Further version history improvements 2019-07-28 23:40:35 +01:00
David Taylor
86b349f60e Tidy up version history for risk assessments 2019-07-28 23:32:54 +01:00
David Taylor
35997aa882 Add API hook for logging risk assessment completion (#341) 2019-07-28 23:08:18 +01:00
David Taylor
faa4573f6d Add dash to date range 2019-07-14 23:15:13 +01:00
David Taylor
7babaee44c Add link to pre-filled risk assessment form 2019-07-14 23:09:44 +01:00
David Taylor
b269069b6a Improve embedding style 2019-06-20 00:56:11 +01:00
David Taylor
7e06b5a162 Increase height of forum embeds 2019-06-20 00:29:10 +01:00
David Taylor
a18bb07d78 Update views.py 2019-06-20 00:15:16 +01:00
David Taylor
bd28d2054e Remove autofocus from form 2019-06-20 00:13:24 +01:00
David Taylor
14836f135c Update subhire form location 
Requested by Jonny
 2019-02-25 21:29:14 +00:00
imgbot[bot]
f1c8dca8c4 [ImgBot] optimizes images (#339) 
*Total -- 680.70kb -> 575.32kb (15.48%)

/RIGS/static/imgs/pyrigs-avatar.png -- 4.79kb -> 2.16kb (54.98%)
/RIGS/static/imgs/404.jpg -- 131.98kb -> 108.89kb (17.49%)
/RIGS/static/imgs/403.jpg -- 155.95kb -> 129.73kb (16.81%)
/RIGS/static/imgs/500.jpg -- 118.90kb -> 100.13kb (15.79%)
/RIGS/static/imgs/401.jpg -- 151.27kb -> 129.03kb (14.7%)
/RIGS/static/imgs/400.jpg -- 104.61kb -> 93.13kb (10.97%)
/RIGS/static/imgs/paperwork/tec-logo.jpg -- 13.21kb -> 12.26kb (7.19%)
 2018-08-19 19:08:35 +01:00
David Taylor
f616857131 Merge pull request #328 from nottinghamtec/django2 
Upgrade to Django 2
 2018-04-02 21:36:10 +01:00
David Taylor
66f024e961 Remove un-necessary use of reversion 2018-03-26 19:41:13 +01:00
Johnathan Graydon
06daacf611 Automatically set event to booked when the client authorises it (#332) 
* Automatically set rig to booked when event is authorised
Will close #320
 2018-03-26 14:51:42 +01:00
Johnathan Graydon
c74bc945b6 Not error if no person 
Will close #330
 2018-03-26 14:09:51 +01:00
Johnathan Graydon
3c605d2976 Fix pep8 2018-03-25 15:30:05 +01:00
Johnathan Graydon
9720066fd7 Remove checked in by on event duplication 
Will close #327
 2018-03-25 15:30:05 +01:00
David Taylor
42450b5a22 User.is_authenticated is no longer callable 2018-03-25 00:28:37 +00:00
David Taylor
8098b33698 Migrate profile to have longer last_name field (Django 2.0 updated AbstractUser model) 2018-03-25 00:20:51 +00:00
David Taylor
1e3c021a76 Add on_delete=models.CASCADE to old migrations 2018-03-24 23:58:54 +00:00
David Taylor
d8f9256252 Add on_delete=models.CASCADE to OneToOneFields 2018-03-24 23:58:54 +00:00
David Taylor
014bab6c1f Add on_delete=models.CASCADE to all foreign keys. This replicates the previous default behaviour 2018-03-24 23:58:54 +00:00
David Taylor
8872084cab Import URL functions from django.urls 2018-03-24 23:58:39 +00:00
Johnathan Graydon
7dff951f28 Fix null person on authorisation request 
Will close #319
 2018-03-24 23:54:03 +00:00
David Taylor
a26e65073c Add no sandbox flag 
See https://github.com/travis-ci/docs-travis-ci-com/pull/1671 for more info
 2018-03-24 22:19:10 +00:00
Johnathan Graydon
7e68dfb851 Fix hover text on invoice page 2017-11-29 14:40:11 +00:00
David Taylor
ca9e309b1b Fix datetime/date check, and add https to calendar URLs 2017-09-25 23:11:00 +01:00
David Taylor
0ccb669019 Add failing test for ICAL end time issue 2017-09-25 22:58:36 +01:00
David Taylor
f17e0e199c Update bootstrap-select CSS 2017-09-22 21:30:55 +01:00
David Taylor
aee4ccb5a2 Update JS dependencies 2017-09-22 16:33:04 +01:00