b74dfac33d
Merge remote-tracking branch 'origin/master' into open
2020-01-23 16:11:11 +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
479977ef58
CHANGE: New user signups now require admin approval
...
Given that I intend to reveal much more data to new users this seems necessary...
2020-01-11 18:18:08 +00:00
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
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
a18bb07d78
Update views.py
2019-06-20 00:15:16 +01:00
David Taylor
42450b5a22
User.is_authenticated is no longer callable
2018-03-25 00:28:37 +00:00
David Taylor
8872084cab
Import URL functions from django.urls
2018-03-24 23:58:39 +00:00
David Taylor
f9389e3996
PEP8 all the things
2017-09-22 14:57:14 +01:00
David Taylor
3035320e82
Run through 2-to-3 converter. This is not in a working state
2017-09-04 23:19:22 +01:00
David Taylor
e573088c5e
Fix some issues caused by changes made over the last year
2017-05-10 17:51:55 +01:00
David Taylor
2d5f768523
Added cookie check with nice error message
2016-10-09 10:32:58 +01:00
David Taylor
441a2be0b8
Added embedded login, and all iframe links open in new tab
2016-10-06 16:08:01 +01:00
Tom Price
0a30a99e1f
Absolish the captcha from the login page.
2016-01-04 23:37:11 +00:00
Tom Price
9bbdb9fbe0
Merge branch 'master' into web-calendar
2015-07-29 18:39:36 +01:00
Tom Price
5bb7283f2d
Merge branch 'vagrant' into hotfixes
2015-07-23 21:08:44 +01:00
David Taylor
8450c36971
Fixed some #timezoneIssues
2015-06-29 21:07:10 +01:00
David Taylor
68e624f460
Streamlined web-calendar logic, also fixed issue #94
2015-06-29 20:25:46 +01:00
David Taylor
d3c6dab29b
Improved how events are selected for display on web-calendar
2015-06-29 14:42:53 +01:00
David Taylor
616c9b9e75
Rewrote venue detail UI, and added 3-phase to detail & forms
2015-06-29 02:52:39 +01:00
David Taylor
73ba535efb
Fixed API permissions, and removed unnecessary data from the events api (it now only gives information available to non-keyholders - the rest wasn't used anyway).
...
This now means the web-calendar view works for non-keyholders
2015-06-28 22:54:58 +01:00
David Taylor
148bf399ca
Added explicit field declarations to edit & update views
2015-05-28 22:20:48 +01:00
Tom Price
005bd90975
Merge registration into master, pull request #38 .
2015-05-23 22:12:17 +01:00
Tom Price
e685fa2f7c
Change adding extra user data to on a signal instead.
...
Not sure if this data is clean or not.
2015-05-21 21:45:01 +01:00
Tom Price
a95dd34bea
Working saving of registration data, need this doesn't create the required registration profile though.
...
Might need to find a way to invoke automatically then just append the new user data to the end.
2015-05-21 16:04:12 +01:00
Tom Price
6d237de743
Remove debug print statement
2015-05-19 17:54:15 +01:00
Tom Price
8ade2b234c
Enable searching by multiple options seperated by a space.
...
No idea what the effect will be if we have somebody with more than one
space in their name.
This behavoir might be quite unpredictable.
2015-05-19 17:23:05 +01:00
Tom Price
bdf3020f55
See diff
2015-04-30 23:27:31 +01:00
Tom Price
42e8de7d9d
Add recaptcha to login page
2015-04-25 16:54:01 +01:00
David Taylor
ffb04f137f
Fixed typo
2015-04-24 14:24:48 +01:00
David Taylor
143f4ea454
Fixed midnight issues in ical, web calendar & event_table
2015-04-24 14:22:08 +01:00
David Taylor
66236df979
Made a nice new UI for autocompleting
2015-04-22 13:27:56 +01:00
Tom Price
3b1137c2d6
Merge conflict from master
2015-04-21 19:57:45 +01:00
David Taylor
0c8665d370
Added calendar view
2015-04-19 22:25:59 +01:00
David Taylor
065fc6727f
Added authentication decorator & reset key functionality
2015-04-19 17:07:28 +01:00
David Taylor
b7120aa8f3
Tidied up & added comments
2015-04-18 23:12:57 +01:00
David Taylor
895b1c177e
Made more efficient & split view into a separate file
2015-04-18 22:39:58 +01:00
David Taylor
0ba4c8982e
Working version of ics interface - not very efficient
2015-04-04 00:19:17 +01:00
David Taylor
583b2514af
Attempt using ical extension - not working
2015-04-03 20:45:58 +01:00
tomtom5152
c954aa2497
Add edit urls to API results.
...
Change mic API lookup to profile
2015-03-29 13:40:52 +01:00
Tom Price
4883b9dc01
Merged in users (pull request #1 )
...
Ability to view a users details and edit them
2015-03-27 15:49:53 +00:00
tomtom5152
7c52d8334c
Bug fix for #23
2015-03-26 13:19:47 +00:00
tomtom5152
048c4b801a
Add user editing
2015-03-25 20:21:54 +00:00
tomtom5152
e5fa55ea6c
Added viewing user profiles
2015-03-25 18:56:29 +00:00
tomtom5152
29edcebb88
Added missing fields to event form and detail
2015-01-28 16:49:10 +00:00
tomtom5152
1c29b9275d
Fixes for the selection of current rigs.
...
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
Tom Price
9e7e6dc707
Event Items now saved using JSON rather than an AJAX request
2014-12-04 22:18:53 +00:00
Tom Price
91f6bb5557
Updates to AJAX forms and adding autofill function to the event form when adding things via AJAX
2014-12-03 11:17:07 +00:00
Tom Price
44848d09fe
Fixed bug where not limited dict length for api queries
2014-12-02 16:25:53 +00:00
Tom Price
c6e792c85b
Created index
...
Minor changes to base template navbar
2014-12-02 16:23:31 +00:00
