Commit Graph

145 Commits (de3f091ef1bbdb454399ebeafc76435888cb79f5)

Author SHA1 Message Date
aamir-csol 90faa4dd5e Merge branch 'Courses-CR#-7150' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	lib/api/api_client.dart
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/screens/ticket/ticket_detailed_screen.dart
#	lib/widgets/sso_webview_widget.dart
1 week ago
Sultan khan 8ea831c2c4 color coding changes on the monthly leave calendar and prod e-learning URL added. 1 week ago
aamir-csol deffeda015 Alma 2 weeks 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
4 weeks ago
haroon amjad eb3eb1d102 updates 4 weeks ago
haroon amjad 82c9aa8a2f updates 2 months ago
aamir-csol eebaafcf7c approval level commented Code for filter . 2 months ago
haroon amjad 9112b26987 updates 2 months ago
aamir-csol d021c95def Parking Qr Solution 3 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 3 months ago
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 4 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 6 months ago
aamir-csol 676e662967 Survey title key fix 6 months ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 6 months ago
haroon amjad 04a2561f7f Update to stores VersionID 9.2 6 months ago
haroon amjad 55ece8921f Merge branch 'mohem_flutter_upgrade'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
8 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 9 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
9 months ago
haroon amjad 6400678f95 updates 9 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 9 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 9 months ago
Aamir Muhammad cd36d61640 logins apis 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 10 months ago
Sultan khan 3b3046804e upgraded 10 months ago
Aamir Muhammad 72c178382f time sheet changes 11 months ago
haroon amjad 92a16381aa Update to stores VersionID 8.6 1 year ago
Sikander Saleem 6e3fc55fde event activity added - cont 1 year ago
Sikander Saleem c35074576a offer and discount, do not show if api have issue. 1 year ago
Sikander Saleem 3e19508c5e child education assistance added. 1 year ago
haroon amjad c1503cc236 updates & fixes 1 year ago
haroon amjad 5d0091fe5b Unsafe device check implemented 1 year ago
haroon amjad 2682158590 ERM Channel Video changes 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
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
haroon amjad d55d2dee50 Mohemm identity updated 2 years ago
haroon amjad 39375f48ff updates 2 years ago
Sultan khan 423e8551f1 changes updated 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 10a337ddd7 Added additional details in VIDA Access Request in ITG 2 years ago
haroon amjad d3358d578c Update to stores 2 years ago
Sikander Saleem d1e2d0f59b Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
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
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
haroon amjad a2ed4e52f3 Marathon changes 2 years ago