| 
						
					 | 
					
						
						
							
						
						abefc8ce51
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2023-06-13 00:50:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						72ded765cd
					 | 
					
						
						
							
							Merge pull request #99 from apuc/tracker-connect-back
						
						
						
						
						
						
						
						fix 
						
						
					 | 
					
						2023-06-12 23:52:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46391d0d35
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2023-06-12 23:52:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						04beac5dbd
					 | 
					
						
						
							
							Merge pull request #98 from apuc/tracker-connect-back
						
						
						
						
						
						
						
						Tracker connect back 
						
						
					 | 
					
						2023-06-12 23:30:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b99da9261
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2023-06-12 23:30:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5c742411d5
					 | 
					
						
						
							
							Merge branch 'main' into tracker-connect-back
						
						
						
						
						
						
						
						# Conflicts:
#	src/assets/images/accept.png
#	src/assets/images/mainTaskCommentImg.png
#	src/components/Modal/TrackerModal/TrackerModal.jsx
#	src/components/UI/ModalTicket/ModalTicket.jsx
#	src/components/UI/TicketFullScreen/TicketFullScreen.jsx
#	src/pages/ProjectTracker/ProjectTracker.js
#	src/redux/projectsTrackerSlice.js 
						
						
					 | 
					
						2023-06-12 22:22:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7cb0195f1d
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2023-06-12 22:14:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						714d33ac9a
					 | 
					
						
						
							
							img
						
						
						
						
						
						
					 | 
					
						2023-06-10 04:08:14 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f4b55a5d79
					 | 
					
						
						
							
							fix task modal and column priority
						
						
						
						
						
						
					 | 
					
						2023-06-09 03:19:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						32d6bbc345
					 | 
					
						
						
							
							Merge pull request #97 from apuc/add-husky-eslint
						
						
						
						
						
						
						
						Add husky and eslint 
						
						
					 | 
					
						2023-06-02 19:47:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e0a44e5a4
					 | 
					
						
						
							
							add comments to tasks
						
						
						
						
						
						
					 | 
					
						2023-06-01 03:21:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						2c7c5c7d5c
					 | 
					
						
						
							
							Added husky
						
						
						
						
						
						
					 | 
					
						2023-05-31 11:32:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						9e242ddf5d
					 | 
					
						
						
							
							Added eslint
						
						
						
						
						
						
					 | 
					
						2023-05-31 11:24:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						fc8fc33733
					 | 
					
						
						
							
							Added prettier format imports
						
						
						
						
						
						
					 | 
					
						2023-05-31 08:36:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						fe656c0360
					 | 
					
						
						
							
							Merge pull request #96 from apuc/fix-img-and-components
						
						
						
						
						
						
						
						Fix img, components and project structures 
						
						
					 | 
					
						2023-05-30 12:14:44 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						4da0fd345b
					 | 
					
						
						
							
							Fixed prettier
						
						
						
						
						
						
					 | 
					
						2023-05-30 12:13:59 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						09babcb096
					 | 
					
						
						
							
							Fixed imports in pages
						
						
						
						
						
						
					 | 
					
						2023-05-30 10:54:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						11b91ef627
					 | 
					
						
						
							
							Fixed imports all components
						
						
						
						
						
						
					 | 
					
						2023-05-30 10:10:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						3fc1faff5f
					 | 
					
						
						
							
							Fixed webpack common.js for imports project
						
						
						
						
						
						
					 | 
					
						2023-05-30 08:05:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c55a697f6b
					 | 
					
						
						
							
							timer with comments
						
						
						
						
						
						
					 | 
					
						2023-05-30 03:32:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						72f5b59719
					 | 
					
						
						
							
							Test imports
						
						
						
						
						
						
					 | 
					
						2023-05-29 18:30:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						5865c59ba3
					 | 
					
						
						
							
							Moving components and creating jsconfig
						
						
						
						
						
						
					 | 
					
						2023-05-29 15:01:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						3b605280b2
					 | 
					
						
						
							
							Moving components out of a folder UI
						
						
						
						
						
						
					 | 
					
						2023-05-29 09:37:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						85accc3111
					 | 
					
						
						
							
							Added ui btn and fixed Modals
						
						
						
						
						
						
					 | 
					
						2023-05-26 19:59:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						81129538ed
					 | 
					
						
						
							
							Moving fonts
						
						
						
						
						
						
					 | 
					
						2023-05-25 17:26:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						38f776019c
					 | 
					
						
						
							
							Moving all images to assets
						
						
						
						
						
						
					 | 
					
						2023-05-25 16:42:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						0667b435ac
					 | 
					
						
						
							
							Convert personal img in svg
						
						
						
						
						
						
					 | 
					
						2023-05-25 10:57:57 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						3be7d42cfc
					 | 
					
						
						
							
							Delete old files
						
						
						
						
						
						
					 | 
					
						2023-05-24 19:59:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						f88b22cb84
					 | 
					
						
						
							
							Fixed full components
						
						
						
						
						
						
					 | 
					
						2023-05-24 19:23:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						70b3845755
					 | 
					
						
						
							
							Fixed prod
						
						
						
						
						
						
					 | 
					
						2023-05-24 16:10:32 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						1102d01284
					 | 
					
						
						
							
							Merge pull request #95 from apuc/fix
						
						
						
						
						
						
						
						task add users 
						
						
					 | 
					
						2023-05-24 16:04:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						683377fb6a
					 | 
					
						
						
							
							task add users
						
						
						
						
						
						
					 | 
					
						2023-05-24 16:04:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						2ad78834f3
					 | 
					
						
						
							
							Fixed copmonents
						
						
						
						
						
						
					 | 
					
						2023-05-24 15:34:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						08f7d13f01
					 | 
					
						
						
							
							Fixed img in components
						
						
						
						
						
						
					 | 
					
						2023-05-24 13:49:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						2aa2b15d2d
					 | 
					
						
						
							
							Merge pull request #94 from apuc/tracker-connect-back
						
						
						
						
						
						
						
						task add users 
						
						
					 | 
					
						2023-05-24 01:44:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b9301ecce3
					 | 
					
						
						
							
							task add users
						
						
						
						
						
						
					 | 
					
						2023-05-24 01:43:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						43d6e8b4f4
					 | 
					
						
						
							
							Merge pull request #93 from apuc/tracker-connect-back
						
						
						
						
						
						
						
						task add users 
						
						
					 | 
					
						2023-05-24 01:24:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18506ce90b
					 | 
					
						
						
							
							task add users
						
						
						
						
						
						
					 | 
					
						2023-05-24 01:23:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						5c47c78599
					 | 
					
						
						
							
							Merge pull request #92 from apuc/tracker-connect-back
						
						
						
						
						
						
						
						task add users 
						
						
					 | 
					
						2023-05-24 01:21:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60354a3d09
					 | 
					
						
						
							
							task add users
						
						
						
						
						
						
					 | 
					
						2023-05-24 01:20:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						5af1562917
					 | 
					
						
						
							
							Merge pull request #91 from apuc/tracker-connect-back
						
						
						
						
						
						
						
						Tracker connect back 
						
						
					 | 
					
						2023-05-23 23:03:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c55376ecb3
					 | 
					
						
						
							
							tracker
						
						
						
						
						
						
					 | 
					
						2023-05-23 23:02:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						a71aff2cd2
					 | 
					
						
						
							
							Merge pull request #87 from apuc/faq
						
						
						
						
						
						
						
						Faq add 
						
						
					 | 
					
						2023-05-23 17:26:21 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						0b734c1a34
					 | 
					
						
						
							
							Fixed conflicts
						
						
						
						
						
						
					 | 
					
						2023-05-23 17:15:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor
							
						 
					 | 
					
						
						
							
						
						1e101b7f4c
					 | 
					
						
						
							
							remove unused
						
						
						
						
						
						
					 | 
					
						2023-05-23 16:45:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor
							
						 
					 | 
					
						
						
							
						
						a7059a5fc3
					 | 
					
						
						
							
							add .prettierrc
						
						
						
						
						
						
					 | 
					
						2023-05-23 16:12:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						9932720fd8
					 | 
					
						
						
							
							Merge pull request #88 from apuc/fix-report-page
						
						
						
						
						
						
						
						Fixed report page and calendar component 
						
						
					 | 
					
						2023-05-18 19:53:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						c62ae06d20
					 | 
					
						
						
							
							Bugs fixed
						
						
						
						
						
						
					 | 
					
						2023-05-18 19:52:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						973f140451
					 | 
					
						
						
							
							Pull from  main page
						
						
						
						
						
						
					 | 
					
						2023-05-18 18:40:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						152d4a257f
					 | 
					
						
						
							
							Finish working in report page
						
						
						
						
						
						
					 | 
					
						2023-05-18 18:38:02 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |