haroon amjad
|
fb2924964b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
3 years ago |
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 years ago |
|
haroon amjad
|
a05d037211
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/colors.dart
# lib/extensions/string_extensions.dart
# lib/ui/screens/announcements/announcement_details.dart
# lib/ui/screens/announcements/announcements.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
# lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
|
3 years ago |
|
haroon amjad
|
a855e535cd
|
Item for sale implemented
|
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
|
20f7d98ce5
|
profile improvements
|
3 years ago |
 Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
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 |
|
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
3 years ago |
|
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
3 years ago |
|
Fatimah Alshammari
|
393e28b32c
|
fix profile
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
b281efe14c
|
fix monthly attendance
|
3 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 |
|
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 |
tall3at
|
22a9b3e818
|
Request and Delegate sheets
|
4 years ago |
|
Sikander Saleem
|
cbe471c7b0
|
improvements
|
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
|
b38f4287b6
|
today attendance progress added(cont)
|
4 years ago |
|
tall3at
|
b2466122d3
|
internal Work List screen
|
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 |