 Sikander Saleem
|
eaac923580
|
imp
|
2 years ago |
|
Sikander Saleem
|
6c22befe83
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!29
|
2 years ago |
Fatimah Alshammari
|
15cfc0b9f4
|
merge conflict fixed
|
2 years ago |
|
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
2 years ago |
|
Sikander Saleem
|
f0a88b56ca
|
Merge branch 'development_mirza' into 'master'
Development mirza
See merge request mirza.shafique/mohem_flutter_app!28
|
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 |
|
Sikander Saleem
|
1841057ce6
|
app icon added.
|
2 years ago |
|
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
2 years ago |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
2 years ago |
|
Sikander Saleem
|
7382675f45
|
Merge branch 'development_sultan' into 'master'
Development sultan
See merge request mirza.shafique/mohem_flutter_app!25
|
2 years ago |
Sultan Khan
|
794cd2b1e8
|
phone number inprogress
|
2 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
|
2 years ago |
|
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
2 years ago |
|
Sultan Khan
|
88d2e05ae7
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
91a67638c4
|
phone number inprogress
|
2 years ago |
|
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
2 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
|
2 years ago |
|
Sikander Saleem
|
3e6fdd2cb5
|
missing swipe added.
|
2 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
|
2 years ago |
|
Sikander Saleem
|
cee80111fc
|
for comment
|
2 years ago |
|
Sikander Saleem
|
1e9a26e3df
|
missing swipe cont
|
2 years ago |
|
Sultan Khan
|
979879a286
|
phone number is progress
|
2 years ago |
|
Sikander Saleem
|
c4096bd44d
|
improvements
|
2 years ago |
|
Sikander Saleem
|
9cc86751eb
|
missing swipe cont
|
2 years ago |
|
Sultan Khan
|
8f80bbb9db
|
profile dynamic forms
|
2 years ago |
|
Sultan Khan
|
b5a5399b95
|
profile
|
2 years ago |
|
Sultan Khan
|
13150321d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sikander Saleem
|
e671f0413d
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!22
|
2 years ago |
|
Sikander Saleem
|
e00e146a76
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
2 years ago |
|
Sikander Saleem
|
f2b378e33a
|
dynamic forms cont.
|
2 years ago |
|
Fatimah Alshammari
|
1305e895a1
|
fix arabic translation
|
2 years ago |
|
Sultan Khan
|
f8651ab49a
|
app bar
|
2 years ago |
|
Sultan Khan
|
a0ccacf078
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
fad58931f3
|
profile
|
2 years ago |
|
Fatimah Alshammari
|
44c9a090f9
|
fix personal details
|
2 years ago |
|
Sultan Khan
|
57f789ca6d
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
2 years ago |
|
Sultan Khan
|
74c06203db
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
6e86c0ba38
|
profile details
|
2 years ago |
|
Fatimah Alshammari
|
393e28b32c
|
fix profile
|
2 years ago |
|
devmirza121
|
3fce58b379
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_last_login_screen.dart
|
2 years ago |
|
devmirza121
|
2887894330
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/login/login_screen.dart
|
2 years ago |
|
devmirza121
|
ec845756be
|
Login Issue Fix's
|
2 years ago |
|
Fatimah Alshammari
|
b281efe14c
|
fix monthly attendance
|
2 years ago |
|
Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
49bc689351
|
Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sikander Saleem
|
dec5ebe8fe
|
Merge branch 'development_sikander' into 'master'
my attendance working cont-1
See merge request mirza.shafique/mohem_flutter_app!21
|
2 years ago |