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 |