Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
3 years ago |
Sikander Saleem
|
18084ce29f
|
services menu structure improvements.
|
3 years ago |
haroon amjad
|
40cdaca0ef
|
Merge branch 'master' into development_haroon
|
3 years ago |
Sikander Saleem
|
55f1f792f9
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/models/profile_menu.model.dart
|
3 years ago |
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
3 years ago |
Sultan Khan
|
39b916bcc8
|
performance page added
|
3 years ago |
haroon amjad
|
1719c7029e
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/announcements/announcement_details.dart
# pubspec.yaml
|
3 years ago |
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
3 years ago |
Fatimah Alshammari
|
058e287b25
|
fix translation
|
3 years ago |
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
3 years ago |
Fatimah Alshammari
|
b502e038a5
|
fix issue
|
3 years ago |
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
3 years ago |
Sikander Saleem
|
04520250a5
|
badge on work list in bottom navigation bar.
|
3 years ago |
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
3 years ago |
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
3 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
3 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
|
3 years ago |
devmirza121
|
4dc4a3fafb
|
Merge issue 1.0
|
3 years ago |
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
3 years ago |
Fatimah Alshammari
|
1ef3783fb9
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/profile_api_client.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/landing/widget/app_drawer.dart
# lib/ui/profile/delete_familyMember.dart
# lib/ui/profile/family_members.dart
# lib/ui/profile/phone_numbers.dart
# lib/ui/screens/profile/profile_screen.dart
|
3 years ago |
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
3 years ago |
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
3 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
3 years ago |
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
3 years ago |
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
3 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
3 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
3 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
|
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 |
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
3 years ago |
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
3 years ago |
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
3 years ago |
Sultan Khan
|
13150321d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
3 years ago |
Sultan Khan
|
6e86c0ba38
|
profile details
|
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
|
3 years ago |
devmirza121
|
ec845756be
|
Login Issue Fix's
|
3 years ago |
Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
4 years ago |
Sultan Khan
|
2f395f29df
|
Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sultan Khan
|
ff17adfd09
|
Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sikander Saleem
|
9b5147b565
|
merge improvements
|
4 years ago |
Sultan Khan
|
06b3726d4a
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
Sultan Khan
|
0974861463
|
updated menus
|
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
|
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 |
devmirza121
|
a4fb526b68
|
NFC Attendance implement 1.4
|
4 years ago |
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
4 years ago |
devmirza121
|
eb3ddb3d9e
|
NFC Attendance implement 1.3
|
4 years ago |
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
4 years ago |
Sultan Khan
|
da6b935c0b
|
subpages changes
|
4 years ago |
devmirza121
|
681fe7fb38
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
4 years ago |
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
4 years ago |
devmirza121
|
c4b7046a90
|
Dashboard API's 1.3
|
4 years ago |
devmirza121
|
b6670289b1
|
Dashboard API's 1.2
|
4 years ago |
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
4 years ago |
devmirza121
|
baa7182655
|
Dashboard API's 1.0
|
4 years ago |
devmirza121
|
a109a0529f
|
Merge branch 'master' into development_mirza
|
4 years ago |
devmirza121
|
c2ced77bca
|
shimmer
|
4 years ago |
Sikander Saleem
|
bf08417bfa
|
login apis and models added.
|
4 years ago |
tall3at
|
22a9b3e818
|
Request and Delegate sheets
|
4 years ago |
Sikander Saleem
|
cbe471c7b0
|
improvements
|
4 years ago |
Sikander Saleem
|
b38f4287b6
|
today attendance progress added(cont)
|
4 years ago |