haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
2 years ago |
 Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
2 years ago |
|
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
2 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
|
2 years ago |
|
Sikander Saleem
|
eaac923580
|
imp
|
2 years ago |
Fatimah Alshammari
|
15cfc0b9f4
|
merge conflict fixed
|
2 years ago |
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
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
|
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
|
2 years ago |
|
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
3 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
|
3 years ago |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
3 years ago |
|
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
3 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
3 years ago |
|
devmirza121
|
b6670289b1
|
Dashboard API's 1.2
|
3 years ago |
|
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
3 years ago |
|
Sikander Saleem
|
cbe471c7b0
|
improvements
|
3 years ago |
|
Sikander Saleem
|
b38f4287b6
|
today attendance progress added(cont)
|
3 years ago |
|
Sikander Saleem
|
f16b3c5c79
|
dashboard ui added.
|
3 years ago |
|
Sikander Saleem
|
78ca9e2c70
|
icons added & dashboard ui
|
3 years ago |
|
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
3 years ago |