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
|
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 |
|
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
|
b5a5399b95
|
profile
|
3 years ago |
|
Fatimah Alshammari
|
1305e895a1
|
fix arabic translation
|
3 years ago |
|
Sultan Khan
|
fad58931f3
|
profile
|
3 years ago |
|
Sultan Khan
|
74c06203db
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 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
|
4 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
|
4 years ago |
|
Fatimah Alshammari
|
b281efe14c
|
fix monthly attendance
|
4 years ago |
|
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
4 years ago |
|
Fatimah Alshammari
|
0e560558dc
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
Fatimah Alshammari
|
339b343c4c
|
fix calendar
|
4 years ago |
|
Sikander Saleem
|
807d4b4046
|
item creation added.
|
4 years ago |
|
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
4 years ago |
|
devmirza121
|
b898481cf7
|
Merge branch 'Fatima' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
4 years ago |
|
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
4 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
4 years ago |
|
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
4 years ago |
|
Sikander Saleem
|
f1beefbc46
|
login apis, models & forgot password screen added.
|
4 years ago |
|
Sikander Saleem
|
c6ac45fc3d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/colors.dart
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
|
4 years ago |
|
Sikander Saleem
|
f48e09b2d1
|
forgot password screen added.
|
4 years ago |
tall3at
|
bf8dce2afd
|
Work List screen
|
4 years ago |
|
Sikander Saleem
|
f16b3c5c79
|
dashboard ui added.
|
4 years ago |
|
Sikander Saleem
|
78ca9e2c70
|
icons added & dashboard ui
|
4 years ago |
|
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
4 years ago |
|
Sikander Saleem
|
761b5abbab
|
model improvements
|
4 years ago |