haroon amjad
|
588e8f51f0
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
2 years ago |
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
2 years ago |
|
FaizHashmiCS22
|
70eceaf648
|
Adding interactions
|
2 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
2 years ago |
haroon amjad
|
5df6f71235
|
Merge branch 'fatima' into 'master'
fix issues
See merge request Cloud_Solution/mohemm-flutter-app!26
|
2 years ago |
Fatimah Alshammari
|
af56d8f71b
|
fix issues
|
2 years ago |
|
FaizHashmiCS22
|
3457136cdc
|
Updated the Banner calling
|
2 years ago |
|
FaizHashmiCS22
|
ab59821428
|
Merge conflicts resolved
|
2 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
|
2 years ago |
|
Fatimah Alshammari
|
f515c0b39a
|
Merge branch 'master' into fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
2 years ago |
|
Fatimah Alshammari
|
7b4fe5bcbc
|
fix issues
|
2 years ago |
|
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
2 years ago |
|
Fatimah Alshammari
|
1b13b732b8
|
fix issues
|
2 years ago |
 Sikander Saleem
|
b971795be9
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!25
|
2 years ago |
|
Sikander Saleem
|
0ad9d4dd9e
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
defa8a8adb
|
redirection added on worklist detail when approve or reject.
|
2 years ago |
|
haroon amjad
|
120f19de14
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!24
|
2 years ago |
|
haroon amjad
|
aabc86290a
|
Language change option added in app drawer
|
2 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
2 years ago |
|
haroon amjad
|
27ac98539f
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
4024e5fd3f
|
updates & fixes
|
2 years ago |
|
Sikander Saleem
|
ff57d9291c
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!23
|
2 years ago |
|
Sikander Saleem
|
e7d2299b43
|
improvement.
|
2 years ago |
|
Sikander Saleem
|
27b5cbfdf6
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
|
Sikander Saleem
|
a5a2f48b70
|
Merge branch 'development_aamir' into 'master'
Chat Search User Api Implementation
See merge request Cloud_Solution/mohemm-flutter-app!22
|
2 years ago |
|
Sikander Saleem
|
0213a7a4ef
|
worklist api calling delay fixed.
|
2 years ago |
|
Sikander Saleem
|
c29d003401
|
services dynamic list issue fixed on payslip
|
2 years ago |
 Aamir Muhammad
|
90b60ce55a
|
Chat Search User Api Implementation
|
2 years ago |
|
Aamir Muhammad
|
a623765510
|
Merge branch 'master' into development_aamir
|
2 years ago |
|
haroon amjad
|
caa5513e62
|
Merge branch 'development_haroon' into 'master'
PR PO fixes, Worklist fixes
See merge request Cloud_Solution/mohemm-flutter-app!21
|
2 years ago |
|
haroon amjad
|
109c0ca0a2
|
PR PO fixes, Worklist fixes
|
2 years ago |
|
Aamir Muhammad
|
8fa6d363c9
|
Merge branch 'master' into development_aamir
|
2 years ago |
|
Aamir Muhammad
|
05c6cc7f14
|
Chat Search User Api Implementation
|
2 years ago |
|
Aamir Muhammad
|
d4b31d4338
|
Chat Login Api Implementation
|
2 years ago |
|
haroon amjad
|
8f9fb5eb1d
|
image fixes
|
2 years ago |
|
haroon amjad
|
c8d25c997b
|
Revert "updates"
This reverts commit 981fc9f8d207334488189c9051042d3792452592.
|
2 years ago |
|
haroon amjad
|
da7929bf3e
|
updates
|
2 years ago |
|
Sikander Saleem
|
eea0df3614
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
5e651dcc1b
|
Merge branch 'development_aamir' into 'master'
Chat Login Api Implementation
See merge request Cloud_Solution/mohemm-flutter-app!19
|
2 years ago |
|
Aamir Muhammad
|
a90da83fa5
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/api/chat/chat_provider_model.dart
|
2 years ago |
|
Sikander Saleem
|
b544273416
|
improvements
|
2 years ago |
|
Aamir Muhammad
|
d24103b872
|
Chat Login Api Implementation
|
2 years ago |
|
Sikander Saleem
|
02aff92726
|
advance search improvement, approve delegate added.
|
2 years ago |
|
Sikander Saleem
|
b429b139c8
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
|
haroon amjad
|
a4483fcadf
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!18
|
2 years ago |
|
haroon amjad
|
f07167e734
|
Leave balance fix, Items for sale fix
|
2 years ago |
|
haroon amjad
|
847b9df6fc
|
date fix in dashboard
|
2 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
2 years ago |
|
Sikander Saleem
|
7aa2e0f000
|
code of conduct, workmen regulations added. & improvement.
|
2 years ago |