Commit Graph

121 Commits (f6df04c43248b2ba274e251ffffc6e2539cba8d1)

Author SHA1 Message Date
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
10 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 10 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
10 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 10 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 10 months ago
Aamir Muhammad cd36d61640 logins apis 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
11 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. 1 year 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. 2 years ago
haroon amjad 8c1f140b57 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
3 years ago
Sikander Saleem 7f6f240590 CR-6273 improvement. 3 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 3 years ago
haroon amjad e433c011e4 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/generated_plugin_registrant.dart
#	pubspec.yaml
3 years ago
haroon amjad 5098aa7f90 my docs upload fix 3 years ago
Sikander Saleem 23b4e81170 my documents added. 3 years ago
haroon amjad 165485965a Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
3 years ago
haroon amjad 9030b9bc81 Notification details implemented 3 years ago
haroon amjad 7c53a39167 Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad babe36232e Image slider fixed 3 years ago
haroon amjad 5eb82d04ae Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad 204aeebe5f Item for sale updates 3 years ago
haroon amjad f39e40128e Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/classes/notifications.dart
#	lib/classes/utils.dart
3 years ago
haroon amjad 724227fc12 Item for sale attachment updates 3 years ago
haroon amjad 2d8ae1ce2f Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	pubspec.yaml
3 years ago
haroon amjad 8f83f89dc7 Item for sale improvements 3 years ago
haroon amjad 8ca13c52da HMG Flutter updates 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
haroon amjad 696a6881c4 date fixes & Items of sale updates 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
haroon amjad 2790d18c1d fixes 3 years ago
haroon amjad d66f841ca4 App security implemented, Offers & discounts fixes 3 years ago
haroon amjad 6efc07fcab Jira fixes 3 years ago