Skip to content

Feature/dashboard merged to development#53

Open
selina-joy wants to merge 101 commits into
mainfrom
feature/dashboard
Open

Feature/dashboard merged to development#53
selina-joy wants to merge 101 commits into
mainfrom
feature/dashboard

Conversation

@selina-joy
Copy link
Copy Markdown

Fix Docker setup by updating wait-for-it.sh path and configuration

Graaaaaaaaant and others added 30 commits October 17, 2024 22:24
Merge branch 'iter1/integration' into main

This merge includes updates and changes from the 'iter1/integration'
branch, primarily focused on the integration of the latest code updates
and configuration adjustments. The following key areas have been
addressed:
- Updated the code folder content with the latest changes.
- Removed old, unnecessary files.
- Ensured that the Docker and MySQL configurations are correctly set up.

This merge replaces outdated content in the 'main' branch with the new
functionality and updates from the integration branch.
.
This merge adds a backup_iter0 folder to the code directory.The folder contains backup
versions of important Python files such as settings.bak.py, urls.bak.py, and
views.bak.py. These backup files are created for safekeeping and can be
referenced as needed during integration or future iteration commit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants