 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
|
7cf1871e8a
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!33
|
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 |
|
Sikander Saleem
|
a7dd3345f2
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request mirza.shafique/mohem_flutter_app!32
|
3 years ago |
|
haroon amjad
|
12225d8a25
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
9e8bc47f7e
|
Mowadhafhi request completed
|
3 years ago |
|
Sikander Saleem
|
c2c43ed50e
|
Merge branch 'development_sikander' into 'master'
merge issue fixed
See merge request mirza.shafique/mohem_flutter_app!31
|
3 years ago |
|
Sikander Saleem
|
42e93e42a9
|
merge issue fixed
|
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
|
dd146179ec
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!30
|
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 |
|
Sikander Saleem
|
eaac923580
|
imp
|
3 years ago |
|
Sikander Saleem
|
6c22befe83
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!29
|
3 years ago |
|
Fatimah Alshammari
|
15cfc0b9f4
|
merge conflict fixed
|
3 years ago |
|
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
f0a88b56ca
|
Merge branch 'development_mirza' into 'master'
Development mirza
See merge request mirza.shafique/mohem_flutter_app!28
|
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 |
|
Sikander Saleem
|
1841057ce6
|
app icon added.
|
3 years ago |
|
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
3 years ago |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
3 years ago |
|
Sikander Saleem
|
7382675f45
|
Merge branch 'development_sultan' into 'master'
Development sultan
See merge request mirza.shafique/mohem_flutter_app!25
|
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 |
|
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
3 years ago |
|
Sultan Khan
|
88d2e05ae7
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
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
|
6863c218c3
|
Merge branch 'development_sultan' into 'master'
Merge branch 'development_sikander' of...
See merge request mirza.shafique/mohem_flutter_app!24
|
3 years ago |
|
Sikander Saleem
|
cee80111fc
|
for comment
|
3 years ago |
|
Sikander Saleem
|
1e9a26e3df
|
missing swipe cont
|
3 years ago |
|
Sikander Saleem
|
1c22905fcc
|
Merge branch 'development_sultan' into 'main'
merge request
See merge request mirza.shafique/mohem_flutter_app!23
|
3 years ago |
|
Sultan Khan
|
979879a286
|
phone number is progress
|
3 years ago |
|
Sikander Saleem
|
c4096bd44d
|
improvements
|
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 |