Commit Graph

54 Commits (ff4a546e5f7f88cf88b3ae40d93f7a724a8d1273)

Author SHA1 Message Date
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 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
Sultan Khan b10e6184d6 Merge branch 'Fatima' 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
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 0786a1fa03 lint rules added. 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 427c5fb5b6 Pending Transactions implemented 3 years ago
Fatimah Alshammari 17ca565f4c Merge branch 'development_sultan' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
 Conflicts:
	lib/api/profile_api_client.dart
3 years ago
Fatimah Alshammari c3945d2583 family member in progress 3 years ago
Sultan Khan 9b213dc9ab Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan ea5178fe20 profle dynamic forms 3 years ago
haroon amjad 9e8bc47f7e Mowadhafhi request completed 3 years ago
haroon amjad cf523566cd Mowadhafi home & details page done 3 years ago
Sultan Khan f329f7030d Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan 23326a769a PHONE NUMBERS 3 years ago
Sikander Saleem ce7183a137 merge conflicts fixed. 3 years ago
Sikander Saleem 95e2e74fd0 Merge branch 'master' into development_sikander
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/my_attendance_screen.dart
#	lib/ui/work_list/worklist_detail_screen.dart
3 years ago
devmirza121 2010e9d6a0 Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/colors.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/attendance/monthly_attendance.dart
#	lib/ui/landing/dashboard.dart
#	lib/widgets/radio/show_radio.dart
#	pubspec.yaml
3 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 3 years ago
Sikander Saleem ae0a788728 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.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/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 3e6fdd2cb5 missing swipe added. 3 years ago
Sikander Saleem 1e9a26e3df missing swipe cont 3 years ago
Sultan Khan 979879a286 phone number is progress 3 years ago
Sikander Saleem 9cc86751eb missing swipe cont 3 years ago
Sultan Khan 8f80bbb9db profile dynamic forms 3 years ago
Sultan Khan 13150321d4 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sikander Saleem dadaeed10e dynamic forms cont. 3 years ago
Sultan Khan a0ccacf078 Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan fad58931f3 profile 3 years ago
Fatimah Alshammari 44c9a090f9 fix personal details 3 years ago
Sultan Khan 57f789ca6d Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Fatimah Alshammari 6529c2aeba profile pages 3 years ago
Sultan Khan 74c06203db Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Fatimah Alshammari 393e28b32c fix profile 3 years ago
Fatimah Alshammari b281efe14c fix monthly attendance 3 years ago
Sikander Saleem 25d020441c my attendance working cont-1 4 years ago
Sikander Saleem 807d4b4046 item creation added. 4 years ago
Sikander Saleem a431913bb6 purchase order & move order, item history & quotation analysis added. 4 years ago
Sikander Saleem 384aa8d9b4 wokrlist api's added & improvements 4 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & 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 6b9ea200ad login flow added. 4 years ago
devmirza121 b6670289b1 Dashboard API's 1.2 4 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 4 years ago