|  |  |  | @b1e633f | 2 months | borismanev03 | bug fixes, pharmacist panel, branded medicine details.
                main | 
            
              |  |  | @bff4de4 | 2 months | noreply | Merge pull request #12 from NorksX/feature/bug-fixes
Fixed bugs in …
                main | 
            
              |  |  | @79f8495 | 2 months | a.gjurcinova9 | Fixed bugs in medicine interactions
                main | 
            
              |  |  | @d12bbae | 2 months | noreply | Merge pull request #11 from NorksX/bugfixes
small bug fixes
                main | 
            
              |  |  | @35e2a26 | 2 months | borismanev03 | small bug fixes
                main | 
            
              |  |  | @32d6a94 | 2 months | noreply | Merge pull request #10 from NorksX/feature/registration
Implemented …
                main | 
            
              |  |  | @f18f0d5 | 2 months | a.gjurcinova9 | Implemented registration for clients
                main | 
            
              |  |  | @cba2493 | 2 months | noreply | Merge pull request #9 from NorksX/shoppingcart
Translated html (need …
                main | 
            
              |  |  | @dd0877c | 2 months | borismanev03 | Translated html (need to review tomorrow), added supply order logic. …
                main | 
            
              |  |  | @aa29b78 | 2 months | noreply | Merge pull request #8 from NorksX/shoppingcart
Shoppingcart
                main | 
            
              |  |  | @4a13d36 | 2 months | borismanev03 | Fixes
                main | 
            
              |  |  | @1e83903 | 2 months | borismanev03 | Merge remote-tracking branch 'origin/main'
# Conflicts: …
                main | 
            
              |  |  | @ac37cef | 2 months | borismanev03 | shopping cart club card implementation
                main | 
            
              |  |  | @718f543 | 2 months | noreply | Merge pull request #7 from NorksX/feature/security
switched to …
                main | 
            
              |  |  | @e944b43 | 2 months | a.gjurcinova9 | Controllers fix after jsession security
                main | 
            
              |  |  | @5e1075d | 2 months | a.gjurcinova9 | switched to jsession security
                main | 
            
              |  |  | @a2fc3d8 | 2 months | noreply | Merge pull request #6 from NorksX/feature/payment-service
Fixed bugs
                main | 
            
              |  |  | @fe7e82f | 2 months | a.gjurcinova9 | Fixed bugs
                main | 
            
              |  |  | @8e5e404 | 2 months | borismanev03 | Prescription, verification added, shopping cart updated, controller …
                main | 
            
              |  |  | @8b8dd49 | 2 months | noreply | Merge pull request #5 from NorksX/feature/payment-service
 …
                main | 
            
              |  |  | @0b0cd4e | 2 months | noreply | Merge pull request #4 from NorksX/feature/shopping-cart
 …
                main | 
            
              |  |  | @abb9ec8 | 2 months | noreply | Merge pull request #3 from NorksX/feature/medicine-interactions
 …
                main | 
            
              |  |  | @95f6078 | 2 months | a.gjurcinova9 | Implemented payment service
                main | 
            
              |  |  | @66bed65 | 2 months | a.gjurcinova9 | Implemented a shopping cart and its functionalities
                main | 
            
              |  |  | @a39e417 | 2 months | a.gjurcinova9 | Added redis configuration for jwt
                main | 
            
              |  |  | @a6008b0 | 2 months | a.gjurcinova9 | Added medicine interactions + fixed bugs
                main | 
            
              |  |  | @7be83a2 | 2 months | a.gjurcinova9 | Merge branch 'main' of https://github.com/NorksX/SynergyMed into …
                main | 
            
              |  |  | @fa9c17a | 2 months | a.gjurcinova9 | Added medicine interactions
                main | 
            
              |  |  | @5682fcc | 2 months | borismanev03 | header WIP
                main | 
            
              |  |  | @ed4e8e4 | 2 months | borismanev03 | Merge branch 'feature/health-profile-impl' of …
                main | 
            
              |  |  | @e0f42d2 | 2 months | borismanev03 | Company controller and html added
                main | 
            
              |  |  | @1cdd6db | 2 months | a.gjurcinova9 | Added health profile management
                main | 
            
              |  |  | @12ce021 | 2 months | noreply | Merge pull request #2 from NorksX/feature/health-profile-impl
 …
                main | 
            
              |  |  | @66ad712 | 2 months | noreply | Merge pull request #1 from NorksX/feature/jwt-authentication
Added …
                main | 
            
              |  |  | @6c7d594 | 2 months | noreply | Merge branch 'main' into feature/jwt-authentication
                main | 
            
              |  |  | @30a24d5 | 2 months | borismanev03 | fixed home page
                main | 
            
              |  |  | @7f37d04 | 2 months | a.gjurcinova9 | Added a user profile, health profile, admin panel + health profile creation
                main | 
            
              |  |  | @0316dec | 2 months | borismanev03 | added company services, main page, branded medicine services. Broken …
                main | 
            
              |  |  | @58f1801 | 2 months | a.gjurcinova9 | Fixed jwt and added login page
                main | 
            
              |  |  | @1039842 | 2 months | a.gjurcinova9 | Added JWT authentication
                main | 
            
              |  |  | @c87db71 | 2 months | borismanev03 | initial commit
                main |