Haroon6138
/
hmg-mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,604 Commits
11 Branches
0 Tags
18 MiB
master
mohemm_HMG_flutter_upgrade
development_haroon
development_aamir
faiz_cs
development_mirza
development_sikander
sultan-dev
fatima
faiz_marathon_signalR_critical
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9c994d8dec'
${ noResults }
Commit Graph

156 Commits (9c994d8dec2ea23942bc42368d30f9882fdf2a3d)

Author SHA1 Message Date
haroon amjad 9c994d8dec Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/main.dart
#	pubspec.yaml
 2 weeks ago
Haroon Amjad f503dca074 Merge branch 'apilevel_raise' into master_merge 
# Conflicts:
#	android/app/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart
#	pubspec.yaml
 2 weeks ago
taha a6be594b3b Update dependencies and improve code structure 3 weeks ago
haroon amjad 41afe554e8 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
 1 month ago
haroon amjad 70286096ae Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 1 month ago
Sultan khan a9f0cb8216 CEI, worklist po pr filter, date issue in absence dynamic screen 2 months ago
Sultan khan a37ce5c666 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  update to stores, VersionID 10.0
  ENSAT, Notification Timer Counter & Dead Line

# Conflicts:
#	lib/ui/screens/ticket/ticket_detailed_screen.dart
 6 months ago
Sultan khan a6454776dd fixes for monthly calendar color coding .. and ticket screen 6 months ago
haroon amjad 4fc9c6a295 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
 6 months ago
haroon amjad a2505c1575 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 6 months ago
aamir-csol 1d3f33ea81 ENSAT, Notification Timer Counter & Dead Line 6 months ago
haroon amjad 7c48a646cb updates 6 months ago
haroon amjad a9485d853f Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
 7 months ago
haroon amjad 0dcd780359 updates 7 months ago
aamir-csol 279fbc85d1 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 7 months ago
aamir-csol ecc0869a23 Ticket 7 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
 7 months ago
aamir-csol e1f2819fe6 Ticket 7 months ago
aamir-csol a131179c71 VHR-279 7 months ago
aamir-csol 9f4e9943cf VHR-279 7 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
 7 months ago
haroon amjad 480d9d466f updates 7 months ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 7 months ago
Sultan khan 19ccee6a20 updates 9 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
 9 months ago
Sultan khan a426bc332e E-learning Mandatory Courses - CR# 7150 9 months ago
haroon amjad 90bf529865 CR-19329 - ERP MOWADHFAI System changes 10 months ago
aamir-csol 5809aa157f Ticket Attachments 10 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
 11 months ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 12 months ago
aamir-csol 676e662967 Survey title key fix 1 year ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 1 year ago
aamir-csol 0b08606813 Ticket History 1 year 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
 1 year ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 1 year 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
 1 year ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 1 year 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
 1 year ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 1 year ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 1 year ago
Aamir Muhammad cd36d61640 logins apis 1 year 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
 1 year 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 2 years ago
haroon amjad db6b0ad1b0 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
 2 years ago
sultan khan 6e15336cc4 image changes. 2 years ago
sultan khan 822a99a291 countdown updated. 2 years ago
sultan khan 75ba1283d3 event activity page added. 2 years ago