Commit Graph

93 Commits (ed15ce92b6759fb378956ee49cccacc6613288ec)

Author SHA1 Message Date
haroon amjad e8043f6980 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!54
3 years ago
Fatimah Alshammari ba1a5c66ef fix issues 3 years ago
haroon amjad c436908d25 updates & fixes 3 years ago
Sultan khan 89812c0f72 Worklist changes 3 years ago
Sultan khan 4b79c6eda3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan c7d2b0aa8a Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
haroon amjad 37ff4db9f6 Merge branch 'master' into development_haroon 3 years ago
Sultan khan e9edc80eae Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan a0201efbfb dynamic screen updated 3 years ago
Fatimah Alshammari 965edf9141 fix issues 3 years ago
Fatimah Alshammari 53fb8605d8 Merge branch 'master' into fatima
# Conflicts:
#	lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
3 years ago
Fatimah Alshammari c83f0c1199 fix issues 3 years ago
haroon amjad b834c52b5f Updated Profile screen 3 years ago
haroon amjad 7cc110b9a1 JIRA fixes 3 years ago
Fatimah Alshammari 0cca8ec935 fix issues 3 years ago
haroon amjad 1a2c9d1b15 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!37
3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
Fatimah Alshammari 69ded3dc43 fix my request 3 years ago
haroon amjad c87a00df6a Jira fixes 3 years ago
Fatimah Alshammari 2d40ede37f fix issues 3 years ago
Fatimah Alshammari 2002359ff1 fix issues 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 7b4fe5bcbc fix issues 3 years ago
haroon amjad aabc86290a Language change option added in app drawer 3 years ago
haroon amjad 4024e5fd3f updates & fixes 3 years ago
Sultan khan eaae618f25 bug fixes 3 years ago
Sultan khan 398880c4ad bug fixes 3 years ago
Sikander Saleem bf7a18b91c action colors added. contact details improvement 3 years ago
Fatimah Alshammari 53dabdd853 Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari be506fa059 fix issues 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
Fatimah Alshammari c2142c9997 fix issues 3 years ago
Fatimah Alshammari 8fa4670392 fix issues 3 years ago
Fatimah Alshammari ffba702cf9 fix issues 3 years ago
Fatimah Alshammari b7685295d9 fix design issues 3 years ago
Sikander Saleem cfe0460ea5 my team issues fixed 3 years ago
Fatimah Alshammari 6a1f655b1f Merge branch 'master' into Fatima 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 b79edd701c code improvement & translation added. 3 years ago
Fatimah Alshammari 83b51ae589 fix design issues 3 years ago
Fatimah Alshammari 907b205d21 added subordinate leave 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 41a1ba125e code improvements. 3 years ago
Fatimah Alshammari 89058f9e59 Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari 416a33b2fd fix design 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