Sikander Saleem
|
9314ea0514
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
|
2 years ago |
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
2 years ago |
Sikander Saleem
|
c0ec2260e5
|
mark attendance improvement.
|
2 years ago |
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
2 years ago |
Fatimah Alshammari
|
8aa14618d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
|
2 years ago |
Sikander Saleem
|
9b50c2cf31
|
mark attendance improvement.
|
2 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
|
2 years ago |
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
2 years ago |
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
2 years ago |
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
2 years ago |
Fatimah Alshammari
|
d1cc9bd468
|
fix issue
|
2 years ago |
Fatimah Alshammari
|
058e287b25
|
fix translation
|
2 years ago |
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
2 years ago |
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
2 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
2 years ago |
devmirza121
|
8fe51a654c
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/main.dart
# lib/ui/landing/today_attendance_screen.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
2 years ago |
Fatimah Alshammari
|
1604cba140
|
fix translation.
|
2 years ago |
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
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 |
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 |
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
|
1e9a26e3df
|
missing swipe cont
|
2 years ago |
Sikander Saleem
|
9cc86751eb
|
missing swipe cont
|
2 years ago |
Sultan Khan
|
b5a5399b95
|
profile
|
2 years ago |
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
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 |
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
|
3 years ago |
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
3 years ago |
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
3 years ago |
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
3 years ago |
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
3 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
|
3 years ago |
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
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
|
e3d331a223
|
loading icon added
|
3 years ago |
tall3at
|
22a9b3e818
|
Request and Delegate sheets
|
3 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
|
3 years ago |
Sikander Saleem
|
b38f4287b6
|
today attendance progress added(cont)
|
3 years ago |
tall3at
|
6138919b01
|
internal Work List screen 1.0
|
3 years ago |
tall3at
|
b2466122d3
|
internal Work List screen
|
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 |
Sikander Saleem
|
761b5abbab
|
model improvements
|
3 years ago |
tall3at
|
89f6df8c77
|
basic structure
|
3 years ago |