Commit Graph

27 Commits

Author SHA1 Message Date
20b62e7312 Added users support 2025-08-19 07:24:18 +02:00
541b181c87 12 Added notes and colours to customers 2025-07-23 15:35:19 +02:00
84d43f0dac Merge branch '9-napraviti-lako-filtriranje-timova-na-kalendaru' into 'master'
Merge branch '8-podrska-za-boje-na-kalendaru' into 'master'

Closes #8 and #9

See merge request kbr4/zsterminator!7
2025-06-02 15:11:18 +00:00
307367ee67 Merge branch '10-omoguciti-pwa' into 'master'
Enable installing app as PWA

Closes #10

See merge request kbr4/zsterminator!8
2025-06-02 15:11:01 +00:00
Mirna Milic
5879bc3faf Enable installing app as pwa 2025-05-28 18:08:57 +02:00
f331b92f3a Merge branch '8-podrska-za-boje-na-kalendaru' into 'master'
Added colours for teams

Closes #8

See merge request kbr4/zsterminator!6
2025-04-24 21:20:28 +02:00
54da8c70e3 Merge branch '8-podrska-za-boje-na-kalendaru' into 'master'
Added colours for teams

Closes #8

See merge request kbr4/zsterminator!6
2025-04-24 05:20:14 +00:00
aa2a8b9f26 Added colours for teams 2025-04-24 07:04:42 +02:00
777a33836d Merge branch '7-prevesti-na-bosanski' into 'master'
Added translations to entire app

Closes #7

See merge request kbr4/zsterminator!5
2025-04-23 05:49:03 +00:00
58e78acbba Added translations to entire app 2025-04-23 07:46:05 +02:00
ce947100c6 Merge branch '6-nakon-kreiranja-rezervacije-otici-ponovo-na-kalendar' into 'master'
Redirect to reservation after created notification

Closes #6

See merge request kbr4/zsterminator!4
2025-04-23 05:44:26 +00:00
dc51f532a4 Redirect to reservation after created notification 2025-04-22 08:23:29 +02:00
defe45f631 Merge branch '5-napraviti-da-kreiranje-radi-bez-dugmeta-new-reservation' into 'master'
Resolve "Napraviti da kreiranje radi bez dugmeta "new reservation""

Closes #5 and #2

See merge request kbr4/zsterminator!3
2025-04-22 05:48:54 +00:00
712d886866 Merge branch '2-napraviti-dodavanje-termina' into 'master'
Added customer composite key

Closes #2

See merge request kbr4/zsterminator!2
2025-04-18 07:59:29 +02:00
83a7d1e004 Merge branch '2-napraviti-dodavanje-termina' into 'master'
Added customer composite key

Closes #2

See merge request kbr4/zsterminator!2
2025-03-03 19:04:30 +00:00
Nedim
92a61159ca Added customer composite key 2025-03-03 19:38:57 +01:00
a28cdc6a6d Merge branch 'rubcop' into 'master'
Rubocop rules

See merge request kbr4/zsterminator!1
2025-02-17 21:04:47 +00:00
Nedim
ee89170c32 Rubocop rules 2025-02-17 19:12:40 +01:00
ef01db0700 solve conflicts 2024-10-12 06:40:18 +02:00
87020d2d91 update gitignore 2024-10-12 06:37:52 +02:00
fb7d879736 remove .idea 2024-10-12 06:36:53 +02:00
Senad Uka
ef4243ee2a Reservations now show on calendar 2024-09-08 14:00:15 +02:00
Senad Uka
b258de57fb Fix problem with scrolling 2024-09-07 09:10:51 +02:00
dfaf7dc870 Calendar is shown 2024-08-24 07:06:09 +02:00
e0d9d3a6b9 Calendar is fullscreen 2024-08-11 14:18:36 +02:00
6d5509856f Rezervacije 2024-08-06 14:16:40 +02:00
8d5a410c60 Kompanije rade 2024-08-04 07:06:03 +02:00