Commit Graph

100 Commits (9362859013be51abae21fe160a2cec8b8980199f)

Author SHA1 Message Date
Sikander Saleem 9362859013 CEI notification body added. 10 months ago
Sikander Saleem 3e19508c5e child education assistance added. 10 months ago
Sultan khan 423e8551f1 changes updated 1 year ago
Sultan khan c86d9f4678 termination work-list fixed 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
haroon amjad d49a030580 PR details from PO implemented 3 years ago
haroon amjad 3b6f3f5c4f Address info issue fixed 3 years ago
Fatimah Alshammari ba1a5c66ef fix issues 3 years ago
Fatimah Alshammari 9ecdd6b11d Merge branch 'master' into fatima
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
3 years ago
Fatimah Alshammari 22ac89e744 fix issues 3 years ago
haroon amjad 21d396b3bb Worklist updates 3 years ago
Fatimah Alshammari 0cca8ec935 fix issues 3 years ago
Fatimah Alshammari 69ded3dc43 fix my request 3 years ago
Fatimah Alshammari f515c0b39a Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 years ago
Fatimah Alshammari 1b13b732b8 fix issues 3 years ago
haroon amjad 109c0ca0a2 PR PO fixes, Worklist fixes 3 years ago
Sikander Saleem f0ec4843b4 end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 3 years ago
Sultan khan ca3febeccd Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
Sultan khan 8d9561b570 COC changes 3 years ago
Fatimah Alshammari be506fa059 fix issues 3 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard added. 3 years ago
Sultan Khan 70a7108d9c Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
3 years ago
haroon amjad fb2924964b Merge branch 'master' into development_haroon
# Conflicts:
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
3 years ago
Fatimah Alshammari 07636bef77 Merge branch 'master' into Fatima 3 years ago
Sikander Saleem ee2c74b5da leave balance submit request added. 3 years ago
Sikander Saleem cf7843191b leave balance added. 3 years ago
Fatimah Alshammari bee1aef03e Merge branch 'master' into Fatima
# Conflicts:
#	lib/models/get_user_item_type_list.dart
#	lib/models/my_team/get_attendance_tracking_list_model.dart
#	lib/models/my_team/get_employee_subordinates_list.dart
#	lib/models/update_item_type_success_list.dart
#	lib/models/update_user_item_type_list.dart
#	lib/models/worklist/update_user_type_list.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/contact_details.dart
3 years ago
Fatimah Alshammari d640ce29de fix issue 3 years ago
Sikander Saleem 9186e3cdaa leave balance validate model added. 3 years ago
Sikander Saleem 9314ea0514 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
3 years ago
Fatimah Alshammari 89058f9e59 Merge branch 'master' into Fatima 3 years ago
haroon amjad a05d037211 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/colors.dart
#	lib/extensions/string_extensions.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	lib/ui/screens/announcements/announcements.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
#	lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
3 years ago
Sikander Saleem a14103b859 leave balance cont3. 3 years ago
Sikander Saleem 8855eb7622 leave balance cont2. 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
Fatimah Alshammari dc880df35a Merge branch 'master' into Fatima
# Conflicts:
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/models/profile_menu.model.dart
3 years ago
Fatimah Alshammari a22f679908 my team module and workList settings 3 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 3 years ago
haroon amjad 5c15d07dc8 updates 3 years ago
Sikander Saleem 4edb19c2bb Vacation rule added cont. 3 years ago
Sultan Khan 39b916bcc8 performance page added 3 years ago
haroon amjad 1719c7029e Merge branch 'master' into development_haroon
# Conflicts:
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	pubspec.yaml
3 years ago
haroon amjad c63844dcf7 My requests & CCP 3 years ago
Fatimah Alshammari 0820f87877 Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari d1cc9bd468 fix issue 3 years ago
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