RekHoto
|
aa8c0e8e5e
|
final kk
|
2 years ago |
|
RekHoto
|
2d9ff8831a
|
final kk
|
2 years ago |
|
Anton Vlasov
|
bc7db43a1a
|
Merge branch 'search_fix' into 'dev'
search fix
See merge request spatial/postamates_frontend!82
|
2 years ago |
|
RekHoto
|
5f18957c01
|
search fix
|
2 years ago |
|
Anton Vlasov
|
9e9e6becb0
|
Merge branch 'fixx' into 'dev'
viewer cant import points
See merge request spatial/postamates_frontend!81
|
2 years ago |
|
RekHoto
|
c20b473149
|
viewer cant import points
|
2 years ago |
|
Timofey Malinin
|
7e4ce746b3
|
Merge branch 'update_ci' into 'dev'
edited gitlab_ci
See merge request spatial/postamates_frontend!80
|
2 years ago |
|
timofejmalinin
|
77520a5734
|
edited gitlab_ci
|
2 years ago |
|
Timofey Malinin
|
2988d48840
|
Merge branch 'dev_to_main' into 'dev'
Dev to main
See merge request spatial/postamates_frontend!79
|
2 years ago |
|
timofejmalinin
|
e5094a6a93
|
Merge branch 'main' into dev_to_main
|
2 years ago |
|
Anton Vlasov
|
827e10379b
|
Merge branch 'images_fix' into 'dev'
images fix
See merge request spatial/postamates_frontend!77
|
2 years ago |
|
RekHoto
|
a219a62fca
|
images fix
|
2 years ago |
|
Anton Vlasov
|
af0c932252
|
Merge branch 'fixes' into 'dev'
fixes
See merge request spatial/postamates_frontend!75
|
2 years ago |
|
RekHoto
|
5f6f21e08a
|
fixes
|
2 years ago |
|
Timofey Malinin
|
75cf1bca39
|
Update README.md
|
2 years ago |
|
Timofey Malinin
|
3026e087dd
|
Update .gitlab-ci.yml
|
2 years ago |
|
Timofey Malinin
|
a67d69d2e1
|
Merge branch 'dev' into 'main'
Dev to main
See merge request spatial/postamates_frontend!74
|
2 years ago |
|
Timofey Malinin
|
044578e53a
|
Dev to main
|
2 years ago |
|
Anton Vlasov
|
74bb1f9f3b
|
Merge branch 'feature/modal_fix' into 'dev'
cancel button removed
See merge request spatial/postamates_frontend!73
|
2 years ago |
|
RekHoto
|
4758029d59
|
cancel button removed
|
2 years ago |
|
Timofey Malinin
|
bf4fd28faf
|
Merge branch 'feature/cicd' into 'dev'
VITE_KEYCLOAK_CLIENT_ID, VITE_KEYCLOAK_CLIENT_SECRET, VITE_KEYCLOAK_URL
See merge request spatial/postamates_frontend!72
|
2 years ago |
|
Igor Egorov
|
690fcdef2e
|
VITE_KEYCLOAK_CLIENT_ID, VITE_KEYCLOAK_CLIENT_SECRET, VITE_KEYCLOAK_URL
|
2 years ago |
|
Anton Vlasov
|
0dbd310b74
|
Merge branch 'feature/env' into 'dev'
env variables, removed cancel button while importing
See merge request spatial/postamates_frontend!71
|
2 years ago |
|
RekHoto
|
420929ab91
|
env variables
|
2 years ago |
|
RekHoto
|
3b655e8f04
|
env variables
|
2 years ago |
|
RekHoto
|
97b6055cff
|
env variables, removed cancel button while importing
|
2 years ago |
|
Anton Vlasov
|
9e7ff209cc
|
Merge branch 'feature/import_fix' into 'dev'
import modal fix
See merge request spatial/postamates_frontend!70
|
2 years ago |
|
RekHoto
|
2d474d26e1
|
import modal fix
|
2 years ago |
|
Platon Yasev
|
deb268d2bd
|
Merge branch 'fix/update-layers' into 'dev'
update pvz and other postamates layers
See merge request spatial/postamates_frontend!69
|
2 years ago |
|
yasevplaton
|
2cc49d3414
|
update pvz and other postamates layers
|
2 years ago |
|
Anton Vlasov
|
1d1229a6f4
|
Merge branch 'feature/fix' into 'dev'
refresh token fix, filter fix
See merge request spatial/postamates_frontend!68
|
2 years ago |
|
RekHoto
|
eefcb4f9b8
|
refresh token fix, filter fix
|
2 years ago |
|
Anton Vlasov
|
83544e51f5
|
Merge branch 'feature/refresh_token' into 'dev'
refresh token
See merge request spatial/postamates_frontend!67
|
2 years ago |
|
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 |
