Commit Graph

1005 Commits (152cd5c0192155dc43d40e8ae651f61dd7954210)

Author SHA1 Message Date
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 7 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 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
Aamir Muhammad 5864c77226 worklist actions fragment action button changes 8 months ago
Aamir Muhammad 8d6c3ddc0b 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 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 d4b7550bab Worklist actions buttons updates 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
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 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 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
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 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
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 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
Sultan khan bafb6c8470 missing swipe issue and payment work-list and business trip issue fixed. 2 years ago
Sultan khan 423e8551f1 changes updated 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
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
Sultan khan c7a4e4023e error code 699 fixes 2 years ago
haroon amjad f28090e3a9 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
Sultan khan 348e4713ec worklist-PO-PR issue fixed. 2 years ago
haroon amjad eb070fcec2 Merge branch 'master_mohemm_flutter' 2 years ago
haroon amjad 10a337ddd7 Added additional details in VIDA Access Request in ITG 2 years ago
haroon amjad 5e18b98a20 Update to stores 2 years ago
haroon amjad 557c356233 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
2 years ago
haroon amjad 55c096aa7e Chat video fixes 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 5f3c4b034f Monthly attendance fixes 2 years ago
haroon amjad 697d44635c Storage permissions handled 2 years ago
Sikander Saleem df07a5f9f6 Merge branch 'master' into development_sikander 2 years ago
haroon amjad c7ff754dd8 Password expired fixes & ITG Attachments implementation 2 years ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad 43e1e4df6b forgot password changes 2 years ago
haroon amjad 771914326f Forgot password flow updated 2 years ago
haroon amjad 4e7e5bc0e7 document type name updated in My Documents 2 years ago
haroon amjad 29643489d6 Added permissions for viewing files 2 years ago
haroon amjad 0728cc3dd4 Updated Mowadhafi Attachment Handling 2 years ago
haroon amjad fc3c1c057a Attachments handled in transactions list mowadhafi 2 years ago
Sultan khan 74bc09d5d6 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Sultan khan c86d9f4678 termination work-list fixed 2 years ago
Sikander Saleem 449c93649a multiple survey added. 2 years ago
Sikander Saleem d1e2d0f59b Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Faiz Hashmi 5723b64234 Join MarathonProviderFix 2 years ago
Sikander Saleem 610d4788c2 parameter added in survey. 2 years ago