dashboard waiting for user logic final and data for tables. changed index.... (!11) · Merge requests · kj2-drupisz / desd

Merged m2-gamston requested to merge main into Michael 1 year ago

Feb 27, 2024
- Merge branch 'brodybranch' into 'main' · e411f13f
  b2-wilton authored 1 year ago
  
  Make footer sticky See merge request !10
  e411f13f
- Make footer sticky · 016fb468
  Brody Wilton authored 1 year ago
  
  016fb468
- Merge branch 'brodybranch' into 'main' · a4aee6bf
  b2-wilton authored 1 year ago
  
  Add routes and urls for pricing page. Update navbar links for pricing page and... See merge request !9
  a4aee6bf
- Merge branch 'main' into 'brodybranch' · 91a37b16
  b2-wilton authored 1 year ago
  
  # Conflicts: # myproject/myapp/templates/_base.html # myproject/myapp/urls.py
  91a37b16
- Add routes and urls for pricing page. Update navbar links for pricing page and... · 5a4129cf
  Brody Wilton authored 1 year ago
  
  Add routes and urls for pricing page. Update navbar links for pricing page and dashboard. correct link for user page in navbar
  5a4129cf
- update models to include on_delete requirement for foreign keys · dbba697d
  Brody Wilton authored 1 year ago
  
  dbba697d
- dashboard linked · 17ecba3e
  Kacper Drupisz authored 1 year ago
  
  17ecba3e
Feb 26, 2024
- moved images to static folder, adjusted src code to point to image per django... · 2ce4c70d
  James Smith authored 1 year ago
  
  moved images to static folder, adjusted src code to point to image per django documentation recommended way
  2ce4c70d
- Merge branch 'brodybranch' into 'main' · 2cec2929
  b2-wilton authored 1 year ago
  
  comment out all models because they're not ready yet See merge request !7
  2cec2929
- comment out all models because they're not ready yet · 33a9a8ea
  Brody Wilton authored 1 year ago
  
  33a9a8ea
- Merge branch 'brodybranch' into 'main' · c08c7bb6
  b2-wilton authored 1 year ago
  
  Brodybranch See merge request !6
  c08c7bb6
- Merge branch 'brodybranch' of https://gitlab.uwe.ac.uk/kj2-drupisz/desd into brodybranch · 175afe91
  Brody Wilton authored 1 year ago
  
  merge conflict fix?
  175afe91
- add login/register panels · edefc856
  Brody Wilton authored 1 year ago
  
  edefc856
- Remove duplicate user_id attr, add datetime field to feedback model · d8aa65b6
  Brody Wilton authored 1 year ago
  
  d8aa65b6
- Add models for User, UserType, Logs, Feedback and bills · ace31df0
  Brody Wilton authored 1 year ago
  
  ace31df0
- non functional, front end complete · c330d2f5
  m2-gamston authored 1 year ago
  
  c330d2f5
- front page done ish, no functionality · 66db2bcb
  m2-gamston authored 1 year ago
  
  66db2bcb
Feb 25, 2024
- Remove duplicate user_id attr, add datetime field to feedback model · 01b2e603
  Brody Wilton authored 1 year ago
  
  01b2e603
- Add models for User, UserType, Logs, Feedback and bills · ac1b4b97
  Brody Wilton authored 1 year ago
  
  ac1b4b97
Feb 24, 2024
- Contact -> Dashboard and href update · 0ca74e4e
  Kacper Drupisz authored 1 year ago
  
  0ca74e4e
- dashboard waiting for user logic final and data for tables. changed index.... · eafcb13b
  Kacper Drupisz authored 1 year ago
  
  dashboard waiting for user logic final and data for tables. changed index. display maintance screen for beggining page, changed href for logo to go home
  eafcb13b
- Merge branch 'brodybranch' into 'main' · aa6f16d8
  b2-wilton authored 1 year ago
  
  Add correct urls for login/register to navbar See merge request !4
  aa6f16d8
- Add correct urls for login/register to navbar · 4e310625
  Brody Wilton authored 1 year ago
  
  4e310625
- Merge branch 'brodybranch' into 'main' · bbf48547
  b2-wilton authored 1 year ago
  
  Move navbar to base template See merge request !3
  bbf48547
- Move navbar to base template · 39ab822e
  Brody Wilton authored 1 year ago
  
  39ab822e
- Add routes and url mapping and templates for index and register pages · c86f26ff
  Brody Wilton authored 1 year ago
  
  c86f26ff
- Merge branch 'Kacper' into 'main' · ca163bb8
  kj2-drupisz authored 1 year ago
  
  Kacper See merge request !1
  ca163bb8
- Merge branch 'main' into 'Kacper' · c2fe542e
  kj2-drupisz authored 1 year ago
  
  # Conflicts: # .gitignore
  c2fe542e
- pages · 8f598ff6
  Kacper Drupisz authored 1 year ago
  
  8f598ff6
Feb 23, 2024
- Updated gitignore · 4f3824d9
  h4-rahman authored 1 year ago
  
  4f3824d9
- Update file README.md · e55dc6e9
  h4-rahman authored 1 year ago
  
  e55dc6e9
Feb 21, 2024
- Just a draft · 65412389
  Kacper Drupisz authored 1 year ago
  
  65412389

dashboard waiting for user logic final and data for tables. changed index....

Merge request reports

Activity