Commit Graph

1401 Commits (master)
 

Author SHA1 Message Date
haroon amjad 947ab5688d hotfix for payment request WL 1 week 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
3 weeks ago
haroon amjad dc6195259d Alhabib Mohem identity changed 3 weeks ago
haroon amjad 368d109d9f absence days fix 3 weeks 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 month ago
Sultan khan bafb6c8470 missing swipe issue and payment work-list and business trip issue fixed. 1 month ago
haroon amjad d55d2dee50 Mohemm identity updated 2 months ago
haroon amjad 39375f48ff updates 2 months ago
Sultan khan 423e8551f1 changes updated 2 months ago
Sultan khan db40f42a08 payment CR 6939 done 2 months ago
haroon amjad f841ccac3e Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
3 months ago
haroon amjad 096c52d979 worklist updates 3 months ago
haroon amjad 3327130e74 Attendance location updates 3 months ago
Sikander Saleem 550992ccf4 generate QR Api email parameter added. 3 months ago
Sikander Saleem 030887452d generate QR Api added. 3 months ago
Sikander Saleem e8fbffdc9c scroll, padding & content by language added on image ad. 5 months ago
haroon amjad 162e1102b5 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
5 months ago
haroon amjad f09f08be82 Store update to version 6.0 5 months ago
Sultan khan c7a4e4023e error code 699 fixes 5 months ago
haroon amjad 8a5c4a9907 update to stores 5.9 7 months ago
haroon amjad f28090e3a9 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
7 months ago
haroon amjad a76d1548af Update to stores 5.9 7 months ago
Sultan khan 348e4713ec worklist-PO-PR issue fixed. 8 months ago
haroon amjad f77854c794 update to stores version 5.9 8 months ago
haroon amjad eb070fcec2 Merge branch 'master_mohemm_flutter' 8 months ago
Sikander Saleem 2b7df41f35 advance search bottom sheet issue when keyboard appear. 8 months ago
haroon amjad 10a337ddd7 Added additional details in VIDA Access Request in ITG 8 months ago
haroon amjad 5e18b98a20 Update to stores 8 months ago
haroon amjad 2ea045cc81 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
9 months ago
haroon amjad 22af6fa2f9 Huawei location fix 9 months ago
haroon amjad 557c356233 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
9 months ago
haroon amjad 55c096aa7e Chat video fixes 9 months ago
haroon amjad 6ae71c2f9b Update to stores 9 months 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
9 months ago
haroon amjad d3358d578c Update to stores 9 months ago
haroon amjad 5f3c4b034f Monthly attendance fixes 9 months ago
haroon amjad 697d44635c Storage permissions handled 9 months ago
Sikander Saleem df07a5f9f6 Merge branch 'master' into development_sikander 9 months ago
haroon amjad c7ff754dd8 Password expired fixes & ITG Attachments implementation 9 months ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
9 months ago
haroon amjad 43e1e4df6b forgot password changes 9 months ago
haroon amjad 771914326f Forgot password flow updated 9 months ago
haroon amjad 4e7e5bc0e7 document type name updated in My Documents 9 months ago
haroon amjad 29643489d6 Added permissions for viewing files 9 months ago
haroon amjad 0728cc3dd4 Updated Mowadhafi Attachment Handling 10 months ago
haroon amjad fc3c1c057a Attachments handled in transactions list mowadhafi 10 months ago
haroon amjad b9fcf399c4 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 10 months ago
haroon amjad c104de86ba Updates 10 months 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
10 months ago
haroon amjad bd46589607 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 10 months ago