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

379 Commits (1bb44039d623ac79ccacbebbb3e15e53945aa3e8)

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
 3 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
 3 months ago
Aamir Muhammad f61817937b tickt booking implementation 3 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 4 months ago
Aamir Muhammad cd36d61640 logins apis 4 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
 4 months ago
Sultan khan 3b3046804e upgraded 5 months ago
haroon amjad 8c4bdc5f54 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
 6 months ago
haroon amjad d4b7550bab Worklist actions buttons updates 6 months ago
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
 6 months ago
Sikander Saleem 9b683235c9 request information added, 6 months ago
Aamir Muhammad 72c178382f time sheet changes 6 months ago
sultan khan c26b2d9a5f search employee inprogress 8 months ago
haroon amjad db6b0ad1b0 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
 9 months ago
Sikander Saleem 6e3fc55fde event activity added - cont 9 months ago
Sikander Saleem 9362859013 CEI notification body added. 10 months ago
haroon amjad 4e9725477a Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	pubspec.yaml
 10 months ago
Sikander Saleem 3e19508c5e child education assistance added. 10 months 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
 11 months ago
Sikander Saleem d4e17e7f0d dynamic form parent value added. (saudi council employee) 11 months 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
 1 year ago
Sultan khan 275c2a8aa7 Merge branch 'payment_worklist_CR_6939' 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
 1 year ago
taha.alam adc26a2435 Merge branch 'payment_worklist_CR_6939' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
 1 year ago
Sultan khan 423e8551f1 changes updated 1 year ago
haroon amjad f841ccac3e Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
 1 year ago
Sikander Saleem 550992ccf4 generate QR Api email parameter added. 1 year ago
Sikander Saleem 030887452d generate QR Api added. 1 year ago
haroon amjad 162e1102b5 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
 1 year ago
haroon amjad f09f08be82 Store update to version 6.0 1 year ago
Sultan khan c7a4e4023e error code 699 fixes 1 year ago
haroon amjad 557c356233 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
 2 years ago
haroon amjad 55c096aa7e Chat video fixes 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 df07a5f9f6 Merge branch 'master' into development_sikander 2 years ago
haroon amjad c7ff754dd8 Password expired fixes & ITG Attachments implementation 2 years ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander 
# Conflicts:
#	lib/app_state/app_state.dart
 2 years ago
haroon amjad fc3c1c057a Attachments handled in transactions list mowadhafi 2 years ago
Haroon6138 7faf1ca530 Merge pull request 'half day leave bug fixed' (#15) from sultan-dev into master 
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15
 2 years ago
haroon amjad a411b8e978 File picker permission issue fixed 2 years ago
Sultan khan c86d9f4678 termination work-list fixed 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
haroon amjad a4761ffec7 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/api/marathon/marathon_api_client.dart
 2 years ago
Faiz Hashmi 684a200285 Join MarathonProviderFix 2 years ago
haroon amjad 2744eff281 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/app_update_screen.dart
#	lib/ui/chat/group_chat_detaied_screen.dart
#	pubspec.yaml
 2 years ago
haroon amjad ff908bd2a7 updates 2 years ago
haroon amjad 39d9136299 Merge branch 'master_mohemm_flutter' 
# Conflicts:
#	lib/ui/dialogs/id/business_card_dialog.dart
 2 years ago
Sultan khan 88be17249d Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
 2 years ago
Sultan khan c9886be2d8 work list ITG str change 2 years ago
Sultan khan d7f45fa0b9 ITG change pushed. 2 years ago