Commit Graph

114 Commits (bbaca492f5df07be8f9fe088927e567f2a339903)

Author SHA1 Message Date
haroon amjad f6c9b6dce9 Updates & fixes 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
Sikander Saleem a45b6aece2 improvements 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
Sikander Saleem 3cd3aaa6d3 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/extensions/string_extensions.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
Sikander Saleem 2ce3c535d2 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
3 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 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 2f6e40da46 add leave balance cont. 3 years ago
Sikander Saleem 9186e3cdaa leave balance validate model added. 3 years ago
Sikander Saleem 41a1ba125e code improvements. 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
Fatimah Alshammari 416a33b2fd fix design 3 years ago
haroon amjad 50f203cd55 Updates & fixes 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 2278a1e98f Merge remote-tracking branch 'origin/development_sikander' into development_sikander
# Conflicts:
#	lib/ui/leave_balance/add_leave_balance_screen.dart
3 years ago
Sikander Saleem d5c8604f32 leave balance cont3. 3 years ago
Sikander Saleem a14103b859 leave balance cont3. 3 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 3 years ago
Sikander Saleem 8855eb7622 leave balance cont2. 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
haroon amjad a855e535cd Item for sale implemented 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 8247032a52 profile options linked with home page personal information. 3 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 3 years ago
haroon amjad 40cdaca0ef Merge branch 'master' into development_haroon 3 years ago
haroon amjad 5c15d07dc8 updates 3 years ago
Sikander Saleem 4edb19c2bb Vacation rule added cont. 3 years ago
Sikander Saleem 55f1f792f9 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/models/profile_menu.model.dart
3 years ago
Sikander Saleem 3fcbd9946a configs for ios. 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
Sikander Saleem 48de28c0b3 Merge branch 'master' into development_sikander 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