Haroon6138
/
hmg-mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,736 Commits
11 Branches
0 Tags
23 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 'cd399a032c'
${ noResults }
Commit Graph

1145 Commits (cd399a032c77191f2ed30278e5ced21d23fca41f)

Author SHA1 Message Date
haroon amjad bea191e987 Merge branch 'flutter_upgrade_with_timesheet_changes' 2 months ago
haroon amjad 89b77c205b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 2 months ago
Sultan khan bfd1ce2eab add family member issue fixed. 2 months ago
haroon amjad 64e2b2c42a updates 2 months ago
Sultan khan a9f0cb8216 CEI, worklist po pr filter, date issue in absence dynamic screen 2 months ago
Sultan khan f218dab93e PR changes done. 4 months ago
Sultan khan a5e0e1165e Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Timer Counter & Dead line Counter Null Handling
 4 months ago
aamir-csol e9fc205bee Timer Counter & Dead line Counter Null Handling 6 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
 7 months ago
haroon amjad a2505c1575 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 7 months ago
aamir-csol 1d3f33ea81 ENSAT, Notification Timer Counter & Dead Line 7 months ago
Sultan khan 2c2d16674e calendar issue fixed and courses enabled. 7 months ago
haroon amjad deb08dac31 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
 7 months ago
haroon amjad 7c48a646cb updates 7 months ago
haroon amjad 73aedba023 updates 7 months ago
Aamir Saleem Ahmad 598ce5d7fe ticket enable 7 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 de3f091ef1 dashboard 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
Sultan khan 8ea831c2c4 color coding changes on the monthly leave calendar and prod e-learning URL added. 7 months ago
aamir-csol a131179c71 VHR-279 7 months ago
aamir-csol 9f4e9943cf VHR-279 7 months ago
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 8 months ago
haroon amjad 54a2e7b449 Merge branch 'master_mohemm_flutter' 8 months ago
haroon amjad ca8211bf9d updates 8 months ago
haroon amjad 3391cf49ef updates 8 months ago
haroon amjad 3bafd74857 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
 8 months ago
haroon amjad 352c85dcd8 updates 8 months ago
haroon amjad 057e71e3c0 Etqan fixes, Update to Stores VersionID 9.6 8 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
 8 months ago
haroon amjad 480d9d466f updates 8 months ago
haroon amjad bdaccf133c updates 8 months 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
 8 months 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
 8 months ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 8 months 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
 8 months ago
haroon amjad eb3eb1d102 updates 8 months ago
aamir-csol 257b803cce QIPS-1205 8 months ago
aamir-csol a958257ce9 Greeting 8 months ago
aamir-csol facb3bf4e6 QIPS-1205 8 months ago
aamir-csol 71d03ba664 QIPS-1205 8 months ago
aamir-csol 9f663df3cc QIPS-1205 8 months ago
aamir-csol ba8908d4eb Greeting Card 8 months ago
aamir-csol a8f390d49f QIPS-1175,QIPS-1179,QIPS-1180 8 months ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 8 months ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 9 months ago
haroon amjad 82c9aa8a2f updates 9 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
aamir-csol 12d8fd95ba approval level commented Code for filter . 9 months ago
aamir-csol eebaafcf7c approval level commented Code for filter . 9 months ago
aamir-csol dfa7d9a713 approval level commented Code for filter . 9 months ago
aamir-csol e3fcc992df approval level commented Code for filter . 9 months ago
aamir-csol d021c95def Parking Qr Solution 10 months ago
aamir-csol 74bcf3e1b7 translation 10 months ago
aamir-csol 912f7b23f1 Merge branch 'master' into etqan_ovr_integration 10 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 10 months ago
haroon amjad 90bf529865 CR-19329 - ERP MOWADHFAI System changes 10 months ago
aamir-csol f253a5e99e Chat Bot Completed 10 months ago
aamir-csol 5809aa157f Ticket Attachments 10 months ago
aamir-csol e11b214a28 Merge remote-tracking branch 'origin/flutter_upgrade_with_timesheet_changes' into flutter_upgrade_with_timesheet_changes 10 months ago
aamir-csol 234dce65e5 chat bot & Speech to Text 10 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
 11 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 11 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
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 11 months ago
Sultan khan 89ea554c7a Merge branch 'flutter_upgrade_with_timesheet_changes' 11 months ago
Sultan khan 3d91a1444e wallet ticket fix 11 months ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 12 months ago
Sultan khan fb35e256e7 CS Standard Change Request 
CR-7260

Fixed Asset Disposal Request amendment
 12 months ago
