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
|
6fbc7e33ee
|
Merge branch 'flutter_upgrade_with_timesheet_changes'
# Conflicts:
# lib/classes/consts.dart
# lib/ui/work_list/itg_fragments/request_detail_fragment.dart
|
6 months ago |
taha.alam
|
5db63e571a
|
WD: flutter upgraded to 3.27.4
|
9 months ago |
 taha.alam
|
2bdaaf9e16
|
WD: flutter upgrade fron 3.7 to 3.19.0
|
1 year ago |
haroon amjad
|
91eb51e42f
|
marathon updates & DateFormat fixes
|
3 years ago |
|
haroon amjad
|
bcf67895b9
|
Dynamic forms & my team fixes
|
3 years ago |
 Sikander Saleem
|
3a6d1c3273
|
leave balance issues fixed-2.
|
3 years ago |
|
Sikander Saleem
|
fe02776a69
|
leave balance issues fixed.
|
3 years ago |
|
haroon amjad
|
5be9adca31
|
fixes
|
3 years ago |
|
haroon amjad
|
4c53fcfdb6
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
6463dfc424
|
Reverting fatima changes
|
3 years ago |
|
haroon amjad
|
d80f93a6dc
|
Revert "no message"
This reverts commit 323741ad06.
|
3 years ago |
|
haroon amjad
|
323741ad06
|
no message
|
3 years ago |
Fatimah Alshammari
|
f43b4905c5
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into fatima
# Conflicts:
# lib/ui/misc/request_submit_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
9d0bf4fe7e
|
fix issues
|
3 years ago |
|
haroon amjad
|
c9dd403b23
|
subordinate leave fix
|
3 years ago |
|
Fatimah Alshammari
|
8169936bc0
|
fix issues
|
3 years ago |
haroon amjad
|
e8043f6980
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!54
|
3 years ago |
|
Fatimah Alshammari
|
ba1a5c66ef
|
fix issues
|
3 years ago |
|
haroon amjad
|
c436908d25
|
updates & fixes
|
3 years ago |
|
Fatimah Alshammari
|
53fb8605d8
|
Merge branch 'master' into fatima
# Conflicts:
# lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
|
3 years ago |
|
haroon amjad
|
ea676e19ca
|
JIRA Fixes
|
3 years ago |
|
Fatimah Alshammari
|
0cca8ec935
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
2d40ede37f
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
e4db7e0cc2
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
e2519b5df2
|
fix issues
|
3 years ago |
|
haroon amjad
|
4024e5fd3f
|
updates & fixes
|
3 years ago |
|
Sultan khan
|
398880c4ad
|
bug fixes
|
3 years ago |
|
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
9a0131277b
|
create request by manager in my team, improvements
|
3 years ago |
|
haroon amjad
|
492a1a9736
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Fatimah Alshammari
|
c0f333e14b
|
fix issues
|
3 years ago |
|
haroon amjad
|
b0b84c572c
|
Last Login Fixes
|
3 years ago |
|
Fatimah Alshammari
|
c664125c8f
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
957c88f58f
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
241172b7e7
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
48e582af82
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
8fa4670392
|
fix issues
|
3 years ago |
Sikander Saleem
|
8120a69fd3
|
monthly attendance fixes.
|
3 years ago |
|
Fatimah Alshammari
|
ffba702cf9
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
b7685295d9
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
cfe0460ea5
|
my team issues fixed
|
3 years ago |
|
Fatimah Alshammari
|
3d11273738
|
fix design issues
|
3 years ago |
|
Fatimah Alshammari
|
414cc587ea
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
e2720c7057
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
55cafb5466
|
improvement.
|
3 years ago |
|
Fatimah Alshammari
|
907b205d21
|
added subordinate leave
|
3 years ago |
|
Fatimah Alshammari
|
bee1aef03e
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/models/get_user_item_type_list.dart
# lib/models/my_team/get_attendance_tracking_list_model.dart
# lib/models/my_team/get_employee_subordinates_list.dart
# lib/models/update_item_type_success_list.dart
# lib/models/update_user_item_type_list.dart
# lib/models/worklist/update_user_type_list.dart
# lib/ui/my_team/view_attendance.dart
# lib/ui/profile/contact_details.dart
|
3 years ago |