develop #8

Merged
william merged 10 commits from develop into master 2022-04-20 23:13:55 -04:00

10 Commits

Author SHA1 Message Date
c0507ec11f Merge pull request 'feature/25-dtos' (#7) from feature/25-dtos into develop
All checks were successful
continuous-integration/drone/pr Build is passing
Reviewed-on: https://gitea.fyloz.dev/ColorRecipesExplorer/Frontend/pulls/7
2022-04-20 22:52:50 -04:00
FyloZ
09e89e68bb
#25 apply backend changes 2022-04-20 22:51:35 -04:00
FyloZ
cc24423389
#25 Update files base url
All checks were successful
continuous-integration/drone/push Build is passing
2022-02-27 21:01:07 -05:00
FyloZ
6c8d35560e
CI/CD
All checks were successful
continuous-integration/drone/push Build is passing
2022-01-23 01:28:58 -05:00
FyloZ
af3b8eee8c
Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
continuous-integration/drone/push Build is passing
# Conflicts:
#	.drone.yml
2021-12-23 21:04:43 -05:00
FyloZ
f21157d283
Fix mix editor did not get the materials from the correct location in update mode 2021-12-23 21:03:58 -05:00
0960eaa507 Merge pull request '12-user-info-jwt' (#6) from 12-user-info-jwt into develop
Reviewed-on: https://gitea.fyloz.dev/ColorRecipesExplorer/Frontend/pulls/6
2021-12-22 16:27:46 -05:00
FyloZ
f04a3c7ba3
Fix mix editor did not get the materials from the correct location in update mode 2021-12-20 19:20:01 -05:00
FyloZ
82cb974d27
CI/CD 2021-12-15 22:32:40 -05:00
FyloZ
d239d37e66
Remote login/logout old components 2021-12-15 22:25:22 -05:00