 Aamir Muhammad
|
0e54c7dac9
|
worklist actions fragment action button changes
|
3 months ago |
|
Aamir Muhammad
|
c62f3f6485
|
Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
3 months ago |
|
Aamir Muhammad
|
8d6c3ddc0b
|
mazaya banner changes
|
3 months ago |
|
Aamir Muhammad
|
56b18c493a
|
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 |
|
sultan khan
|
75ba1283d3
|
event activity page added.
|
9 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
|
11881b0ba1
|
hotfix for payment request WL
|
1 year ago |
Sultan khan
|
ea7467502f
|
updated changes for payment worklist.
|
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 |
|
Sikander Saleem
|
030887452d
|
generate QR Api added.
|
1 year ago |
|
haroon amjad
|
43e1e4df6b
|
forgot password changes
|
2 years ago |
Faiz Hashmi
|
e585ab7a8c
|
added the text intimation to join the marathon
|
2 years ago |
|
haroon amjad
|
ed9705f18f
|
fixes
|
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 |
 Sikander Saleem
|
571b8bd7af
|
itg active directory password change added.
|
3 years ago |
haroon amjad
|
33294ee697
|
survey changes
|
3 years ago |
|
Sikander Saleem
|
0e329e8e2b
|
ticket balance value display fixed & infant added in value.
|
3 years ago |
|
Sikander Saleem
|
0f84f9ae65
|
app life cycle added.
file attachment option added on dynamic form. & improvements
|
3 years ago |
|
Faiz Hashmi
|
a72ac34122
|
Updated the text
|
3 years ago |
|
Faiz Hashmi
|
5592989b44
|
Added Demo Marathon Module
|
3 years ago |
|
Faiz Hashmi
|
24c118a66e
|
Removed GapTime for last question and some minor bugs fixed!
|
3 years ago |
|
Faiz Hashmi
|
d9749fc402
|
Updated NoWinnerFoundDesign and some Logical Up gradations
|
3 years ago |
|
haroon amjad
|
660fdb63dd
|
Updates & fixes
|
3 years ago |
|
Faiz Hashmi
|
8ae8f6d2fe
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Faiz Hashmi
|
810920a934
|
Pushing after resolving multiple times API calling issue
|
3 years ago |
Fatimah Alshammari
|
c51af6522c
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
1fb585a438
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
670a5fbc03
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
83aabd0555
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
3 years ago |
mirza.shafique
|
5880e22771
|
merge fix
|
3 years ago |
|
devmirza121
|
f06238a93f
|
OTP dialog new design
|
3 years ago |
|
Fatimah Alshammari
|
79774416b4
|
Merge branch 'master' into fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Fatimah Alshammari
|
69ded3dc43
|
fix my request
|
3 years ago |
|
Sikander Saleem
|
1cd7cd4d76
|
issues fixed.
|
3 years ago |
|
FaizHashmiCS22
|
5ed9991428
|
Added new Intimmation Screens with Lottie
|
3 years ago |
|
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
3 years ago |
|
FaizHashmiCS22
|
ab59821428
|
Merge conflicts resolved
|
3 years ago |
|
FaizHashmiCS22
|
3c6e4a725f
|
Merge branch 'master' into faiz_cs
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# pubspec.yaml
|
3 years ago |
|
Fatimah Alshammari
|
f515c0b39a
|
Merge branch 'master' into fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
3 years ago |