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 |
|
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |