Sultan khan
|
ee553ae476
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
aadc7203a6
|
no message
|
3 years ago |
haroon amjad
|
4ff3a5093b
|
Action duration implemented
|
3 years ago |
 Aamir Muhammad
|
8ba3dcf43b
|
Chat Fixes & Favorite Api Implementation
|
3 years ago |
Sikander Saleem
|
39240b734e
|
mark attendance counter & ios nfc fixed
|
3 years ago |
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
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
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
3 years ago |
|
devmirza121
|
116175efaa
|
Work list UI Change
|
3 years ago |
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
3 years ago |
|
Sikander Saleem
|
f3855c3883
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
cbcb3cdc00
|
item for sale improvement cont.
|
3 years ago |
|
Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
3d11273738
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
3 years ago |
|
Sikander Saleem
|
f647b32c65
|
item for sale improvement.
|
3 years ago |
|
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
3 years ago |
|
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
|
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
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
|
028caf1379
|
Offers & Discounts implemented
|
3 years ago |
|
Sikander Saleem
|
20f7d98ce5
|
profile improvements
|
3 years ago |
 Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
3 years ago |
|
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
3 years ago |
|
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
3 years ago |
|
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
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 |
|
Sikander Saleem
|
eaac923580
|
imp
|
3 years ago |
|
Fatimah Alshammari
|
15cfc0b9f4
|
merge conflict fixed
|
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 |
|
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 |
|
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 |
|
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 |
|
devmirza121
|
b6670289b1
|
Dashboard API's 1.2
|
4 years ago |
|
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
4 years ago |
|
Sikander Saleem
|
cbe471c7b0
|
improvements
|
4 years ago |
|
Sikander Saleem
|
b38f4287b6
|
today attendance progress added(cont)
|
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 |