bug fix #14

Closed
khansultan1 wants to merge 162 commits from master into sultan-dev

162 Commits (master)

Author SHA1 Message Date
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 6 days ago
haroon amjad 3391cf49ef updates 1 week ago
haroon amjad 057e71e3c0 Etqan fixes, Update to Stores VersionID 9.6 1 week ago
haroon amjad bdaccf133c updates 1 week ago
Haroon6138 16e2cc604f Merge pull request 'Courses-CR#-7150' (#20) from Courses-CR#-7150 into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/20
1 week ago
Sultan khan d5c3ce4c62 Merge branch 'master' into Courses-CR#-7150
* master:
1 week ago
Sultan khan 5da81968d7 Merge branch 'greeting_card' into Courses-CR#-7150
* greeting_card:
  Greeting
  Greeting Card

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/generated/codegen_loader.g.dart
#	lib/provider/dashboard_provider_model.dart
1 week ago
Haroon6138 6a80e21c3f Merge pull request 'Courses-CR#-7150' (#19) from Courses-CR#-7150 into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/19
1 week ago
Sultan khan b240f55aff Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into Courses-CR#-7150
# Conflicts:
#	lib/ui/landing/widget/menus_widget.dart
1 week ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 1 week ago
haroon amjad 2c9db30d6a Merge branch 'master' into etqan_ovr_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/provider/dashboard_provider_model.dart
1 week ago
haroon amjad eb3eb1d102 updates 1 week ago
aamir-csol 257b803cce QIPS-1205 3 weeks ago
aamir-csol a958257ce9 Greeting 3 weeks ago
aamir-csol dae746587f QIPS-1205 3 weeks ago
aamir-csol facb3bf4e6 QIPS-1205 3 weeks ago
aamir-csol 71d03ba664 QIPS-1205 3 weeks ago
aamir-csol 9f663df3cc QIPS-1205 3 weeks ago
aamir-csol ba8908d4eb Greeting Card 3 weeks ago
aamir-csol a8f390d49f QIPS-1175,QIPS-1179,QIPS-1180 3 weeks ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 4 weeks ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 1 month ago
haroon amjad 82c9aa8a2f updates 1 month ago
aamir-csol 048c9b395f approval level commented Code for filter . 1 month ago
aamir-csol eea35e4d77 approval level commented Code for filter . 1 month ago
Sultan khan 19ccee6a20 updates 2 months ago
Sultan khan 5705619ce4 untracked icon added 2 months ago
Sultan khan fe583c234b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  approval level commented Code for filter .
  Parking Qr Solution
  CR-19329 - ERP MOWADHFAI System changes
  Changed the device identifier, Update to Stores VersionID 9.5
  Update to Stores for Fixed Asset Disposal, VersionID 9.4

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
2 months ago
Sultan khan a426bc332e E-learning Mandatory Courses - CR# 7150 2 months ago
aamir-csol 12d8fd95ba approval level commented Code for filter . 2 months ago
aamir-csol eebaafcf7c approval level commented Code for filter . 2 months ago
aamir-csol a28eb4426b Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration 2 months ago
aamir-csol dfa7d9a713 approval level commented Code for filter . 2 months ago
haroon amjad 9112b26987 updates 2 months ago
aamir-csol e3fcc992df approval level commented Code for filter . 2 months ago
aamir-csol d021c95def Parking Qr Solution 2 months ago
aamir-csol 74bcf3e1b7 translation 3 months ago
aamir-csol 912f7b23f1 Merge branch 'master' into etqan_ovr_integration 3 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 3 months ago
haroon amjad 90bf529865 CR-19329 - ERP MOWADHFAI System changes 3 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 3 months ago
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 4 months ago
Sultan khan 89ea554c7a Merge branch 'flutter_upgrade_with_timesheet_changes' 4 months ago
Sultan khan 3d91a1444e wallet ticket fix 4 months ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 5 months ago
Sultan khan fb35e256e7 CS Standard Change Request
CR-7260

Fixed Asset Disposal Request amendment
5 months ago
Sultan khan c9d5ab98a3 work-list fixes 5 months ago
aamir-csol b96c460d6b Get Notification User Information Updates 5 months ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 5 months ago
aamir-csol c191d4c0c0 Survey Title Key Fix 5 months ago
aamir-csol 0b08606813 Ticket History 5 months ago
aamir-csol 107846dd82 Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	android/app/build.gradle
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/services_widget.dart
5 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 5 months ago
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 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 dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 9 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 c57c22a58c ERM Channel Text URL implemented 9 months ago
Sultan khan 3b3046804e upgraded 9 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 4e2a774086 App update to stores, Version ID 8.8 11 months ago
Sikander Saleem 9b683235c9 request information added, 11 months ago
haroon amjad 0e7bac4557 ITG Timesheet & Approval level fixes 11 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 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 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 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 11881b0ba1 hotfix for payment request WL 1 year ago
haroon amjad 368d109d9f absence days fix 1 year ago
Sultan khan ea7467502f updated changes for payment worklist. 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
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 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 f09f08be82 Store update to version 6.0 2 years ago
Sultan khan c7a4e4023e error code 699 fixes 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
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 22af6fa2f9 Huawei location fix 2 years ago
haroon amjad 55c096aa7e Chat video fixes 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
haroon amjad b9fcf399c4 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad c104de86ba Updates 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
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
Sikander Saleem 610d4788c2 parameter added in survey. 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago