Commit Graph

291 Commits (e9fc205beeabd373106397d28d36c60e670aa3c8)

Author SHA1 Message Date
aamir-csol e9fc205bee Timer Counter & Dead line Counter Null Handling 23 hours ago
aamir-csol 1d3f33ea81 ENSAT, Notification Timer Counter & Dead Line 5 days ago
Aamir Saleem Ahmad 598ce5d7fe ticket enable 2 weeks ago
aamir-csol de3f091ef1 dashboard 4 weeks ago
aamir-csol 279fbc85d1 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 4 weeks 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
4 weeks ago
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 1 month ago
haroon amjad 3391cf49ef updates 1 month ago
haroon amjad bdaccf133c updates 1 month 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 month 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 month ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 1 month ago
haroon amjad eb3eb1d102 updates 1 month ago
aamir-csol a958257ce9 Greeting 2 months ago
aamir-csol ba8908d4eb Greeting Card 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
3 months ago
Sultan khan a426bc332e E-learning Mandatory Courses - CR# 7150 3 months ago
aamir-csol 5809aa157f Ticket Attachments 4 months ago
aamir-csol e11b214a28 Merge remote-tracking branch 'origin/flutter_upgrade_with_timesheet_changes' into flutter_upgrade_with_timesheet_changes 4 months ago
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 5 months ago
Sultan khan 89ea554c7a Merge branch 'flutter_upgrade_with_timesheet_changes' 5 months ago
Sultan khan 3d91a1444e wallet ticket fix 5 months ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 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 c191d4c0c0 Survey Title Key Fix 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
haroon amjad 04a2561f7f Update to stores VersionID 9.2 7 months ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 7 months ago
aamir-csol 1bcecde59b ticket changes moved to dashboard 8 months ago
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 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
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 9 months ago
Aamir Muhammad 515ffef14e tickt booking implementation 9 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 10 months ago
haroon amjad dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 10 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
10 months ago
haroon amjad c57c22a58c ERM Channel Text URL implemented 10 months ago
Sultan khan 3b3046804e upgraded 10 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 12 months 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
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