Sikander Saleem
|
7aa2e0f000
|
code of conduct, workmen regulations added. & improvement.
|
3 years ago |
Sikander Saleem
|
d26b7e0753
|
worklist improvements
|
3 years ago |
haroon amjad
|
e65beebfe8
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
haroon amjad
|
866bb8a29e
|
Pull to refresh, Items for Sale & Offers n Discounts fixes
|
3 years ago |
Sikander Saleem
|
ef96f9703f
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sikander Saleem
|
95b60181b1
|
bug fixes
|
3 years ago |
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
3 years ago |
Sikander Saleem
|
9ce042e7d3
|
bussiness card improvement.
|
3 years ago |
haroon amjad
|
b0b84c572c
|
Last Login Fixes
|
3 years ago |
Fatimah Alshammari
|
ff623b12ad
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
3 years ago |
Sikander Saleem
|
a45b6aece2
|
improvements
|
3 years ago |
Fatimah Alshammari
|
8fa4670392
|
fix issues
|
3 years ago |
Sikander Saleem
|
2eedef7c2c
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sikander Saleem
|
7eadd97869
|
item for sale ui improvements & translation added.
|
3 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
|
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 |
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
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 |
Sultan Khan
|
39b916bcc8
|
performance page added
|
3 years ago |
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
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 |
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
|
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
|
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 |
Sultan Khan
|
6e86c0ba38
|
profile details
|
3 years ago |
Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
4 years ago |
Sultan Khan
|
ff17adfd09
|
Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sultan Khan
|
06b3726d4a
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sultan Khan
|
0974861463
|
updated menus
|
4 years ago |
Sultan Khan
|
da6b935c0b
|
subpages changes
|
4 years ago |
devmirza121
|
681fe7fb38
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
4 years ago |