devmirza121
							
						 | 
						
							
							
							
							
								
							
								681fe7fb38
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/login/login_screen.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								48a261d674
								
							
								
							
						 | 
						
							
							
								
								Dashboard API's 1.4
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9215307ac5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							work list api's added.
See merge request mirza.shafique/mohem_flutter_app!15 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								83b26c1f77
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4b5ab2cd7f
								
							
								
							
						 | 
						
							
							
								
								wokrlist api's added & improvements
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								a4465a8c23
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/login/login_screen.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								c4b7046a90
								
							
								
							
						 | 
						
							
							
								
								Dashboard API's 1.3
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9248db1f78
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							login flow added
See merge request mirza.shafique/mohem_flutter_app!14 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								7027299a48
								
							
								
							
						 | 
						
							
							
								
								merge improvements
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e7a67cc58d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	pubspec.yaml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9c40878c4a
								
							
								
							
						 | 
						
							
							
								
								locale commited
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6b9ea200ad
								
							
								
							
						 | 
						
							
							
								
								login flow added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Mirza Shafique
							
						 | 
						
							
							
							
							
								
							
								66e3427401
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							Development mirza
See merge request mirza.shafique/mohem_flutter_app!13 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								b6670289b1
								
							
								
							
						 | 
						
							
							
								
								Dashboard API's 1.2
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								596ac1a875
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/development_mirza' into development_mirza
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								fb8d6c7b20
								
							
								
							
						 | 
						
							
							
								
								Dashboard API's 1.1
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Mirza Shafique
							
						 | 
						
							
							
							
							
								
							
								be8044878c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'main'
							
							
							
							
							
							
							
							Development mirza
See merge request mirza.shafique/mohem_flutter_app!12 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Mirza Shafique
							
						 | 
						
							
							
							
							
								
							
								dab7688adb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main' into 'development_mirza'
							
							
							
							
							
							
							
							# Conflicts:
#   README.md 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								baa7182655
								
							
								
							
						 | 
						
							
							
								
								Dashboard API's 1.0
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								ab25a98a9e
								
							
								
							
						 | 
						
							
							
								
								1.1
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								181d857347
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a678a0e26a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							api structure improvement.
See merge request mirza.shafique/mohem_flutter_app!11 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b5c9b83fdd
								
							
								
							
						 | 
						
							
							
								
								api structure improvement.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								a109a0529f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a9b28fcf7c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							api structure improvement
See merge request mirza.shafique/mohem_flutter_app!10 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								03ee5e0502
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								02be1cde49
								
							
								
							
						 | 
						
							
							
								
								api structure improvement.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d484c44edc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							loading icon added
See merge request mirza.shafique/mohem_flutter_app!9 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e3d331a223
								
							
								
							
						 | 
						
							
							
								
								loading icon added
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								c2ced77bca
								
							
								
							
						 | 
						
							
							
								
								shimmer
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a91db972ba
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							login apis, models & forgot password screen added.
See merge request mirza.shafique/mohem_flutter_app!8 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f1beefbc46
								
							
								
							
						 | 
						
							
							
								
								login apis, models & forgot password screen added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								58175e419e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							login apis and models added.
See merge request mirza.shafique/mohem_flutter_app!7 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								bf08417bfa
								
							
								
							
						 | 
						
							
							
								
								login apis and models added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Mirza Shafique
							
						 | 
						
							
							
							
							
								
							
								8cbc0a93ab
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							Request and Delegate sheets
See merge request mirza.shafique/mohem_flutter_app!6 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								22a9b3e818
								
							
								
							
						 | 
						
							
							
								
								Request and Delegate sheets
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								1e9416c992
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!5 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								cbe471c7b0
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c6ac45fc3d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/colors.dart
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/landing/dashboard.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b38f4287b6
								
							
								
							
						 | 
						
							
							
								
								today attendance progress added(cont)
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Mirza Shafique
							
						 | 
						
							
							
							
							
								
							
								825aef925f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							Development mirza
See merge request mirza.shafique/mohem_flutter_app!4 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								f89b186a69
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								af67440793
								
							
								
							
						 | 
						
							
							
								
								internal Work List screen 1.2
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								dcabb40811
								
							
								
							
						 | 
						
							
							
								
								internal Work List screen 1.0
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								88b86c66d5
								
							
								
							
						 | 
						
							
							
								
								internal Work List screen
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								ad1dd5370b
								
							
								
							
						 | 
						
							
							
								
								Work List screen
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3047f35341
								
							
								
							
						 | 
						
							
							
								
								dashboard ui added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b620c682a5
								
							
								
							
						 | 
						
							
							
								
								icons added & dashboard ui
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								01c3af5280
								
							
								
							
						 | 
						
							
							
								
								confirm login screen added & structure improvement.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								tall3at
							
						 | 
						
							
							
							
							
								
							
								80781c8e6d
								
							
								
							
						 | 
						
							
							
								
								internal Work List screen 1.2
							
							
							
							
							
						 | 
						
							4 years ago |