NikoM1k
							
						 
					 | 
					
						
						
							
						
						ae9a2efd37
					 | 
					
						
						
							
							Merge pull request #72 from apuc/candidate-area
						
						
						
						
						
						
						
						Candidate area 
						
						
					 | 
					
						2023-04-19 22:43:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37d8ab385d
					 | 
					
						
						
							
							merge branch and partnerRequest candidate
						
						
						
						
						
						
					 | 
					
						2023-04-19 22:42:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f4ada281da
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/lk_candidate' into candidate-area
						
						
						
						
						
						
						
						# Conflicts:
#	src/App.js
#	src/components/Footer/footer.scss
#	src/components/ProfileHeader/ProfileHeader.js
#	src/pages/AuthForCandidate/authForCandidate.scss 
						
						
					 | 
					
						2023-04-19 20:37:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c847c3502
					 | 
					
						
						
							
							fix id
						
						
						
						
						
						
					 | 
					
						2023-04-19 20:22:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2d7730214
					 | 
					
						
						
							
							quiz + lk-candidate
						
						
						
						
						
						
					 | 
					
						2023-04-19 20:22:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						69a3f9a1cf
					 | 
					
						
						
							
							Merge pull request #71 from apuc/candidate-area
						
						
						
						
						
						
						
						Candidate area 
						
						
					 | 
					
						2023-04-18 14:02:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ae079e6bb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/update-modal-app' into candidate-area
						
						
						
						
						
						
					 | 
					
						2023-04-18 14:00:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5067746178
					 | 
					
						
						
							
							partnerRequests
						
						
						
						
						
						
					 | 
					
						2023-04-18 13:58:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						ab2ff123a0
					 | 
					
						
						
							
							Finished project menu
						
						
						
						
						
						
					 | 
					
						2023-04-14 15:52:21 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						e19ee11560
					 | 
					
						
						
							
							added new modal settings
						
						
						
						
						
						
					 | 
					
						2023-04-13 22:10:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						b91c8acd0c
					 | 
					
						
						
							
							Fixed candidate pages
						
						
						
						
						
						
					 | 
					
						2023-04-13 16:10:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						2e7375f18e
					 | 
					
						
						
							
							Added new modal Aspt and fixed pages/modals
						
						
						
						
						
						
					 | 
					
						2023-04-12 22:20:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						1e4e79897a
					 | 
					
						
						
							
							Finished update modal for tracker
						
						
						
						
						
						
					 | 
					
						2023-04-12 18:22:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						19865fb9e3
					 | 
					
						
						
							
							Added new ModalAdd
						
						
						
						
						
						
					 | 
					
						2023-04-10 21:22:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						45b45a2872
					 | 
					
						
						
							
							Merge pull request #70 from apuc/candidate-area
						
						
						
						
						
						
						
						fixes 
						
						
					 | 
					
						2023-04-10 18:56:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						418b268425
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-10 18:55:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						9cfcd2ab32
					 | 
					
						
						
							
							Merge pull request #69 from apuc/candidate-area
						
						
						
						
						
						
						
						fixes 
						
						
					 | 
					
						2023-04-10 18:50:00 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d0eda91f91
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-10 18:49:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						cdb1e373a3
					 | 
					
						
						
							
							Merge pull request #68 from apuc/candidate-area
						
						
						
						
						
						
						
						Candidate area 
						
						
					 | 
					
						2023-04-10 18:32:10 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57e877c5f2
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-10 18:31:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b99d7a4cdd
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/parthners-area-fix-tracker-modal' into candidate-area
						
						
						
						
						
						
						
						# Conflicts:
