Merge branch 'main' into localization-multicurrency-2
Fixed Conflicts: # src/tjts5901/templates/addItem.html # src/tjts5901/views.py
Showing
- requirements.txt 1 addition, 0 deletionsrequirements.txt
- src/tjts5901/auth.py 2 additions, 0 deletionssrc/tjts5901/auth.py
- src/tjts5901/models.py 22 additions, 0 deletionssrc/tjts5901/models.py
- src/tjts5901/templates/addItem.html 7 additions, 0 deletionssrc/tjts5901/templates/addItem.html
- src/tjts5901/templates/auth/profile.html 2 additions, 0 deletionssrc/tjts5901/templates/auth/profile.html
- src/tjts5901/templates/base.html 1 addition, 1 deletionsrc/tjts5901/templates/base.html
- src/tjts5901/views.py 74 additions, 7 deletionssrc/tjts5901/views.py
... | ... | @@ -6,6 +6,7 @@ flask==2.2.2 |
python-dotenv | ||
flask-login | ||
flask_babel | ||
datetime | ||
flask-mongoengine==1.0 | ||
Pillow | ||
... | ... |
Please register or sign in to comment