Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Update Django to 4.2 LTS #1543

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6e591c0
add: new vegetation index
NtskwK Nov 13, 2023
0655a48
Merge branch 'OpenDroneMap:master' into master
NtskwK Nov 22, 2023
426c62d
Merge branch 'OpenDroneMap:master' into master
NtskwK Apr 6, 2024
1567a8b
Merge branch 'OpenDroneMap:master' into master
NtskwK Apr 25, 2024
cac4eeb
Merge branch 'OpenDroneMap:master' into master
NtskwK Apr 30, 2024
f0213e7
Merge branch 'OpenDroneMap:master' into master
NtskwK May 9, 2024
a3ab91f
Merge branch 'OpenDroneMap:master' into master
NtskwK Jun 2, 2024
62c33ec
Merge branch 'OpenDroneMap:master' into master
NtskwK Jul 20, 2024
37e1619
Merge branch 'OpenDroneMap:master' into master
NtskwK Aug 19, 2024
e2e4fb3
style: Update scss style to fit webpack in new version
NtskwK Aug 19, 2024
50c70de
Merge branch 'master' of github.com:NtskwK/WebODM
NtskwK Aug 19, 2024
edb3b99
feat: add .vscode to .gitignore
NtskwK Aug 19, 2024
844297b
feat: remove version tag from docker-compose files
NtskwK Aug 19, 2024
197e72c
feat: update postgresql to 16.1
NtskwK Aug 19, 2024
e1656cd
feat: update webpack config for hash filename
NtskwK Aug 19, 2024
83ab170
refactor: update celery loglevel in worker.sh for new performance
NtskwK Aug 19, 2024
d694ed8
refactor: ingore authentication.py for rest_framework_jwt.authentication
NtskwK Aug 19, 2024
b103c57
feat: add GDAL version check and makemigrations in start.sh
NtskwK Aug 19, 2024
52c30fe
refactor: change Docker base image to Ubuntu 20.04
NtskwK Aug 19, 2024
20a666a
chore: update rio_tiler to 6.6.1
NtskwK Aug 19, 2024
d6f244a
refactor: update Django to 4.2 LTS
NtskwK Aug 19, 2024
074ed57
revert: Recover deleted migrations files
NtskwK Aug 20, 2024
f8e4f22
Merge branch 'OpenDroneMap:master' into master
NtskwK Aug 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style: Update scss style to fit webpack in new version
NtskwK committed Aug 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e2e4fb36a8aca962d32e9419a9a1e040ea2e419f
6 changes: 3 additions & 3 deletions app/static/app/js/css/GCPPopup.scss
Original file line number Diff line number Diff line change
@@ -34,13 +34,13 @@
opacity: 0.2;
}
&.fullscreen{
&.loading{
opacity: 1;
}
display: flex;
align-items: center;
justify-content: center;
color: white;
&.loading{
opacity: 1;
}
i{
font-size: 200%;
position: absolute;
17 changes: 8 additions & 9 deletions app/static/app/js/css/Map.scss
Original file line number Diff line number Diff line change
@@ -33,23 +33,22 @@
}

.asset-links{
margin-top: 8px;
padding-left: 16px;

columns: 2;
-webkit-columns: 2;
-moz-columns: 2;
li:first-child{
display: none;
}
&.loading{
li{ display: none }
padding-left: 0;
list-style-type: none;li{ display: none }
li:first-child{
display: block;
}
padding-left: 0;
list-style-type: none;
}
margin-top: 8px;
padding-left: 16px;

columns: 2;
-webkit-columns: 2;
-moz-columns: 2;
}
.switchModeButton{
bottom: 12px;
5 changes: 3 additions & 2 deletions app/static/app/js/css/MapView.scss
Original file line number Diff line number Diff line change
@@ -4,13 +4,14 @@
}

.map-view{
height: calc(100% - 20px);
position: relative;

.map-title{
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
height: calc(100% - 20px);
position: relative;

input[type="range"]{
margin-left: 4px;
8 changes: 3 additions & 5 deletions app/static/app/js/css/ModelView.scss
Original file line number Diff line number Diff line change
@@ -153,7 +153,9 @@

#sidebar_root{
width: 300px;

position: absolute;
min-height: 100%;
height: 100%;
.pv-menu-list{
padding-right: 12px;

@@ -170,10 +172,6 @@
cursor: pointer;
}

position: absolute;
min-height: 100%;
height: 100%;

.potree_sidebar_brand{
display: flex;
flex-direction: row;
2 changes: 1 addition & 1 deletion app/static/app/js/css/Paginator.scss
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
margin-bottom: 8px;

.toolbar{
margin-right: 8px;
i{
opacity: 0.8;
}
margin-right: 8px;
&.no-margin{
margin-right: 0;
}
7 changes: 3 additions & 4 deletions app/static/app/js/css/ProjectListItem.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.project-list-item{
min-height: 60px;
-webkit-transition: background-color 1s ease;
transition: background-color 1s ease;

.project-name{
font-weight: bold;
@@ -40,14 +42,11 @@
background-color: #eee;
}

-webkit-transition: background-color 1s ease;
transition: background-color 1s ease;

&.dz-drag-hover{
background-color: #f7f7f7;
.drag-drop-icon{
display: block;
}
background-color: #f7f7f7;
}

.project-links{
10 changes: 5 additions & 5 deletions app/static/app/js/css/SharePopup.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.sharePopup{
right: 0;
pointer-events: none;
position: absolute;
&.top{
bottom: 0;
}
&.bottom{
top: 0;
}
right: 0;
pointer-events: none;

.sharePopupContainer{
pointer-events: auto;
@@ -52,15 +52,15 @@
}

.share-links{
max-height: 0;
overflow: hidden;
transition: max-height 1s ease-in-out;
& > div{
margin-top: 8px;
&:first-child{
margin-top: 4px;
}
}
max-height: 0;
overflow: hidden;
transition: max-height 1s ease-in-out;

&.show{
max-height: 800px;
8 changes: 4 additions & 4 deletions app/static/app/js/css/TagsField.scss
Original file line number Diff line number Diff line change
@@ -7,9 +7,6 @@
cursor: text;
}
.tag-badge{
&:hover{
cursor: grab;
}
display: inline-block;
width: auto;
padding-left: 6px;
@@ -19,7 +16,10 @@
margin-right: 4px;
margin-bottom: 8px;
border-radius: 6px;


&:hover{
cursor: grab;
}
a{
margin-top: 2px;
font-weight: bold;
4 changes: 2 additions & 2 deletions app/static/app/js/css/TaskListItem.scss
Original file line number Diff line number Diff line change
@@ -52,10 +52,10 @@

@media screen and (max-width: 576px){
.status-label {
text-align: center;
& > span{
display: none;
}
text-align: center;
}
}

@@ -70,14 +70,14 @@
padding-right: 16px;

.info-table {
margin-bottom: 12px;
tr td:first-child {
width: 33%;
max-width: 150px;
}
td{
padding: 0;
}
margin-bottom: 12px;
@media screen and (min-width: 1200px) {
tr td:first-child {
width: 20%;