FaizHashmiCS22
|
3c6e4a725f
|
Merge branch 'master' into faiz_cs
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# pubspec.yaml
|
3 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
 Sikander Saleem
|
7aa2e0f000
|
code of conduct, workmen regulations added. & improvement.
|
3 years ago |
|
Sikander Saleem
|
200b56a992
|
improvements
|
3 years ago |
devmirza121
|
0d0832277f
|
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/work_list/worklist_fragments/detail_fragment.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
c05b8eee29
|
Remote Changed
|
3 years ago |
|
Sikander Saleem
|
9ce042e7d3
|
bussiness card improvement.
|
3 years ago |
haroon amjad
|
492a1a9736
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Sikander Saleem
|
90649a0259
|
password visible option added.
|
3 years ago |
|
haroon amjad
|
b0b84c572c
|
Last Login Fixes
|
3 years ago |
|
Sikander Saleem
|
a45b6aece2
|
improvements
|
3 years ago |
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 years ago |
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
3 years ago |
|
Sikander Saleem
|
ce7183a137
|
merge conflicts fixed.
|
3 years ago |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
3 years ago |
|
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
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 |
|
devmirza121
|
ec845756be
|
Login Issue Fix's
|
4 years ago |
|
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
4 years ago |
|
Sikander Saleem
|
9b5147b565
|
merge improvements
|
4 years ago |
|
Sikander Saleem
|
4817781fe1
|
Merge branch 'development_mirza' into development_sikander
# Conflicts:
# lib/provider/dashboard_provider_model.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_last_login_screen.dart
|
4 years ago |
|
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
4 years ago |
|
devmirza121
|
a4fb526b68
|
NFC Attendance implement 1.4
|
4 years ago |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
4 years ago |
|
devmirza121
|
eb3ddb3d9e
|
NFC Attendance implement 1.3
|
4 years ago |
|
devmirza121
|
35d683a8ae
|
NFC Attendance implement 1.0
|
4 years ago |
|
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
4 years ago |
|
devmirza121
|
681fe7fb38
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
4 years ago |
|
devmirza121
|
48a261d674
|
Dashboard API's 1.4
|
4 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
4 years ago |
|
Sikander Saleem
|
e7a67cc58d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/locale_keys.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_login_screen.dart
# pubspec.yaml
|
4 years ago |
|
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
4 years ago |
|
devmirza121
|
baa7182655
|
Dashboard API's 1.0
|
4 years ago |
|
Sikander Saleem
|
e3d331a223
|
loading icon added
|
4 years ago |
|
Sikander Saleem
|
f1beefbc46
|
login apis, models & forgot password screen added.
|
4 years ago |
|
Sikander Saleem
|
f48e09b2d1
|
forgot password screen added.
|
4 years ago |
|
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
4 years ago |