Commit Graph

159 Commits (master)

Author SHA1 Message Date
haroon amjad f6df04c432 Merge branch 'master_mohemm_flutter' into mohemm_HMG_flutter_upgrade
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
3 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 3 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 3 months ago
Aamir Muhammad d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
3 months ago
Aamir Muhammad f61817937b tickt booking implementation 3 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 3 months ago
Aamir Muhammad cd36d61640 logins apis 4 months ago
haroon amjad 5e3477da4c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
4 months ago
haroon amjad dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 4 months ago
Sultan khan b2ffa0c619 Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/dialogs/otp_dialog.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/theme/app_theme.dart
#	lib/ui/attendance/monthly_attendance_screen.dart
#	lib/ui/chat/chat_home_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/delete_family_member.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/ui/work_list/worklist_detail_screen.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	lib/widgets/app_bar_widget.dart
#	lib/widgets/image_picker.dart
#	lib/widgets/nfc/nfc_reader_sheet.dart
#	pubspec.yaml
4 months ago
haroon amjad 966c635cb0 App update to stores, Version ID 9.0 4 months ago
Sultan khan 3b3046804e upgraded 5 months ago
haroon amjad aaa4f13493 App update to stores, Version ID 8.9 6 months ago
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
6 months ago
haroon amjad 0e7bac4557 ITG Timesheet & Approval level fixes 6 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 6 months ago
Haroon Amjad 6fbc7e33ee Merge branch 'flutter_upgrade_with_timesheet_changes'
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/work_list/itg_fragments/request_detail_fragment.dart
6 months ago
Aamir Muhammad 72c178382f time sheet changes 6 months ago
sultan khan be46dcb9b1 employee search work in progress 8 months ago
taha.alam 5db63e571a WD: flutter upgraded to 3.27.4 9 months ago
haroon amjad 92a16381aa Update to stores VersionID 8.6 9 months ago
haroon amjad 48f2264848 icon updates 10 months ago
haroon amjad 9f89f7530d Update to stores VersionID 8.5 10 months ago
haroon amjad 2477d9009a Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	pubspec.yaml
10 months ago
haroon amjad cdd56b2a5a Issue fixes & updates 11 months ago
haroon amjad b20e0a8c7b updates 11 months ago
Sikander Saleem 5ecb4845a1 po item history chart and scrollable list view added. 11 months ago
haroon amjad dc6195259d Alhabib Mohem identity changed 1 year ago
taha.alam 9cbbbebe4b Merge branch 'master' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade
# Conflicts:
#	pubspec.yaml
1 year ago
haroon amjad d55d2dee50 Mohemm identity updated 1 year ago
haroon amjad 39375f48ff updates 1 year ago
taha.alam 2bdaaf9e16 WD: flutter upgrade fron 3.7 to 3.19.0 1 year ago
haroon amjad f09f08be82 Store update to version 6.0 1 year ago
haroon amjad 8a5c4a9907 update to stores 5.9 2 years ago
haroon amjad f28090e3a9 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
haroon amjad a76d1548af Update to stores 5.9 2 years ago
haroon amjad f77854c794 update to stores version 5.9 2 years ago
haroon amjad 5e18b98a20 Update to stores 2 years ago
haroon amjad 22af6fa2f9 Huawei location fix 2 years ago
haroon amjad 6ae71c2f9b Update to stores 2 years ago
haroon amjad 609d3ca48a Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
haroon amjad d3358d578c Update to stores 2 years ago
haroon amjad a411b8e978 File picker permission issue fixed 2 years ago
haroon amjad 2744eff281 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/app_update_screen.dart
#	lib/ui/chat/group_chat_detaied_screen.dart
#	pubspec.yaml
2 years ago
haroon amjad 52d389b268 In App update implemented 2 years ago
haroon amjad 5fae260ffa Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad ff908bd2a7 updates 2 years ago
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 2 years ago
haroon amjad dc88c461c5 updates 2 years ago
haroon amjad e433c011e4 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/generated_plugin_registrant.dart
#	pubspec.yaml
2 years ago