Commit Graph

416 Commits (a9485d853f24300b52d26761376e854afee4dd05)

Author SHA1 Message Date
haroon amjad a9485d853f Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
24 hours ago
aamir-csol ecc0869a23 Ticket 6 days 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
6 days ago
aamir-csol e1f2819fe6 Ticket 6 days ago
Sultan khan 8ea831c2c4 color coding changes on the monthly leave calendar and prod e-learning URL added. 7 days ago
aamir-csol deffeda015 Alma 1 week 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 weeks 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
3 weeks 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
4 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
aamir-csol facb3bf4e6 QIPS-1205 1 month ago
aamir-csol 71d03ba664 QIPS-1205 1 month ago
aamir-csol 9f663df3cc QIPS-1205 1 month ago
aamir-csol ba8908d4eb Greeting Card 1 month ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 2 months ago
haroon amjad 82c9aa8a2f updates 2 months ago
aamir-csol 048c9b395f approval level commented Code for filter . 2 months ago
aamir-csol eea35e4d77 approval level commented Code for filter . 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 dfa7d9a713 approval level commented Code for filter . 2 months ago
aamir-csol d021c95def Parking Qr Solution 3 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 3 months ago
aamir-csol 5809aa157f Ticket Attachments 3 months ago
haroon amjad 89fa395183 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/app_state/app_state.dart
#	lib/main.dart
#	pubspec.yaml
4 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 4 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
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 6 months ago
aamir-csol 676e662967 Survey title key fix 6 months ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 6 months ago
aamir-csol 0b08606813 Ticket History 6 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
6 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 6 months ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 7 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
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
Aamir Muhammad f61817937b tickt booking implementation 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
Sultan khan 3b3046804e upgraded 10 months ago
haroon amjad 8c4bdc5f54 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
11 months ago
haroon amjad d4b7550bab Worklist actions buttons updates 11 months ago
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
11 months ago
Sikander Saleem 9b683235c9 request information added, 11 months ago
Aamir Muhammad 72c178382f time sheet changes 11 months ago
sultan khan c26b2d9a5f search employee inprogress 1 year ago