Commits · cab644a8e71059959986fc95a707d4c1b4930155 · kj2-drupisz / desd · GitLab

Snippets Groups Projects

Apr 30, 2024
- user auto timeout · cab644a8
  James Smith authored 11 months ago
  
  cab644a8
Apr 09, 2024
- added timed logout based on innactivity. logs cookies on all activity, logs... · 199903f5
  James Smith authored 1 year ago
  199903f5
Mar 28, 2024
- commenting out base user for the demo. deleted redundant/commented out code... · 4436d703
  James Smith authored 1 year ago
  4436d703
Mar 27, 2024
- added script to auto populate the DB with 1 of each user type including superuser · 5e774724
  James Smith authored 1 year ago
  
  5e774724
Mar 26, 2024
- added default text if no email provided · 9aa4edfb
  James Smith authored 1 year ago
  
  9aa4edfb
- apologies for working in main. minor UI change to display user type as the... · 1c6a5b97
  James Smith authored 1 year ago
  1c6a5b97
- Merge branch 'hamid' into 'main' · b06b3e6e
  h4-rahman authored 1 year ago
  b06b3e6e
- Added wait for · 404b1515
  h4-rahman authored 1 year ago
  
  404b1515
Mar 25, 2024
- Merge branch 'hamid' into 'main' · 5d1ba66d
  h4-rahman authored 1 year ago
  5d1ba66d
- Added logout redirect url into settings. · 00a6a487
  h4-rahman authored 1 year ago
  00a6a487
- Merge branch 'hamid' into 'main' · be966424
  h4-rahman authored 1 year ago
  be966424
- Merge branch 'main' into 'hamid' · 05061cdb
  h4-rahman authored 1 year ago
  05061cdb
- Added logging for file upload and running algorithm. · fa436a6a
  h4-rahman authored 1 year ago
  
  fa436a6a
- Merge branch 'brodybranch' into 'main' · f7362085
  b2-wilton authored 1 year ago
  f7362085
- restrict dashboard based on user type · 6fdbb54c
  Brody Wilton authored 1 year ago
  
  6fdbb54c
- Merge branch 'brodybranch' into 'main' · ec8c1372
  b2-wilton authored 1 year ago
  ec8c1372
- Restrict ability to run app behind a token count of greater than 0 · 2c45a9f2
  Brody Wilton authored 1 year ago
  
  2c45a9f2
- Merge branch 'brodybranch' into 'main' · 4583a60c
  b2-wilton authored 1 year ago
  4583a60c
- Implement user token count model and display user tokens in dashboard · 0f8b2d26
  Brody Wilton authored 1 year ago
  
  0f8b2d26
- Merge branch 'brodybranch' into 'main' · b7a98cd4
  b2-wilton authored 1 year ago
  b7a98cd4
- Merge branch 'main' into 'brodybranch' · 966f2d45
  b2-wilton authored 1 year ago
  966f2d45
- Minor fixes from merge problems · 11d0e94f
  Brody Wilton authored 1 year ago
  
  11d0e94f
- fix issues caused by me being a fuckhead when merging · 6d6097c1
  Brody Wilton authored 1 year ago
  
  6d6097c1
- Merge branch 'brodybranch' into 'main' · 66379c64
  b2-wilton authored 1 year ago
  66379c64
- Merge branch 'brodybranch' of https://gitlab.uwe.ac.uk/kj2-drupisz/desd into brodybranch · bdf80e57
  Brody Wilton authored 1 year ago
  
  bdf80e57
- Add PayPal integration- need to link in new model for usertokens · 52eb52b7
  Brody Wilton authored 1 year ago
  
  52eb52b7
- Add templates for successful and cancelled payments · 3a46b520
  Brody Wilton authored 1 year ago
  
  3a46b520
- Add create_payment · 00a274f6
  Brody Wilton authored 1 year ago
  
  00a274f6
- Merge branch 'brodybranch' of https://gitlab.uwe.ac.uk/kj2-drupisz/desd into brodybranch · 5232fdac
  Brody Wilton authored 1 year ago
  
  5232fdac
- Add PayPal integration- need to link in new model for usertokens · 85a26223
  Brody Wilton authored 1 year ago
  
  85a26223
- Merge branch 'brodybranch' of https://gitlab.uwe.ac.uk/kj2-drupisz/desd into brodybranch · b5a6c7ec
  Brody Wilton authored 1 year ago
  
  b5a6c7ec
- Merging and rebasing · 58c678af
  Brody Wilton authored 1 year ago
  
  58c678af
- Add button styling · 87ac1b27
  Brody Wilton authored 1 year ago
  
  87ac1b27
- Add PayPal integration- need to link in new model for usertokens · 600616f7
  Brody Wilton authored 1 year ago
  
  600616f7
- Add templates for successful and cancelled payments · 4ecce7bc
  Brody Wilton authored 1 year ago
  
  4ecce7bc
- Add create_payment · b3deb1a1
  Brody Wilton authored 1 year ago
  
  b3deb1a1
- Merge branch 'hamid' into 'main' · ae9ea283
  h4-rahman authored 1 year ago
  ae9ea283
- Implemented/hopefully fixed login/logout/register functionality. · 46d57c4e
  h4-rahman authored 1 year ago
  46d57c4e
- Add button styling · ace3fb71
  Brody Wilton authored 1 year ago
  
  ace3fb71
Mar 24, 2024
- Add PayPal integration- need to link in new model for usertokens · 7991a045
  Brody Wilton authored 1 year ago
  
  7991a045