Commit Graph

1108 Commits (1bb44039d623ac79ccacbebbb3e15e53945aa3e8)

Author SHA1 Message Date
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
1 year ago
taha.alam c72189bb6b version number changed 1 year 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
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
Sultan khan bafb6c8470 missing swipe issue and payment work-list and business trip issue fixed. 1 year ago
haroon amjad d55d2dee50 Mohemm identity updated 1 year ago
haroon amjad 39375f48ff updates 1 year 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
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
Sultan khan 348e4713ec worklist-PO-PR issue fixed. 2 years ago
haroon amjad f77854c794 update to stores version 5.9 2 years ago
haroon amjad eb070fcec2 Merge branch 'master_mohemm_flutter' 2 years ago
Sikander Saleem 2b7df41f35 advance search bottom sheet issue when keyboard appear. 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 2ea045cc81 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 22af6fa2f9 Huawei location fix 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 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 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
Haroon6138 7faf1ca530 Merge pull request 'half day leave bug fixed' (#15) from sultan-dev into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15
2 years ago
haroon amjad bd46589607 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad a411b8e978 File picker permission issue fixed 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
Faiz Hashmi ada971c7e4 Merge branch 'master' into faiz_dev_marathon_text_fix
# Conflicts:
#	lib/classes/consts.dart
2 years ago
Faiz Hashmi 753d3de3c2 Join MarathonProviderFix 2 years ago
Sultan khan d4a795dda1 half day leave bug fixed 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
haroon amjad a4761ffec7 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/api/marathon/marathon_api_client.dart
2 years ago
haroon amjad a2ed4e52f3 Marathon changes 2 years ago
Faiz Hashmi 684a200285 Join MarathonProviderFix 2 years ago
Faiz Hashmi 9a6d2d44e1 before staring participant fix. 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 6811015a0d updates 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 39d9136299 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/ui/dialogs/id/business_card_dialog.dart
2 years ago
Sultan khan 88be17249d Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
2 years ago
Sultan khan c9886be2d8 work list ITG str change 2 years ago
Sultan khan d7f45fa0b9 ITG change pushed. 2 years ago
Aamir Muhammad 6cf7340417 Business Card Design Update 2 years ago
Sultan khan 6d92a78843 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 2 years ago