Commit Graph

1497 Commits (89fa395183ae2d600e872a2ac87c029e20332d30)
 

Author SHA1 Message Date
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
1 month ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 1 month 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
1 month ago
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 1 month ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 2 months ago
Sultan khan fb35e256e7 CS Standard Change Request
CR-7260

Fixed Asset Disposal Request amendment
2 months ago
Sultan khan c9d5ab98a3 work-list fixes 2 months ago
aamir-csol b96c460d6b Get Notification User Information Updates 3 months ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 3 months ago
aamir-csol c191d4c0c0 Survey Title Key Fix 3 months ago
aamir-csol 0b08606813 Ticket History 3 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
3 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 3 months ago
haroon amjad 04a2561f7f Update to stores VersionID 9.2 3 months ago
haroon amjad 413db57206 favourites list changes 3 months ago
aamir-csol c06c020fb3 favorites search enabled. 3 months ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 4 months ago
aamir-csol 1bcecde59b ticket changes moved to dashboard 5 months ago
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 5 months ago
haroon amjad 1bb44039d6 Update to stores, VersionID 9.2 6 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
6 months ago
haroon amjad 55ece8921f Merge branch 'mohem_flutter_upgrade'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
6 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 6 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 6 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
6 months ago
haroon amjad 6400678f95 updates 6 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
6 months ago
Aamir Muhammad 5864c77226 worklist actions fragment action button changes 6 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 6 months ago
Aamir Muhammad 56b18c493a mazaya banner changes 6 months ago
Aamir Muhammad 515ffef14e tickt booking implementation 6 months ago
Aamir Muhammad f61817937b tickt booking implementation 6 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 6 months ago
Aamir Muhammad cd36d61640 logins apis 6 months ago
haroon amjad 5e3477da4c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
6 months ago
haroon amjad dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 6 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
7 months ago
haroon amjad 966c635cb0 App update to stores, Version ID 9.0 7 months ago
haroon amjad b9b850c34b Merge branch 'master_mohemm_flutter' 7 months ago
haroon amjad c57c22a58c ERM Channel Text URL implemented 7 months ago
Sultan khan 3b3046804e upgraded 7 months ago
haroon amjad 8c4bdc5f54 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
8 months ago
haroon amjad aaa4f13493 App update to stores, Version ID 8.9 8 months ago
haroon amjad d4b7550bab Worklist actions buttons updates 8 months ago
haroon amjad e02cb72eca App update to stores, Version ID 8.8 8 months ago
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
8 months ago
haroon amjad 4e2a774086 App update to stores, Version ID 8.8 8 months ago
Sikander Saleem 9b683235c9 request information added, 8 months ago
haroon amjad 0e7bac4557 ITG Timesheet & Approval level fixes 8 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 9 months ago