Commit Graph

95 Commits (4c1927bee503c483cdd6592b69f1bfba610883bd)

Author SHA1 Message Date
haroon amjad f6c9b6dce9 Updates & fixes 3 years ago
Sikander Saleem 9ce042e7d3 bussiness card improvement. 3 years ago
Sikander Saleem 692a105bad ios fixes-2 3 years ago
haroon amjad eb29553d26 NFC Fixes 3 years ago
haroon amjad b0b84c572c Last Login Fixes 3 years ago
Fatimah Alshammari ff623b12ad Merge branch 'master' into Fatima
# Conflicts:
#	lib/ui/landing/widget/app_drawer.dart
3 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
Sikander Saleem 97bd497866 Merge branch 'master' into development_sikander 3 years ago
Fatimah Alshammari 8fa4670392 fix issues 3 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard added. 3 years ago
Sikander Saleem 2eedef7c2c Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation 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 b79edd701c code improvement & translation added. 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 6be8510b86 drawer menu ui changed. 3 years ago
Sikander Saleem af170b2b02 missing swipe,ticket balance home screen item linked with corresponding screen. 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
haroon amjad 52438ce711 offers & discounts implemented 3 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 3 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 3 years ago
Sikander Saleem c0ec2260e5 mark attendance improvement. 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
haroon amjad a855e535cd Item for sale implemented 3 years ago
Fatimah Alshammari 8aa14618d4 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima 3 years ago
Sikander Saleem 9b50c2cf31 mark attendance improvement. 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 18084ce29f services menu structure improvements. 3 years ago
haroon amjad 40cdaca0ef Merge branch 'master' into development_haroon 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 058e287b25 fix translation 3 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari b502e038a5 fix issue 3 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 3 years ago
Sikander Saleem 04520250a5 badge on work list in bottom navigation bar. 3 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 3 years ago
Fatimah Alshammari aca788ae26 fix translations 3 years ago
devmirza121 7ca9096d89 Merge issue 2.0 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
devmirza121 4dc4a3fafb Merge issue 1.0 3 years ago
Fatimah Alshammari 57bf34a93a fix translation. 3 years ago