Commit Graph

1164 Commits (e4d182912ce2d4f7d5a571cd60fd216856aac670)

Author SHA1 Message Date
haroon amjad 04a2561f7f Update to stores VersionID 9.2 5 months ago
haroon amjad 413db57206 favourites list changes 5 months ago
aamir-csol c06c020fb3 favorites search enabled. 5 months ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 6 months ago
aamir-csol 1bcecde59b ticket changes moved to dashboard 7 months ago
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 7 months ago
haroon amjad 1bb44039d6 Update to stores, VersionID 9.2 8 months ago
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
8 months ago
haroon amjad 55ece8921f Merge branch 'mohem_flutter_upgrade'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
8 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 8 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 8 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
8 months ago
haroon amjad 6400678f95 updates 8 months ago
Aamir Muhammad c62f3f6485 Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
8 months ago
Aamir Muhammad 5864c77226 worklist actions fragment action button changes 8 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 8 months ago
Aamir Muhammad 56b18c493a mazaya banner changes 8 months ago
Aamir Muhammad 515ffef14e tickt booking implementation 8 months ago
Aamir Muhammad f61817937b tickt booking implementation 8 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 8 months ago
Aamir Muhammad cd36d61640 logins apis 8 months ago
haroon amjad 5e3477da4c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
8 months ago
haroon amjad dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 8 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
9 months ago
haroon amjad 966c635cb0 App update to stores, Version ID 9.0 9 months ago
haroon amjad b9b850c34b Merge branch 'master_mohemm_flutter' 9 months ago
haroon amjad c57c22a58c ERM Channel Text URL implemented 9 months ago
Sultan khan 3b3046804e upgraded 9 months ago
haroon amjad 8c4bdc5f54 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
10 months ago
haroon amjad aaa4f13493 App update to stores, Version ID 8.9 10 months ago
haroon amjad d4b7550bab Worklist actions buttons updates 10 months ago
haroon amjad e02cb72eca App update to stores, Version ID 8.8 10 months ago
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
10 months ago
haroon amjad 4e2a774086 App update to stores, Version ID 8.8 10 months ago
Sikander Saleem 9b683235c9 request information added, 10 months ago
haroon amjad 0e7bac4557 ITG Timesheet & Approval level fixes 10 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 11 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
11 months ago
Haroon Amjad 49e520ea4b update 11 months ago
Aamir Muhammad 72c178382f time sheet changes 11 months ago
Sikander Saleem 54aa610856 long text field changed to separate field. 1 year ago
sultan khan c26b2d9a5f search employee inprogress 1 year ago
sultan khan be46dcb9b1 employee search work in progress 1 year ago
haroon amjad 7c3f6a508f updates & fixes 1 year ago
taha.alam 5db63e571a WD: flutter upgraded to 3.27.4 1 year ago
haroon amjad 4f96629467 Update to stores VersionID 8.6 1 year ago
haroon amjad db6b0ad1b0 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
1 year ago
haroon amjad 92a16381aa Update to stores VersionID 8.6 1 year ago
haroon amjad 5adc2bc64f updates 1 year ago
sultan khan 6e15336cc4 image changes. 1 year ago
sultan khan 29334a9ef0 leave balance page fix. 1 year ago
sultan khan 822a99a291 countdown updated. 1 year ago
sultan khan 75ba1283d3 event activity page added. 1 year ago
Sikander Saleem 6e3fc55fde event activity added - cont 1 year ago
Sikander Saleem a33da491f9 description format section seperated in itg forms 1 year ago
Sikander Saleem c35074576a offer and discount, do not show if api have issue. 1 year ago
Sikander Saleem 9362859013 CEI notification body added. 1 year ago
haroon amjad 4e9725477a Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
1 year ago
haroon amjad e20d6eca3f Safe device issue fixed 1 year ago
Sikander Saleem 3e19508c5e child education assistance added. 1 year ago
haroon amjad 9f89f7530d Update to stores VersionID 8.5 1 year ago
haroon amjad 739b2ffcfe Update to Stores VersionID 8.5 1 year 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
1 year ago
haroon amjad c1503cc236 updates & fixes 1 year ago
haroon amjad 5d0091fe5b Unsafe device check implemented 1 year ago
Sikander Saleem 4eb3e6d52d progress bar added on erm video. & skip button relocation. 1 year ago
haroon amjad 2682158590 ERM Channel Video changes 1 year ago
haroon amjad cdd56b2a5a Issue fixes & updates 1 year ago
haroon amjad b20e0a8c7b updates 1 year ago
Sikander Saleem 0da0ffd43e itg form attachment overlapping issue fixed. 1 year ago
Sikander Saleem d4e17e7f0d dynamic form parent value added. (saudi council employee) 1 year ago
Sikander Saleem 8e49df98a2 translation issue fixed. 1 year ago
Sikander Saleem 5ecb4845a1 po item history chart and scrollable list view added. 1 year ago
Sikander Saleem b06fb6345a actions & attachment api response overlapping other request responses. fixed. 1 year ago
haroon amjad 947ab5688d hotfix for payment request WL 1 year ago
haroon amjad 11881b0ba1 hotfix for payment request WL 1 year ago
haroon amjad 26bbc54503 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	AppIcons/Assets.xcassets/AppIcon.appiconset/100.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/114.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/120.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/144.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/152.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/167.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/180.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/20.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/29.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/40.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/50.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/57.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/58.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/60.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/72.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/76.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/80.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/87.png
#	AppIcons/appstore.png
#	AppIcons/playstore.png
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	pubspec.yaml
1 year ago
haroon amjad dc6195259d Alhabib Mohem identity changed 1 year ago
haroon amjad 368d109d9f absence days fix 1 year ago
Sultan khan ea7467502f updated changes for payment worklist. 1 year ago
Sultan khan 275c2a8aa7 Merge branch 'payment_worklist_CR_6939'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
2 years ago
taha.alam c72189bb6b version number changed 2 years ago
taha.alam adc26a2435 Merge branch 'payment_worklist_CR_6939' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
2 years ago
taha.alam 9cbbbebe4b Merge branch 'master' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade
# Conflicts:
#	pubspec.yaml
2 years ago
Sultan khan bafb6c8470 missing swipe issue and payment work-list and business trip issue fixed. 2 years ago
haroon amjad d55d2dee50 Mohemm identity updated 2 years ago
haroon amjad 39375f48ff updates 2 years ago
Sultan khan 423e8551f1 changes updated 2 years ago
Sultan khan db40f42a08 payment CR 6939 done 2 years ago
taha.alam 2e3abed42e WD: dialog color changes. 2 years ago
taha.alam 2bdaaf9e16 WD: flutter upgrade fron 3.7 to 3.19.0 2 years ago
haroon amjad f841ccac3e Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad 096c52d979 worklist updates 2 years ago
haroon amjad 3327130e74 Attendance location updates 2 years ago
Sikander Saleem 550992ccf4 generate QR Api email parameter added. 2 years ago
Sikander Saleem 030887452d generate QR Api added. 2 years ago
Sikander Saleem e8fbffdc9c scroll, padding & content by language added on image ad. 2 years ago
haroon amjad 162e1102b5 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
haroon amjad f09f08be82 Store update to version 6.0 2 years ago
Sultan khan c7a4e4023e error code 699 fixes 2 years ago