#	src/App.js
#	src/pages/Tracker/Tracker.js 
						
						
					 | 
					
						2023-04-10 18:20:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b65b42494
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-10 18:12:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						ae3416c4b2
					 | 
					
						
						
							
							Fixed auth page and adaptation freeDev
						
						
						
						
						
						
					 | 
					
						2023-04-10 18:08:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						b3cafc4d1c
					 | 
					
						
						
							
							Merge pull request #67 from apuc/candidate-area
						
						
						
						
						
						
						
						select skills on partnerRequest 
						
						
					 | 
					
						2023-04-09 05:06:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2e13c16c27
					 | 
					
						
						
							
							select skills on partnerRequest
						
						
						
						
						
						
					 | 
					
						2023-04-09 05:05:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						943bc1abea
					 | 
					
						
						
							
							Added page in free worker
						
						
						
						
						
						
					 | 
					
						2023-04-07 21:49:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						6a5ef23bef
					 | 
					
						
						
							
							Merge pull request #66 from apuc/candidate-area
						
						
						
						
						
						
						
						Candidate area 
						
						
					 | 
					
						2023-04-05 20:14:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						911d095120
					 | 
					
						
						
							
							new footer
						
						
						
						
						
						
					 | 
					
						2023-04-05 20:13:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ccab602ae4
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-04-05 19:38:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						802e48eb1f
					 | 
					
						
						
							
							Merge pull request #65 from apuc/candidate-area
						
						
						
						
						
						
						
						candidate auth 
						
						
					 | 
					
						2023-04-04 19:07:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e61ea043d
					 | 
					
						
						
							
							candidate auth
						
						
						
						
						
						
					 | 
					
						2023-04-04 19:07:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						8bd7bb7535
					 | 
					
						
						
							
							Fixed settings page and modals
						
						
						
						
						
						
					 | 
					
						2023-04-03 14:37:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						274177cf1f
					 | 
					
						
						
							
							Merge pull request #64 from apuc/parthners-area
						
						
						
						
						
						
						
						Parthners area 
						
						
					 | 
					
						2023-03-30 15:07:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						615606d3e6
					 | 
					
						
						
							
							new tracker
						
						
						
						
						
						
					 | 
					
						2023-03-30 15:07:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						9bab7d17cd
					 | 
					
						
						
							
							Fixed modal and added new img
						
						
						
						
						
						
					 | 
					
						2023-03-29 19:43:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						df9e1d5a23
					 | 
					
						
						
							
							Added modal registr
						
						
						
						
						
						
					 | 
					
						2023-03-28 20:42:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c1eb60d3ab
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area
						
						
						
						
						
						
					 | 
					
						2023-03-28 14:42:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						76334aec99
					 | 
					
						
						
							
							Fixed auth page and tracker
						
						
						
						
						
						
					 | 
					
						2023-03-27 19:08:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						3b8174d92d
					 | 
					
						
						
							
							Merge pull request #63 from apuc/parthners-area
						
						
						
						
						
						
						
						partner catalog and no requests block 
						
						
					 | 
					
						2023-03-27 16:31:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dedf0588b1
					 | 
					
						
						
							
							partner catalog and no requests block
						
						
						
						
						
						
					 | 
					
						2023-03-27 16:30:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						371124b0a1
					 | 
					
						
						
							
							Merge pull request #62 from apuc/parthners-area
						
						
						
						
						
						
						
						partner catalog and no requests block 
						
						
					 | 
					
						2023-03-27 16:21:14 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f4dc3a5f2
					 | 
					
						
						
							
							partner catalog and no requests block
						
						
						
						
						
						
					 | 
					
						2023-03-27 16:03:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						fc51fbdb09
					 | 
					
						
						
							
							Added func create new tiket
						
						
						
						
						
						
					 | 
					
						2023-03-24 19:26:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MaxOvs19
							
						 
					 | 
					
						
						
							
						
						a21063663c
					 | 
					
						
						
							
							Fixed modal
						
						
						
						
						
						
					 | 
					
						2023-03-23 21:18:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikoM1k
							
						 
					 | 
					
						
						
							
						
						cd6ec6df5d
					 | 
					
						
						
							
							Merge pull request #61 from apuc/parthners-area
						
						
						
						
						
						
						
						parthners area 
						
						
					 | 
					
						2023-03-23 15:50:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d07b9473c4
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-03-23 16:49:28 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd372b47ae
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area
						
						
						
						
						
						
						
						# Conflicts:
#	src/pages/PartnerSettings/PartnerSettings.js 
						
						
					 | 
					
						2023-03-23 16:47:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6419b9dd97
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2023-03-23 16:43:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						48bd4059df
					 | 
					
						
						
							
							partner employees
						
						
						
						
						
						
					 | 
					
						2023-03-23 16:18:57 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						850b0d1bb6
					 | 
					
						
						
							
							partner employees
						
						
						
						
						
						
					 | 
					
						2023-03-23 14:00:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |