Sultan khan
|
8d9561b570
|
COC changes
|
2 years ago |
Sikander Saleem
|
d6315b0674
|
fixes.
|
2 years ago |
Sikander Saleem
|
ba8e272885
|
pull to refresh added on worklist screen.
|
2 years ago |
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
2 years ago |
Fatimah Alshammari
|
be506fa059
|
fix issues
|
2 years ago |
Sikander Saleem
|
ba65fbb79d
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
13e9c5fa21
|
centering issue in dynamic list view screen fixed.
|
2 years ago |
haroon amjad
|
e65beebfe8
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
haroon amjad
|
866bb8a29e
|
Pull to refresh, Items for Sale & Offers n Discounts fixes
|
2 years ago |
haroon amjad
|
4c1927bee5
|
ITG request flow fixed
|
2 years ago |
haroon amjad
|
9f74c3c39a
|
ITG request flow fixed
|
2 years ago |
Sikander Saleem
|
6cd0c4c358
|
improvement.
|
2 years ago |
Sikander Saleem
|
e8c8c225c7
|
icon direction bug fixes
|
2 years ago |
devmirza121
|
0fa88555fb
|
Employee Digital Id Fixed
|
2 years ago |
Sikander Saleem
|
ef96f9703f
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
95b60181b1
|
bug fixes
|
2 years ago |
devmirza121
|
c05b8eee29
|
Remote Changed
|
2 years ago |
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
2 years ago |
Sikander Saleem
|
0c7fbde013
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/my_attendance/services_menu_list_screen.dart
|
2 years ago |
Sikander Saleem
|
9a0131277b
|
create request by manager in my team, improvements
|
2 years ago |
haroon amjad
|
dd26452663
|
Fixes & updates
|
2 years ago |
Sikander Saleem
|
9ce042e7d3
|
bussiness card improvement.
|
2 years ago |
haroon amjad
|
c14bfd22db
|
Mohemm Android build given to QA
|
2 years ago |
devmirza121
|
d8938ba256
|
improvement
|
2 years ago |
devmirza121
|
599b8b8f4b
|
Login Flag issue fixed
|
2 years ago |
devmirza121
|
9412348cde
|
Merge branch 'master' into development_mirza
|
2 years ago |
haroon amjad
|
20e6a6ddc3
|
Attendance fixes
|
2 years ago |
Sikander Saleem
|
692a105bad
|
ios fixes-2
|
2 years ago |
haroon amjad
|
492a1a9736
|
Merge branch 'master' into development_haroon
|
2 years ago |
haroon amjad
|
e6405b2251
|
NFC fixes
|
2 years ago |
haroon amjad
|
eb29553d26
|
NFC Fixes
|
2 years ago |
Sikander Saleem
|
90649a0259
|
password visible option added.
|
2 years ago |
Fatimah Alshammari
|
df622d28dc
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
c0f333e14b
|
fix issues
|
2 years ago |
haroon amjad
|
b0b84c572c
|
Last Login Fixes
|
2 years ago |
Sikander Saleem
|
e090b9be0b
|
Merge branch 'development_mirza' into 'master'
Login with face and finger fixed
See merge request mirza.shafique/mohem_flutter_app!83
|
2 years ago |
Fatimah Alshammari
|
c664125c8f
|
fix issues
|
2 years ago |
devmirza121
|
8ce3a09375
|
Login with face and finger fixed
|
2 years ago |
Fatimah Alshammari
|
ff623b12ad
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/ui/landing/widget/app_drawer.dart
|
2 years ago |
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
2 years ago |
Sikander Saleem
|
20ffb73dd8
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
a45b6aece2
|
improvements
|
2 years ago |
Sikander Saleem
|
ea2a9c541c
|
change password screen added.
|
2 years ago |
Fatimah Alshammari
|
442f6d8180
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
957c88f58f
|
fix issues
|
2 years ago |
Sikander Saleem
|
53bf7d68ed
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!78
|
2 years ago |
Sikander Saleem
|
97bd497866
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
4e22784676
|
ticket balance dashboard added.
|
2 years ago |
Fatimah Alshammari
|
241172b7e7
|
fix issues
|
2 years ago |
Fatimah Alshammari
|
c2142c9997
|
fix issues
|
2 years ago |
Fatimah Alshammari
|
48e582af82
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
8fa4670392
|
fix issues
|
2 years ago |
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
2 years ago |
Sikander Saleem
|
8120a69fd3
|
monthly attendance fixes.
|
2 years ago |
Fatimah Alshammari
|
ffba702cf9
|
fix issues
|
2 years ago |
Fatimah Alshammari
|
b7685295d9
|
fix design issues
|
2 years ago |
Sikander Saleem
|
cfe0460ea5
|
my team issues fixed
|
2 years ago |
Sikander Saleem
|
f3855c3883
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
cbcb3cdc00
|
item for sale improvement cont.
|
2 years ago |
Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
3d11273738
|
fix design issues
|
2 years ago |
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
2 years ago |
Sikander Saleem
|
2eedef7c2c
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
7eadd97869
|
item for sale ui improvements & translation added.
|
2 years ago |
Sultan Khan
|
70a7108d9c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
|
2 years ago |
Sultan Khan
|
f3477fb5f3
|
perforamce page updates
|
2 years ago |
Sikander Saleem
|
f647b32c65
|
item for sale improvement.
|
2 years ago |
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
2 years ago |
Fatimah Alshammari
|
414cc587ea
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
e2720c7057
|
fix design issues
|
2 years ago |
Fatimah Alshammari
|
a55e4bf84f
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
83b51ae589
|
fix design issues
|
2 years ago |
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
2 years ago |
Sikander Saleem
|
55cafb5466
|
improvement.
|
2 years ago |
haroon amjad
|
fb2924964b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
2 years ago |
Sikander Saleem
|
2ce3c535d2
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
2 years ago |
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
2 years ago |
Fatimah Alshammari
|
07636bef77
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
907b205d21
|
added subordinate leave
|
2 years ago |
Sikander Saleem
|
ee2c74b5da
|
leave balance submit request added.
|
2 years ago |
Sikander Saleem
|
cf7843191b
|
leave balance added.
|
2 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
|
2 years ago |
Fatimah Alshammari
|
d640ce29de
|
fix issue
|
2 years ago |
Sikander Saleem
|
2f6e40da46
|
add leave balance cont.
|
2 years ago |
Sikander Saleem
|
9186e3cdaa
|
leave balance validate model added.
|
2 years ago |
Sikander Saleem
|
af170b2b02
|
missing swipe,ticket balance home screen item linked with corresponding screen.
|
2 years ago |
Sikander Saleem
|
41a1ba125e
|
code improvements.
|
2 years ago |
Sikander Saleem
|
9314ea0514
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
|
2 years ago |
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
2 years ago |
haroon amjad
|
50f203cd55
|
Updates & fixes
|
2 years ago |
haroon amjad
|
a05d037211
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/colors.dart
# lib/extensions/string_extensions.dart
# lib/ui/screens/announcements/announcement_details.dart
# lib/ui/screens/announcements/announcements.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
# lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
|
2 years ago |
Sikander Saleem
|
171735202b
|
leave balance cont3.
|
2 years ago |
Sikander Saleem
|
2278a1e98f
|
Merge remote-tracking branch 'origin/development_sikander' into development_sikander
# Conflicts:
# lib/ui/leave_balance/add_leave_balance_screen.dart
|
2 years ago |
Sikander Saleem
|
d5c8604f32
|
leave balance cont3.
|
2 years ago |
Sikander Saleem
|
a14103b859
|
leave balance cont3.
|
2 years ago |
haroon amjad
|
7c0589ef32
|
Announcement details fixes
|
2 years ago |
haroon amjad
|
52438ce711
|
offers & discounts implemented
|
2 years ago |
haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
2 years ago |
Sikander Saleem
|
8855eb7622
|
leave balance cont2.
|
2 years ago |
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
2 years ago |
Sikander Saleem
|
c0ec2260e5
|
mark attendance improvement.
|
2 years ago |
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
2 years ago |
haroon amjad
|
a855e535cd
|
Item for sale implemented
|
2 years ago |
Sikander Saleem
|
fc6b923fc4
|
mowadhafhi improvement.
|
2 years ago |
Fatimah Alshammari
|
8aa14618d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
|
2 years ago |
Sikander Saleem
|
9b50c2cf31
|
mark attendance improvement.
|
2 years ago |
Fatimah Alshammari
|
dc880df35a
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/models/profile_menu.model.dart
|
2 years ago |
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
2 years ago |
Sikander Saleem
|
8247032a52
|
profile options linked with home page personal information.
|
2 years ago |
Sikander Saleem
|
20f7d98ce5
|
profile improvements
|
2 years ago |
Sikander Saleem
|
11bd7a7085
|
improvements.
|
2 years ago |
Sikander Saleem
|
18084ce29f
|
services menu structure improvements.
|
2 years ago |
Sikander Saleem
|
1404715425
|
Vacation rule translation added.
|
2 years ago |
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
2 years ago |
haroon amjad
|
40cdaca0ef
|
Merge branch 'master' into development_haroon
|
2 years ago |
haroon amjad
|
5c15d07dc8
|
updates
|
2 years ago |
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
2 years ago |
Sikander Saleem
|
55f1f792f9
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/models/profile_menu.model.dart
|
2 years ago |
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
2 years ago |
Sultan Khan
|
39b916bcc8
|
performance page added
|
2 years ago |
haroon amjad
|
1719c7029e
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/announcements/announcement_details.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
2 years ago |
Fatimah Alshammari
|
0820f87877
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
d1cc9bd468
|
fix issue
|
2 years ago |
Sikander Saleem
|
fabb847fd8
|
Merge branch 'development_sultan' into 'master'
Development sultan
See merge request mirza.shafique/mohem_flutter_app!49
|
2 years ago |
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
1137e585e3
|
update button check
|
2 years ago |
Fatimah Alshammari
|
058e287b25
|
fix translation
|
2 years ago |
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
2 years ago |
Fatimah Alshammari
|
b502e038a5
|
fix issue
|
2 years ago |
Sikander Saleem
|
0d812cf266
|
Vacation rule added.
|
2 years ago |
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
2 years ago |
Sikander Saleem
|
04520250a5
|
badge on work list in bottom navigation bar.
|
2 years ago |
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
2 years ago |
Sikander Saleem
|
48de28c0b3
|
Merge branch 'master' into development_sikander
|
2 years ago |
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
2 years ago |
Fatimah Alshammari
|
2e5a8e7a6b
|
fix issue.
|
2 years ago |
Sikander Saleem
|
c390d87fca
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
d5b1512eb4
|
improvements
|
2 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
2 years ago |
devmirza121
|
8fe51a654c
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/main.dart
# lib/ui/landing/today_attendance_screen.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
2 years ago |
devmirza121
|
4dc4a3fafb
|
Merge issue 1.0
|
2 years ago |
Fatimah Alshammari
|
1604cba140
|
fix translation.
|
2 years ago |
Sultan Khan
|
2b93d43380
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
2 years ago |
Sultan Khan
|
3c777d220e
|
basic details
|
2 years ago |
Fatimah Alshammari
|
1ef3783fb9
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/profile_api_client.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/profile/delete_familyMember.dart
# lib/ui/profile/family_members.dart
# lib/ui/profile/phone_numbers.dart
# lib/ui/screens/profile/profile_screen.dart
|
2 years ago |
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
2 years ago |
Sikander Saleem
|
0b2a87aaaf
|
dynamic forms logic improvement.
|
2 years ago |
Fatimah Alshammari
|
d74d8ff369
|
fixed footer design.
|
2 years ago |
Sultan Khan
|
b10e6184d6
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
26bbff6844
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Fatimah Alshammari
|
23110b792f
|
completed add and update family member
|
2 years ago |
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
2 years ago |
Sikander Saleem
|
2f013ba1ad
|
lint rules added.
|
2 years ago |
Sultan Khan
|
06b14394bd
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
e6e150b9e3
|
address phone numbers
|
2 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
2 years ago |
Sikander Saleem
|
2966ca129c
|
monthly pay slip improvement
|
2 years ago |
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
2 years ago |
Fatimah Alshammari
|
a4ca7433a4
|
add and update family member in progress
|
2 years ago |
haroon amjad
|
6d1b942dca
|
Merge branch 'master' into development_haroon
|
2 years ago |
haroon amjad
|
d614532956
|
Announcements implemented
|
2 years ago |
Sikander Saleem
|
9362f8bf91
|
Merge branch 'development_haroon' into 'master'
pubspec update
See merge request mirza.shafique/mohem_flutter_app!36
|
2 years ago |
haroon amjad
|
556215807b
|
pubspec update
|
2 years ago |
Sikander Saleem
|
2adb1e34bf
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request mirza.shafique/mohem_flutter_app!35
|
2 years ago |
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
2 years ago |
Sikander Saleem
|
e01bb920a7
|
Merge branch 'development_haroon' into 'master'
Pending Transactions implemented
See merge request mirza.shafique/mohem_flutter_app!34
|
2 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
2 years ago |
Fatimah Alshammari
|
17ca565f4c
|
Merge branch 'development_sultan' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
lib/api/profile_api_client.dart
|
2 years ago |
Fatimah Alshammari
|
c3945d2583
|
family member in progress
|
2 years ago |
Sultan Khan
|
9b213dc9ab
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
ea5178fe20
|
profle dynamic forms
|
2 years ago |
Sikander Saleem
|
4c18f038e5
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
cb88f12ced
|
return from leave done.
|
2 years ago |
haroon amjad
|
12225d8a25
|
Merge branch 'master' into development_haroon
|
2 years ago |
haroon amjad
|
9e8bc47f7e
|
Mowadhafhi request completed
|
2 years ago |
Sikander Saleem
|
42e93e42a9
|
merge issue fixed
|
2 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
2 years ago |
Sultan Khan
|
f329f7030d
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
23326a769a
|
PHONE NUMBERS
|
2 years ago |
Sikander Saleem
|
ce7183a137
|
merge conflicts fixed.
|
2 years ago |
Sikander Saleem
|
95e2e74fd0
|
Merge branch 'master' into development_sikander
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/my_attendance_screen.dart
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
Sikander Saleem
|
eaac923580
|
imp
|
2 years ago |
Fatimah Alshammari
|
15cfc0b9f4
|
merge conflict fixed
|
2 years ago |
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
2 years ago |
devmirza121
|
2010e9d6a0
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/colors.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/attendance/monthly_attendance.dart
# lib/ui/landing/dashboard.dart
# lib/widgets/radio/show_radio.dart
# pubspec.yaml
|
2 years ago |
Fatimah Alshammari
|
fd07de072c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
lib/main.dart
lib/ui/profile/contact_details.dart
|
2 years ago |
Fatimah Alshammari
|
7be1bdcdc2
|
fix family member
|
2 years ago |
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
2 years ago |
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
2 years ago |
Sultan Khan
|
794cd2b1e8
|
phone number inprogress
|
2 years ago |
Fatimah Alshammari
|
60db9041a1
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
assets/langs/en-US.json
lib/ui/profile/contact_details.dart
lib/ui/profile/personal_info.dart
pubspec.yaml
|
2 years ago |
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
2 years ago |
Sultan Khan
|
88d2e05ae7
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
91a67638c4
|
phone number inprogress
|
2 years ago |
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
2 years ago |
Sikander Saleem
|
ae0a788728
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
2 years ago |
Sikander Saleem
|
3e6fdd2cb5
|
missing swipe added.
|
2 years ago |