Commit Graph

35 Commits (a22f679908104f386eac0c8c971abbfc01009c83)

Author SHA1 Message Date
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 e045374703 Not found svg added, Pending transactions, Announcements. 3 years ago
haroon amjad 427c5fb5b6 Pending Transactions implemented 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
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 1e9a26e3df missing swipe cont 3 years ago
Sultan Khan 8f80bbb9db profile dynamic forms 3 years ago
Sultan Khan b5a5399b95 profile 3 years ago
Fatimah Alshammari 1305e895a1 fix arabic translation 3 years ago
Sultan Khan fad58931f3 profile 3 years ago
Sultan Khan 6e86c0ba38 profile details 3 years ago
Sultan Khan 49bc689351 Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sultan Khan 06b3726d4a Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sultan Khan 0974861463 updated menus 4 years ago
Sikander Saleem a431913bb6 purchase order & move order, item history & quotation analysis added. 4 years ago
Sultan Khan da6b935c0b subpages changes 4 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 4 years ago