Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
3 years ago |
Sikander Saleem
|
48de28c0b3
|
Merge branch 'master' into development_sikander
|
3 years ago |
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
3 years ago |
Sikander Saleem
|
c390d87fca
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sikander Saleem
|
d5b1512eb4
|
improvements
|
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 |
Fatimah Alshammari
|
23110b792f
|
completed add and update family member
|
3 years ago |
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
3 years ago |
Sikander Saleem
|
2f013ba1ad
|
lint rules added.
|
3 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
3 years ago |
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
3 years ago |
Fatimah Alshammari
|
a4ca7433a4
|
add and update family member in progress
|
3 years ago |
Sikander Saleem
|
2adb1e34bf
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request mirza.shafique/mohem_flutter_app!35
|
3 years ago |
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
3 years ago |
Sikander Saleem
|
e01bb920a7
|
Merge branch 'development_haroon' into 'master'
Pending Transactions implemented
See merge request mirza.shafique/mohem_flutter_app!34
|
3 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
3 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
|
3 years ago |
Fatimah Alshammari
|
c3945d2583
|
family member in progress
|
3 years ago |
Sultan Khan
|
9b213dc9ab
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sultan Khan
|
ea5178fe20
|
profle dynamic forms
|
3 years ago |
Sikander Saleem
|
4c18f038e5
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sikander Saleem
|
cb88f12ced
|
return from leave done.
|
3 years ago |
haroon amjad
|
9e8bc47f7e
|
Mowadhafhi request completed
|
3 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
3 years ago |
Sultan Khan
|
f329f7030d
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sultan Khan
|
23326a769a
|
PHONE NUMBERS
|
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 |
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
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 |
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
|
3 years ago |
Fatimah Alshammari
|
7be1bdcdc2
|
fix family member
|
3 years ago |
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
3 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
|
3 years ago |
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
3 years ago |
Sultan Khan
|
91a67638c4
|
phone number inprogress
|
3 years ago |
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
3 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
|
3 years ago |
Sikander Saleem
|
3e6fdd2cb5
|
missing swipe added.
|
3 years ago |
Sikander Saleem
|
1e9a26e3df
|
missing swipe cont
|
3 years ago |
Sultan Khan
|
979879a286
|
phone number is progress
|
3 years ago |
Sikander Saleem
|
9cc86751eb
|
missing swipe cont
|
3 years ago |
Sultan Khan
|
8f80bbb9db
|
profile dynamic forms
|
3 years ago |
Sultan Khan
|
b5a5399b95
|
profile
|
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
|
57f789ca6d
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
3 years ago |