Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
3 years ago |
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 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
|
3 years ago |
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
3 years ago |
Sikander Saleem
|
af170b2b02
|
missing swipe,ticket balance home screen item linked with corresponding screen.
|
3 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
|
3 years ago |
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
3 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
|
3 years ago |
haroon amjad
|
52438ce711
|
offers & discounts implemented
|
3 years ago |
haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
3 years ago |
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
3 years ago |
Sikander Saleem
|
c0ec2260e5
|
mark attendance improvement.
|
3 years ago |
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
3 years ago |
haroon amjad
|
a855e535cd
|
Item for sale implemented
|
3 years ago |
Fatimah Alshammari
|
8aa14618d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
|
3 years ago |
Sikander Saleem
|
9b50c2cf31
|
mark attendance improvement.
|
3 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
|
3 years ago |
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
3 years ago |
Sikander Saleem
|
18084ce29f
|
services menu structure improvements.
|
3 years ago |
haroon amjad
|
40cdaca0ef
|
Merge branch 'master' into development_haroon
|
3 years ago |
Sikander Saleem
|
55f1f792f9
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/models/profile_menu.model.dart
|
3 years ago |
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
3 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
|
3 years ago |
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
3 years ago |
Fatimah Alshammari
|
058e287b25
|
fix translation
|
3 years ago |
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
3 years ago |
Fatimah Alshammari
|
b502e038a5
|
fix issue
|
3 years ago |
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
3 years ago |
Sikander Saleem
|
04520250a5
|
badge on work list in bottom navigation bar.
|
3 years ago |
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
3 years ago |
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
3 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
3 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
|
3 years ago |
devmirza121
|
4dc4a3fafb
|
Merge issue 1.0
|
3 years ago |
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
3 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
|
3 years ago |
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
3 years ago |
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
3 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
3 years ago |
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
3 years ago |
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
3 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
3 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
3 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
|
3 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
|
3 years ago |
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
3 years ago |
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
3 years ago |
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
3 years ago |
Sultan Khan
|
13150321d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
3 years ago |