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
|
1 day 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
|
1 day 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
|
2 days 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
|
2 days ago |
aamir-csol
|
facb3bf4e6
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
71d03ba664
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
9f663df3cc
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
ba8908d4eb
|
Greeting Card
|
2 weeks ago |
aamir-csol
|
31d1804f7a
|
QIPS-1175,QIPS-1179,QIPS-1180
|
4 weeks ago |
haroon amjad
|
82c9aa8a2f
|
updates
|
4 weeks ago |
aamir-csol
|
048c9b395f
|
approval level commented Code for filter .
|
4 weeks ago |
aamir-csol
|
eea35e4d77
|
approval level commented Code for filter .
|
4 weeks 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
|
2 months ago |
Sultan khan
|
a426bc332e
|
E-learning Mandatory Courses - CR# 7150
|
2 months ago |
aamir-csol
|
dfa7d9a713
|
approval level commented Code for filter .
|
2 months ago |
aamir-csol
|
d021c95def
|
Parking Qr Solution
|
2 months ago |
aamir-csol
|
99414bf787
|
Itiqan Ovr Completed
|
2 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
|
3 months ago |
haroon amjad
|
1ee51a7597
|
Changed the device identifier, Update to Stores VersionID 9.5
|
3 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
|
3 months ago |
Sultan khan
|
bc697df13d
|
Merge branch 'flutter_upgrade_with_timesheet_changes'
|
4 months ago |
Sultan khan
|
fb35e256e7
|
CS Standard Change Request
CR-7260
Fixed Asset Disposal Request amendment
|
4 months ago |
Sultan khan
|
c9d5ab98a3
|
work-list fixes
|
4 months ago |
aamir-csol
|
b96c460d6b
|
Get Notification User Information Updates
|
5 months ago |
Sultan khan
|
bf3f9b55fc
|
changes for security ogout attempt..
|
5 months ago |
aamir-csol
|
0b08606813
|
Ticket History
|
5 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
|
5 months ago |
aamir-csol
|
c7e44965d6
|
Get Ticket Accural Balance Changes
|
5 months ago |
aamir-csol
|
cca95cee6a
|
ticket changes moved to dashboard & wallet balance
|
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
|
8 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
|
8 months ago |
Aamir Muhammad
|
f61817937b
|
tickt booking implementation
|
8 months ago |
Syed Taha Alam
|
e50d1f70b2
|
upgraded the sdk to 35
|
8 months ago |
Aamir Muhammad
|
cd36d61640
|
logins apis
|
8 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
|
9 months ago |
Sultan khan
|
3b3046804e
|
upgraded
|
9 months ago |
haroon amjad
|
8c4bdc5f54
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
# pubspec.yaml
|
10 months ago |
haroon amjad
|
d4b7550bab
|
Worklist actions buttons updates
|
10 months ago |
haroon amjad
|
7c9fc2f29c
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# ios/Runner/Info.plist
# lib/app_state/app_state.dart
# pubspec.yaml
|
10 months ago |
Sikander Saleem
|
9b683235c9
|
request information added,
|
10 months ago |
Aamir Muhammad
|
72c178382f
|
time sheet changes
|
11 months ago |
sultan khan
|
c26b2d9a5f
|
search employee inprogress
|
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 |
Sikander Saleem
|
6e3fc55fde
|
event activity added - cont
|
1 year ago |
Sikander Saleem
|
9362859013
|
CEI notification body 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 |
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
|
1 year ago |
Sikander Saleem
|
d4e17e7f0d
|
dynamic form parent value added. (saudi council employee)
|
1 year 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 |