Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								cc6769805a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0d812cf266
								
							
								
							
						 | 
						
							
							
								
								Vacation rule added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4ebba3900c
								
							
								
							
						 | 
						
							
							
								
								dashboard improvements, monthly attendance & vacation rule added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5efce66cfb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!45 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3efae797c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								04520250a5
								
							
								
							
						 | 
						
							
							
								
								badge on work list in bottom navigation bar.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c92cd5c20c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!44 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								68146ecd97
								
							
								
							
						 | 
						
							
							
								
								dynamic forms finalized & improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								48de28c0b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f905e67c4c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' into 'master'
							
							
							
							
							
							
							
							Fatima
See merge request mirza.shafique/mohem_flutter_app!43 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								aca788ae26
								
							
								
							
						 | 
						
							
							
								
								fix translations
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								2e5a8e7a6b
								
							
								
							
						 | 
						
							
							
								
								fix issue.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c390d87fca
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d5b1512eb4
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5bdd7bb71f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							Development mirza
See merge request mirza.shafique/mohem_flutter_app!41 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								7ca9096d89
								
							
								
							
						 | 
						
							
							
								
								Merge issue 2.0
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								8fe51a654c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								4dc4a3fafb
								
							
								
							
						 | 
						
							
							
								
								Merge issue 1.0
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								1604cba140
								
							
								
							
						 | 
						
							
							
								
								fix translation.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								2b93d43380
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								57bf34a93a
								
							
								
							
						 | 
						
							
							
								
								fix translation.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								3c777d220e
								
							
								
							
						 | 
						
							
							
								
								basic details
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								1ef3783fb9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into Fatima
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/profile_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/profile/delete_familyMember.dart
#	lib/ui/profile/family_members.dart
#	lib/ui/profile/phone_numbers.dart
#	lib/ui/screens/profile/profile_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								30ca1894db
								
							
								
							
						 | 
						
							
							
								
								fix issues.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0b2a87aaaf
								
							
								
							
						 | 
						
							
							
								
								dynamic forms logic improvement.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								d74d8ff369
								
							
								
							
						 | 
						
							
							
								
								fixed footer design.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								b10e6184d6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								26bbff6844
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								23110b792f
								
							
								
							
						 | 
						
							
							
								
								completed add and update family member
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								2ced8313da
								
							
								
							
						 | 
						
							
							
								
								QR, Digital Card & Employee ID Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								56f111ca70
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!40 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a7d40a696e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2f013ba1ad
								
							
								
							
						 | 
						
							
							
								
								lint rules added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								06b14394bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e6e150b9e3
								
							
								
							
						 | 
						
							
							
								
								address phone numbers
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								04b7ef894f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!39 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9940633a72
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0786a1fa03
								
							
								
							
						 | 
						
							
							
								
								lint rules added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								8a3c964664
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!38 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9afe722bf1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2966ca129c
								
							
								
							
						 | 
						
							
							
								
								monthly pay slip improvement
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								70c5ecf678
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							monthly pay slip added.
See merge request mirza.shafique/mohem_flutter_app!37 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f1c36b5821
								
							
								
							
						 | 
						
							
							
								
								monthly pay slip added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								a4ca7433a4
								
							
								
							
						 | 
						
							
							
								
								add and update family member in progress
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6d1b942dca
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								d614532956
								
							
								
							
						 | 
						
							
							
								
								Announcements implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9362f8bf91
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							pubspec update
See merge request mirza.shafique/mohem_flutter_app!36 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								556215807b
								
							
								
							
						 | 
						
							
							
								
								pubspec update
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2adb1e34bf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							Development haroon
See merge request mirza.shafique/mohem_flutter_app!35 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e045374703
								
							
								
							
						 | 
						
							
							
								
								Not found svg added, Pending transactions, Announcements.
							
							
							
							
							
						 | 
						
							3 years ago |