Faiz Hashmi
|
35a4b780a7
|
Added initial APIs for Marathon
|
3 years ago |
haroon amjad
|
d1652ef04d
|
Merge branch 'development_mirza' into 'master'
attendance file fixed
See merge request Cloud_Solution/mohemm-flutter-app!40
|
3 years ago |
Sikander Saleem
|
e4737f403e
|
attendance file fixed
|
3 years ago |
|
haroon amjad
|
bf802f3d67
|
Merge branch 'development_mirza' into 'master'
Development mirza
See merge request Cloud_Solution/mohemm-flutter-app!36
|
3 years ago |
haroon amjad
|
d77f9a3362
|
Worklist fixes
|
3 years ago |
|
Sikander Saleem
|
39240b734e
|
mark attendance counter & ios nfc fixed
|
3 years ago |
|
haroon amjad
|
c22736dd79
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
c87a00df6a
|
Jira fixes
|
3 years ago |
|
haroon amjad
|
8be8525360
|
Merge branch 'development_mirza' into 'master'
mark attendance counter 1.0
See merge request Cloud_Solution/mohemm-flutter-app!35
|
3 years ago |
|
Sikander Saleem
|
528b0930c2
|
mark attendance counter 1.0
|
3 years ago |
|
haroon amjad
|
e1030d73b2
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
|
haroon amjad
|
09d2d9936b
|
Jira Fixes
|
3 years ago |
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
|
FaizHashmiCS22
|
f9885fa979
|
Merge branch 'master' into development_faiz
|
3 years ago |
 Sikander Saleem
|
0a73cced51
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
212f8e6663
|
worklist & itg counters issue resolved, delegate & request info in itg added.
|
3 years ago |
|
FaizHashmiCS22
|
199a65a994
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
3 years ago |
|
FaizHashmiCS22
|
3457136cdc
|
Updated the Banner calling
|
3 years ago |
|
FaizHashmiCS22
|
ab59821428
|
Merge conflicts resolved
|
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 |
|
Sikander Saleem
|
0ad9d4dd9e
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
defa8a8adb
|
redirection added on worklist detail when approve or reject.
|
3 years ago |
|
haroon amjad
|
aabc86290a
|
Language change option added in app drawer
|
3 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
haroon amjad
|
27ac98539f
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
4024e5fd3f
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
27b5cbfdf6
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
3 years ago |
|
Sikander Saleem
|
0213a7a4ef
|
worklist api calling delay fixed.
|
3 years ago |
|
Sikander Saleem
|
c29d003401
|
services dynamic list issue fixed on payslip
|
3 years ago |
|
haroon amjad
|
8f9fb5eb1d
|
image fixes
|
3 years ago |
|
haroon amjad
|
c8d25c997b
|
Revert "updates"
This reverts commit 981fc9f8d207334488189c9051042d3792452592.
|
3 years ago |
|
haroon amjad
|
da7929bf3e
|
updates
|
3 years ago |
|
Sikander Saleem
|
b429b139c8
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
3 years ago |
|
haroon amjad
|
847b9df6fc
|
date fix in dashboard
|
3 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
3 years ago |
|
Sikander Saleem
|
7aa2e0f000
|
code of conduct, workmen regulations added. & improvement.
|
3 years ago |
|
Sikander Saleem
|
d200624ac2
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
 Aamir Muhammad
|
963dcce941
|
adding chat option on dashboard
|
3 years ago |
|
Sikander Saleem
|
d26b7e0753
|
worklist improvements
|
3 years ago |
Sultan khan
|
398880c4ad
|
bug fixes
|
3 years ago |
|
haroon amjad
|
e65beebfe8
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
haroon amjad
|
866bb8a29e
|
Pull to refresh, Items for Sale & Offers n Discounts fixes
|
3 years ago |
|
Sikander Saleem
|
6cd0c4c358
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
e8c8c225c7
|
icon direction bug fixes
|
3 years ago |
|
Sikander Saleem
|
ef96f9703f
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug fixes
|
3 years ago |
|
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
3 years ago |
|
Sikander Saleem
|
9ce042e7d3
|
bussiness card improvement.
|
3 years ago |