Commit Graph
627 Commits
Author SHA1 Message Date
romankko2 378bbfce03 bug 2023-11-08 17:19:27 +01:00
StudioTem 93f671818a Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app into production 2023-11-08 13:22:43 +01:00
StudioTem 5d35d14182 Merge branch 'production' of bitbucket.org:studiotem/jandl-taskmanager-app into production 2023-11-08 13:22:32 +01:00
romankko2 ad4f2b26c4 . 2023-10-20 17:19:37 +02:00
Filip Kaluža 9534b7fdc2 [timeline] line time indicators 2023-10-20 17:01:49 +02:00
romankko2 821689aa98 Merge 2023-10-18 23:53:57 +02:00
romankko2 1b46201360 Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production 2023-10-18 23:52:15 +02:00
romankko2 fa7ce51630 fixy 2023-10-18 23:51:29 +02:00
romankko2 31ab16d31a Merge 2023-10-12 17:34:03 +02:00
romankko2 8c98db79ff Merge branch 'production' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production 2023-10-12 17:32:19 +02:00
romankko2 c44029d463 ENV change 2023-10-12 17:31:45 +02:00
romankko2 dd13f0ae5e Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production 2023-10-12 17:29:47 +02:00
romankko2 3c2fc5c25f Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app 2023-10-12 17:28:45 +02:00
romankko2 bb7b59cc0e bugs + CR's 2023-10-12 17:28:05 +02:00
StudioTem cd9a557584 no message 2023-10-10 15:05:25 +02:00
StudioTem 811b2cb5a1 Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app 2023-10-10 15:04:26 +02:00
StudioTem 4c35390e92 no message 2023-10-10 15:03:22 +02:00
StudioTem 47ea415862 pri edite mastertasku zrusit ten if ktory maze subtasky 2023-10-10 15:03:12 +02:00
StudioTem 4cf09ba321 Merge branch 'production' of bitbucket.org:studiotem/jandl-taskmanager-app into production 2023-10-10 15:00:10 +02:00
romankko2 b4775e84bf Merge branch 'production' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production 2023-09-27 16:31:04 +02:00
romankko2 e6cd6a9278 Merge 2023-09-27 16:29:56 +02:00
romankko2 08c13d1470 Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production 2023-09-27 16:28:58 +02:00
romankko2 9974d8b9e4 fix mastertask creatu 2023-09-27 16:28:08 +02:00
StudioTem 7aa0b5fafd no message 2023-09-27 16:22:44 +02:00
StudioTem 2f6bff8ff1 no message 2023-09-27 16:13:27 +02:00
romankko2 5c74ad0111 Env fix 2023-09-27 16:12:18 +02:00
StudioTem ff4780f760 Merge branch 'production' of bitbucket.org:studiotem/jandl-taskmanager-app into production 2023-09-27 15:39:57 +02:00
StudioTem 5340fd58e1 no message 2023-09-27 15:39:36 +02:00
root 3b070323ac from server 2023-09-27 15:27:46 +02:00
root 14287d8de7 from server 2023-09-27 15:21:59 +02:00
StudioTem 1e8a0d8c0a no message 2023-09-27 15:20:01 +02:00
StudioTem 3c5ec91398 Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app into production 2023-09-27 15:18:14 +02:00
StudioTem f55d62dacf no message 2023-09-27 15:17:58 +02:00
StudioTem 0a4e6d404a no message 2023-09-27 14:51:16 +02:00
StudioTem 31d0a2d198 Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app into production 2023-09-27 14:23:44 +02:00
StudioTem 7b2ef89ead Merge branch 'production' of bitbucket.org:studiotem/jandl-taskmanager-app
# Conflicts:
#	app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
2023-09-27 14:23:05 +02:00
StudioTem 5ed4d64875 Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app 2023-09-27 14:18:53 +02:00
StudioTem 3ed25ab3e5 no message 2023-09-27 14:18:42 +02:00
Matej Glasnák 2f1328ca93 [Build] 2023-09-25 21:27:18 +02:00
romankko2 dd2e5ba625 . 2023-09-25 13:47:15 +02:00
romankko2 4a0590b4d6 build production 2023-09-25 13:40:39 +02:00
romankko2 f3985b741b [mastertask] edit fix 2023-09-25 12:46:10 +02:00
romankko2 ea53a36612 Merge branch 'main' into production 2023-09-25 11:02:24 +02:00
romankko2 de2c0ad8bf . 2023-09-21 17:04:50 +02:00
Filip Kaluža d2a19d3ef2 fix calendara v teams 2023-09-21 13:36:55 +02:00
Matej Glasnák 5cdb75002d [.gitignore] Added /dist to git 2023-09-19 19:19:04 +02:00
romankko2 b16ff2e34f fixy 2023-09-18 12:22:24 +02:00
romankko2 4ed354904c [CR] sorting v-select, [bugy] 2023-09-15 17:24:53 +02:00
romankko2 7c94f4c576 fixy 2023-09-13 12:40:15 +02:00
romankko2 24c2fdce91 [subtask] zmazanie employee pri create, [mastertask] prefill name & project_code pri vytvarani subtasku 2023-09-12 21:56:56 +02:00