Commit Graph

67 Commits (9ecdd6b11d18f09f44cd8486ca9ec680644c1173)

Author SHA1 Message Date
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 69ded3dc43 fix my request 3 years ago
haroon amjad 588e8f51f0 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 8b0bae0891 Worklist updates 3 years ago
Fatimah Alshammari af56d8f71b fix issues 3 years ago
haroon amjad f07167e734 Leave balance fix, Items for sale fix 3 years ago
Sikander Saleem ba65fbb79d Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 13e9c5fa21 centering issue in dynamic list view screen fixed. 3 years ago
haroon amjad e65beebfe8 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
haroon amjad 866bb8a29e Pull to refresh, Items for Sale & Offers n Discounts fixes 3 years ago
Sikander Saleem e8c8c225c7 icon direction bug fixes 3 years ago
haroon amjad f6c9b6dce9 Updates & fixes 3 years ago
Sikander Saleem 9ce042e7d3 bussiness card improvement. 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
Sikander Saleem cbcb3cdc00 item for sale improvement cont. 3 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation added. 3 years ago
Sikander Saleem f647b32c65 item for sale improvement. 3 years ago
Sikander Saleem b79edd701c code improvement & translation added. 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
haroon amjad 7c0589ef32 Announcement details fixes 3 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
haroon amjad a855e535cd Item for sale implemented 3 years ago
Sikander Saleem fc6b923fc4 mowadhafhi improvement. 3 years ago
Sikander Saleem 20f7d98ce5 profile improvements 3 years ago
Sikander Saleem 11bd7a7085 improvements. 3 years ago
haroon amjad 5c15d07dc8 updates 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
Sikander Saleem fabb847fd8 Merge branch 'development_sultan' into 'master'
Development sultan

See merge request mirza.shafique/mohem_flutter_app!49
3 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan 1137e585e3 update button check 3 years ago
Fatimah Alshammari 058e287b25 fix translation 3 years ago
Fatimah Alshammari aca788ae26 fix translations 3 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
3 years ago
Fatimah Alshammari 57bf34a93a fix translation. 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 26bbff6844 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 3 years ago
Sikander Saleem 2f013ba1ad lint rules added. 3 years ago
Sultan Khan 06b14394bd Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 3 years ago
haroon amjad d614532956 Announcements implemented 3 years ago
haroon amjad e045374703 Not found svg added, Pending transactions, Announcements. 3 years ago
haroon amjad 427c5fb5b6 Pending Transactions implemented 3 years ago