Commit Graph

144 Commits (deb08dac31ba857cd377e648ddd723ae7af8d79b)

Author SHA1 Message Date
haroon amjad a9485d853f Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 months ago
haroon amjad 0dcd780359 updates 2 months ago
aamir-csol 279fbc85d1 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 3 months ago
aamir-csol ecc0869a23 Ticket 3 months ago
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
3 months ago
aamir-csol e1f2819fe6 Ticket 3 months ago
aamir-csol a131179c71 VHR-279 3 months ago
aamir-csol 9f4e9943cf VHR-279 3 months ago
haroon amjad e4d182912c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/en-US.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
3 months ago
haroon amjad 480d9d466f updates 3 months ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 3 months ago
Sultan khan 19ccee6a20 updates 5 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
5 months ago
Sultan khan a426bc332e E-learning Mandatory Courses - CR# 7150 5 months ago
haroon amjad 90bf529865 CR-19329 - ERP MOWADHFAI System changes 6 months ago
aamir-csol 5809aa157f Ticket Attachments 6 months ago
haroon amjad 4d0918cd25 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/build.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
6 months ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 7 months ago
aamir-csol 676e662967 Survey title key fix 8 months ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 8 months ago
aamir-csol 0b08606813 Ticket History 8 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
8 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 8 months ago
haroon amjad f6df04c432 Merge branch 'master_mohemm_flutter' into mohemm_HMG_flutter_upgrade
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
11 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 11 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
11 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 11 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 11 months ago
Aamir Muhammad cd36d61640 logins apis 11 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
12 months ago
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 e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 1 year ago
Haroon Amjad 49e520ea4b update 1 year ago
taha.alam 5db63e571a WD: flutter upgraded to 3.27.4 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
sultan khan 6e15336cc4 image changes. 1 year ago
sultan khan 822a99a291 countdown updated. 1 year ago
sultan khan 75ba1283d3 event activity page added. 1 year ago
haroon amjad 4e9725477a Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
1 year ago
Sikander Saleem 3e19508c5e child education assistance added. 2 years ago
taha.alam 2bdaaf9e16 WD: flutter upgrade fron 3.7 to 3.19.0 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
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
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
Sikander Saleem d44bc37681 marathon tutorial added. 3 years ago
haroon amjad 8c1f140b57 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
3 years ago