RekHoto
|
d9b7ebe184
|
refresh token
|
2 years ago |
|
Anton Vlasov
|
da71565320
|
Merge branch 'feature/kk_fix' into 'dev'
keycloak fix
See merge request spatial/postamates_frontend!66
|
2 years ago |
|
RekHoto
|
cae036f551
|
keycloak fix
|
2 years ago |
|
Anton Vlasov
|
61a3f65752
|
Merge branch 'feature/keycloak' into 'dev'
keycloak signin
See merge request spatial/postamates_frontend!65
|
2 years ago |
|
RekHoto
|
033f88d2d8
|
keycloak signin
|
2 years ago |
|
RekHoto
|
4117cd402d
|
Merge branch 'dev'
# Conflicts:
# src/Map/LastMLRun.jsx
# src/Map/Layers/PendingPoints.jsx
# src/Map/Layers/layers-config.js
# src/api.js
# src/icons/icons-config.js
# src/modules/ImportMode/PointsFileUploadModal.jsx
# src/modules/Table/PendingTable/PendingTable.jsx
# src/modules/Table/PendingTable/usePendingTableFields.jsx
# src/modules/Table/useColumns.jsx
# src/utils.js
|
2 years ago |
|
Timofey Malinin
|
5816d35eeb
|
Merge branch 'feature/map_fixes' into 'dev'
delete point loader fix, no icon fix, filters fix
See merge request spatial/postamates_frontend!63
|
2 years ago |
|
RekHoto
|
32eea25ff9
|
delete point loader fix, no icon fix, filters fix
|
2 years ago |
|
Anton Vlasov
|
82d3df8032
|
Merge branch 'feature/import_status' into 'dev'
import status, start ml button fix
See merge request spatial/postamates_frontend!62
|
2 years ago |
|
RekHoto
|
096b85e4c2
|
import status, start ml button fix
|
2 years ago |
|
Timofey Malinin
|
00adc60d93
|
Merge branch 'dev' into 'main'
hide category image
See merge request spatial/postamates_frontend!61
|
2 years ago |
|
Timofey Malinin
|
2709d45672
|
hide category image
|
2 years ago |
|
Anton Vlasov
|
47f21e78d0
|
Merge branch 'feature/tooltip_fix' into 'dev'
chart tooltip fix, query optimizations
See merge request spatial/postamates_frontend!60
|
2 years ago |
|
RekHoto
|
3fa06f34d6
|
chart tooltip fix, query optimizations
|
2 years ago |
|
Anton Vlasov
|
59781e0a21
|
Merge branch 'feature/martin_name_change' into 'dev'
martin name change
See merge request spatial/postamates_frontend!59
|
2 years ago |
|
RekHoto
|
2832cf5315
|
martin name change
|
2 years ago |
|
Anton Vlasov
|
00ecb5d411
|
Merge branch 'feature/chart_fix' into 'dev'
chart fix
See merge request spatial/postamates_frontend!58
|
2 years ago |
|
RekHoto
|
90d18d8489
|
chart fix
|
2 years ago |
|
Anton Vlasov
|
5e740b81db
|
Merge branch 'feature/minor_fixes' into 'dev'
min/max chart, layers order, popup fix
See merge request spatial/postamates_frontend!57
|
2 years ago |
|
RekHoto
|
ed18fb9217
|
min/max chart, layers order, popup fix
|
2 years ago |
|
Anton Vlasov
|
4d36136884
|
Merge branch 'feature/martin_table' into 'dev'
martin table
See merge request spatial/postamates_frontend!56
|
2 years ago |
|
RekHoto
|
46cf59df87
|
martin table
|
2 years ago |
|
Anton Vlasov
|
e2cb6cc830
|
Merge branch 'feature/avg_chart' into 'dev'
avg, min, max charts; buttons tooltips
See merge request spatial/postamates_frontend!55
|
2 years ago |
|
RekHoto
|
063c527537
|
avg, min, max charts; buttons tooltips
|
2 years ago |
|
Anton Vlasov
|
5355bf0ea6
|
Merge branch 'feature/point_chart_fixes' into 'dev'
point chart fixes
See merge request spatial/postamates_frontend!54
|
2 years ago |
|
RekHoto
|
966339138d
|
point chart fixes
|
2 years ago |
|
Anton Vlasov
|
e40af1b5d3
|
Merge branch 'feature/point_chart' into 'dev'
point chart, query fixes
See merge request spatial/postamates_frontend!53
|
2 years ago |
|
RekHoto
|
b22ffcd94d
|
point chart, query fixes
|
2 years ago |
|
Anton Vlasov
|
2e4461074b
|
Merge branch 'feature/to_excel_table' into 'dev'
to excel table and filters
See merge request spatial/postamates_frontend!52
|
2 years ago |
|
RekHoto
|
50acdb7fb8
|
to excel table and filters
|
2 years ago |
|
Anton Vlasov
|
5622b3fbd6
|
Merge branch 'feature/fixed_pagination' into 'dev'
pagination fixed to bottom
See merge request spatial/postamates_frontend!51
|
2 years ago |
|
RekHoto
|
251cf7cb5f
|
pagination fixed to bottom
|
2 years ago |
|
Anton Vlasov
|
c7a419691e
|
Merge branch 'feature/update_fix' into 'dev'
update status filter fix, popup field fix
See merge request spatial/postamates_frontend!50
|
2 years ago |
|
RekHoto
|
1ca805a2e2
|
update status filter fix, popup field fix
|
2 years ago |
|
Anton Vlasov
|
df62953ace
|
Merge branch 'feature/status_filter_fix' into 'dev'
status filter fix
See merge request spatial/postamates_frontend!49
|
2 years ago |
|
RekHoto
|
5314005345
|
status filter fix
|
2 years ago |
|
Anton Vlasov
|
d7fc4b7347
|
Merge branch 'feature/favicon' into 'dev'
favicon
See merge request spatial/postamates_frontend!48
|
2 years ago |
|
RekHoto
|
8d192901e7
|
favicon
|
2 years ago |
|
Anton Vlasov
|
c52972e36e
|
Merge branch 'feature/system_update_loader' into 'dev'
system update loader
See merge request spatial/postamates_frontend!47
|
2 years ago |
|
RekHoto
|
1044882ea9
|
system update loader
|
2 years ago |
|
Anton Vlasov
|
85612ef11d
|
Merge branch 'feature/final_fixes' into 'dev'
fixe
See merge request spatial/postamates_frontend!46
|
2 years ago |
|
RekHoto
|
58f9fcb7b2
|
END-722 - map icons overlap
END-723 - update count on delete
END-724 - start ml styling
END-725 - legend styling
|
2 years ago |
|
Anton Vlasov
|
82e3cb8cab
|
Merge branch 'feature/last_status' into 'dev'
last status value
See merge request spatial/postamates_frontend!45
|
2 years ago |
|
RekHoto
|
061d8e8b32
|
last status value
|
2 years ago |
|
Anton Vlasov
|
89268fe803
|
Merge branch 'feature/fixes' into 'dev'
END-712 - import report styling
See merge request spatial/postamates_frontend!44
|
2 years ago |
|
RekHoto
|
39a7ca811c
|
END-712 - import report styling
END-714 - import error rename
END-716 - update map after import
END-717 - updated favicon
END-718 - enlarge legend icons
END-719 - legend points border
END-720 - points count loader
|
2 years ago |
|
Anton Vlasov
|
aeaf90f136
|
Merge branch 'feature/new_logo' into 'dev'
new logo, table status filter, disable take to work if updating data
See merge request spatial/postamates_frontend!43
|
2 years ago |
|
RekHoto
|
1a3f8e3b8c
|
new logo, table status filter, disable take to work if updating data
|
2 years ago |
|
Anton Vlasov
|
fe70b71dce
|
Merge branch 'feature/popup_fix' into 'dev'
delete point updates table, popup fix
See merge request spatial/postamates_frontend!42
|
2 years ago |
|
RekHoto
|
6011c4f4c1
|
delete point updates table, popup fix
|
2 years ago |
