Sikander Saleem
|
41a1ba125e
|
code improvements.
|
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 |
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 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
|
3 years ago |
Sikander Saleem
|
d5c8604f32
|
leave balance cont3.
|
3 years ago |
Sikander Saleem
|
a14103b859
|
leave balance cont3.
|
3 years ago |
Sikander Saleem
|
8855eb7622
|
leave balance cont2.
|
3 years ago |
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
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
|
8247032a52
|
profile options linked with home page personal information.
|
3 years ago |
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
3 years ago |
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
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 |
Fatimah Alshammari
|
0820f87877
|
Merge branch 'master' into Fatima
|
3 years ago |
Fatimah Alshammari
|
d1cc9bd468
|
fix issue
|
3 years ago |
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sikander Saleem
|
0d812cf266
|
Vacation rule added.
|
3 years ago |
Sikander Saleem
|
48de28c0b3
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sultan Khan
|
3c777d220e
|
basic details
|
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 |
Sikander Saleem
|
0b2a87aaaf
|
dynamic forms logic improvement.
|
3 years ago |
Sultan Khan
|
b10e6184d6
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Fatimah Alshammari
|
23110b792f
|
completed add and update family member
|
3 years ago |
Sultan Khan
|
06b14394bd
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sultan Khan
|
e6e150b9e3
|
address phone numbers
|
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 |
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
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 |
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
|
ce7183a137
|
merge conflicts fixed.
|
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 |
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
3 years ago |
Sultan Khan
|
794cd2b1e8
|
phone number inprogress
|
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 |