Sultan khan c9d5ab98a3 work-list fixes 1 year ago
aamir-csol b96c460d6b Get Notification User Information Updates 1 year ago
aamir-csol 676e662967 Survey title key fix 1 year ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 1 year ago
aamir-csol c191d4c0c0 Survey Title Key Fix 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 04a2561f7f Update to stores VersionID 9.2 1 year ago
haroon amjad 413db57206 favourites list changes 1 year ago
aamir-csol c06c020fb3 favorites search enabled. 1 year ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 1 year ago
aamir-csol 1bcecde59b ticket changes moved to dashboard 1 year ago
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 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 0e54c7dac9 worklist actions fragment action button changes 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 5864c77226 worklist actions fragment action button changes 1 year ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 1 year ago
Aamir Muhammad 515ffef14e tickt booking implementation 1 year ago
Aamir Muhammad f61817937b tickt booking implementation 1 year ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 1 year ago
Aamir Muhammad cd36d61640 logins apis 1 year ago
haroon amjad 5e3477da4c Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	pubspec.yaml
 1 year ago
haroon amjad dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 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 b9b850c34b Merge branch 'master_mohemm_flutter' 1 year ago
haroon amjad c57c22a58c ERM Channel Text URL implemented 1 year ago
Sultan khan 3b3046804e upgraded 1 year ago
haroon amjad 8c4bdc5f54 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
 1 year ago
haroon amjad d4b7550bab Worklist actions buttons updates 1 year ago
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
 2 years ago
Sikander Saleem 9b683235c9 request information added, 2 years ago
haroon amjad 0e7bac4557 ITG Timesheet & Approval level fixes 2 years ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 2 years ago
Haroon Amjad 6fbc7e33ee Merge branch 'flutter_upgrade_with_timesheet_changes' 
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/work_list/itg_fragments/request_detail_fragment.dart
 2 years ago
Haroon Amjad 49e520ea4b update 2 years ago
Aamir Muhammad 72c178382f time sheet changes 2 years ago
Sikander Saleem 54aa610856 long text field changed to separate field. 2 years ago
sultan khan c26b2d9a5f search employee inprogress 2 years ago
sultan khan be46dcb9b1 employee search work in progress 2 years ago
haroon amjad 7c3f6a508f updates & fixes 2 years 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
haroon amjad 5adc2bc64f updates 2 years ago
sultan khan 6e15336cc4 image changes. 2 years ago
sultan khan 29334a9ef0 leave balance page fix. 2 years ago
sultan khan 822a99a291 countdown updated. 2 years ago
sultan khan 75ba1283d3 event activity page added. 2 years ago
Sikander Saleem 6e3fc55fde event activity added - cont 2 years ago
Sikander Saleem a33da491f9 description format section seperated in itg forms 2 years ago
Sikander Saleem c35074576a offer and discount, do not show if api have issue. 2 years ago
Sikander Saleem 9362859013 CEI notification body added. 2 years ago
haroon amjad 4e9725477a Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	pubspec.yaml
 2 years ago
haroon amjad e20d6eca3f Safe device issue fixed 2 years ago
Sikander Saleem 3e19508c5e child education assistance added. 2 years ago
haroon amjad 9f89f7530d Update to stores VersionID 8.5 2 years ago
haroon amjad 739b2ffcfe Update to Stores VersionID 8.5 2 years ago
haroon amjad 2477d9009a Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	pubspec.yaml
 2 years ago
haroon amjad c1503cc236 updates & fixes 2 years ago
haroon amjad 5d0091fe5b Unsafe device check implemented 2 years ago
Sikander Saleem 4eb3e6d52d progress bar added on erm video. & skip button relocation. 2 years ago
haroon amjad 2682158590 ERM Channel Video changes 2 years ago
haroon amjad cdd56b2a5a Issue fixes & updates 2 years ago
Sikander Saleem 0da0ffd43e itg form attachment overlapping issue fixed. 2 years ago
Sikander Saleem d4e17e7f0d dynamic form parent value added. (saudi council employee) 2 years ago
Sikander Saleem 5ecb4845a1 po item history chart and scrollable list view added. 2 years ago
Sikander Saleem b06fb6345a actions & attachment api response overlapping other request responses. fixed. 2 years ago
haroon amjad 947ab5688d hotfix for payment request WL 2 years ago
haroon amjad 11881b0ba1 hotfix for payment request WL 2 years ago
haroon amjad 26bbc54503 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	AppIcons/Assets.xcassets/AppIcon.appiconset/100.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/114.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/120.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/144.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/152.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/167.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/180.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/20.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/29.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/40.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/50.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/57.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/58.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/60.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/72.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/76.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/80.png
#	AppIcons/Assets.xcassets/AppIcon.appiconset/87.png
#	AppIcons/appstore.png
#	AppIcons/playstore.png
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	pubspec.yaml
 2 years ago
haroon amjad dc6195259d Alhabib Mohem identity changed 2 years ago