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
|
2 days ago |
haroon amjad
|
bdaccf133c
|
updates
|
2 days 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
|
2 days 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
|
a958257ce9
|
Greeting
|
2 weeks ago |
aamir-csol
|
2c7d3bf963
|
QIPS-1175,QIPS-1179,QIPS-1180
|
3 weeks ago |
aamir-csol
|
31d1804f7a
|
QIPS-1175,QIPS-1179,QIPS-1180
|
4 weeks ago |
Sultan khan
|
19ccee6a20
|
updates
|
2 months ago |
Sultan khan
|
5705619ce4
|
untracked icon added
|
2 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
|
2 months ago |
Sultan khan
|
a426bc332e
|
E-learning Mandatory Courses - CR# 7150
|
2 months ago |
aamir-csol
|
a28eb4426b
|
Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration
|
2 months ago |
aamir-csol
|
dfa7d9a713
|
approval level commented Code for filter .
|
2 months ago |
haroon amjad
|
9112b26987
|
updates
|
2 months ago |
aamir-csol
|
d021c95def
|
Parking Qr Solution
|
2 months ago |
aamir-csol
|
74bcf3e1b7
|
translation
|
2 months ago |
aamir-csol
|
99414bf787
|
Itiqan Ovr Completed
|
2 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
|
fb35e256e7
|
CS Standard Change Request
CR-7260
Fixed Asset Disposal Request amendment
|
4 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
|
0e54c7dac9
|
worklist actions fragment action button changes
|
8 months ago |
Aamir Muhammad
|
8d6c3ddc0b
|
mazaya banner changes
|
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 |
haroon amjad
|
7c9fc2f29c
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# ios/Runner/Info.plist
# lib/app_state/app_state.dart
# pubspec.yaml
|
10 months ago |
Aamir Muhammad
|
72c178382f
|
time sheet changes
|
11 months 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
|
75ba1283d3
|
event activity page 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 |
haroon amjad
|
b20e0a8c7b
|
updates
|
1 year ago |
Sikander Saleem
|
8e49df98a2
|
translation issue fixed.
|
1 year ago |
Sikander Saleem
|
5ecb4845a1
|
po item history chart and scrollable list view added.
|
1 year ago |
haroon amjad
|
947ab5688d
|
hotfix for payment request WL
|
1 year ago |
haroon amjad
|
11881b0ba1
|
hotfix for payment request WL
|
1 year ago |
haroon amjad
|
dc6195259d
|
Alhabib Mohem identity changed
|
1 year ago |
Sultan khan
|
ea7467502f
|
updated changes for payment worklist.
|
1 year ago |
haroon amjad
|
d55d2dee50
|
Mohemm identity updated
|
2 years ago |
haroon amjad
|
f841ccac3e
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |
Sikander Saleem
|
030887452d
|
generate QR Api added.
|
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 |
Sikander Saleem
|
2cea45f0e1
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |
haroon amjad
|
43e1e4df6b
|
forgot password changes
|
2 years ago |
Sikander Saleem
|
d1e2d0f59b
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |
Faiz Hashmi
|
5723b64234
|
Join MarathonProviderFix
|
2 years ago |
Sikander Saleem
|
610d4788c2
|
parameter added in survey.
|
2 years ago |
Sikander Saleem
|
d44bc37681
|
marathon tutorial added.
|
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 |
Faiz Hashmi
|
e585ab7a8c
|
added the text intimation to join the marathon
|
2 years ago |
haroon amjad
|
8c1f140b57
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |