 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
|
0e54c7dac9
|
worklist actions fragment action button changes
|
3 months ago |
|
Aamir Muhammad
|
8d6c3ddc0b
|
mazaya banner changes
|
3 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 |
|
haroon amjad
|
7c9fc2f29c
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# ios/Runner/Info.plist
# lib/app_state/app_state.dart
# pubspec.yaml
|
6 months ago |
|
Aamir Muhammad
|
72c178382f
|
time sheet changes
|
6 months ago |
taha.alam
|
5db63e571a
|
WD: flutter upgraded to 3.27.4
|
9 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 |
|
sultan khan
|
75ba1283d3
|
event activity page added.
|
9 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
|
10 months ago |
|
haroon amjad
|
b20e0a8c7b
|
updates
|
11 months ago |
Sikander Saleem
|
8e49df98a2
|
translation issue fixed.
|
11 months ago |
|
Sikander Saleem
|
5ecb4845a1
|
po item history chart and scrollable list view added.
|
11 months 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
|
1 year ago |
|
haroon amjad
|
f841ccac3e
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
|
1 year ago |
|
Sikander Saleem
|
030887452d
|
generate QR Api added.
|
1 year 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 |
 Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
2 years ago |
|
haroon amjad
|
e433c011e4
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/notifications.dart
# lib/generated_plugin_registrant.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
a58d4753e4
|
Merge branch 'sultan-dev' into development_haroon
# Conflicts:
# assets/langs/en-US.json
# lib/classes/utils.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
2 years ago |
|
Sikander Saleem
|
23b4e81170
|
my documents added.
|
2 years ago |
|
Sultan khan
|
608a8fcb97
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# 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
|
2 years ago |
|
Sultan khan
|
790103bdc9
|
chat changes
|
2 years ago |
|
Sultan khan
|
fd6058e87d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/app_state/app_state.dart
# lib/generated/locale_keys.g.dart
|
3 years ago |
haroon amjad
|
11d7e8bb8a
|
Merge branch 'master_mohemm_flutter' into development_haroon
|
3 years ago |
|
Sikander Saleem
|
571b8bd7af
|
itg active directory password change added.
|
3 years ago |
|
Sultan khan
|
9cb71b525e
|
group chat started
|
3 years ago |
|
haroon amjad
|
1eb6065ed8
|
Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
# lib/app_state/app_state.dart
|
3 years ago |
mirza.shafique
|
13d8aac22e
|
ERM fixes
|
3 years ago |
|
mirza.shafique
|
7d7acfa2df
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/main.dart
|
3 years ago |
|
haroon amjad
|
f39e40128e
|
Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
# lib/classes/notifications.dart
# lib/classes/utils.dart
|
3 years ago |
|
haroon amjad
|
1ebcbd1079
|
ERM Channel Audio playback implemented
|
3 years ago |
haroon amjad
|
d3c5fd1467
|
Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
|
3 years ago |
|
haroon amjad
|
6436062642
|
HMG Mohemm Setup
|
3 years ago |
|
mirza.shafique
|
2455e27595
|
hmg wifi implementation
|
3 years ago |
|
Sultan khan
|
61904ca5f7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/consts.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Sultan khan
|
3b2ef69f7c
|
Offers and discount and Item for sale changes done.
|
3 years ago |