Commit Graph

1446 Commits (7c9fc2f29cb17c98258adb8a6a60671d9c2764f2)
 

Author SHA1 Message Date
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
1 year ago
haroon amjad 4e2a774086 App update to stores, Version ID 8.8 1 year ago
Sikander Saleem 9b683235c9 request information added, 1 year ago
haroon amjad 0e7bac4557 ITG Timesheet & Approval level fixes 1 year ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 1 year 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
1 year ago
Haroon Amjad 49e520ea4b update 1 year ago
Aamir Muhammad 72c178382f time sheet changes 1 year 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 77de3ed4cf updates 1 year ago
haroon amjad 48f2264848 icon updates 1 year ago
haroon amjad e20d6eca3f Safe device issue fixed 1 year ago
Sikander Saleem 3e19508c5e child education assistance added. 2 years ago
haroon amjad 9f89f7530d Update to stores VersionID 8.5 2 years ago
haroon amjad 739b2ffcfe Update to Stores VersionID 8.5 2 years 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
2 years ago
haroon amjad c1503cc236 updates & fixes 2 years ago
haroon amjad 5d0091fe5b Unsafe device check implemented 2 years ago
Sikander Saleem 4eb3e6d52d progress bar added on erm video. & skip button relocation. 2 years ago
haroon amjad 2682158590 ERM Channel Video changes 2 years ago
haroon amjad cdd56b2a5a Issue fixes & updates 2 years ago
haroon amjad b20e0a8c7b updates 2 years ago
Sikander Saleem 0da0ffd43e itg form attachment overlapping issue fixed. 2 years ago
Sikander Saleem d4e17e7f0d dynamic form parent value added. (saudi council employee) 2 years ago
Sikander Saleem 8e49df98a2 translation issue fixed. 2 years ago
Sikander Saleem 5ecb4845a1 po item history chart and scrollable list view added. 2 years ago
Sikander Saleem b06fb6345a actions & attachment api response overlapping other request responses. fixed. 2 years ago
haroon amjad 947ab5688d hotfix for payment request WL 2 years ago
haroon amjad 11881b0ba1 hotfix for payment request WL 2 years 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
2 years ago
haroon amjad dc6195259d Alhabib Mohem identity changed 2 years ago
haroon amjad 368d109d9f absence days fix 2 years 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