haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
ea676e19ca
|
JIRA Fixes
|
3 years ago |
haroon amjad
|
54b9595add
|
Merge branch 'faiz_cs' into 'master'
UI Fixes
See merge request Cloud_Solution/mohemm-flutter-app!43
|
3 years ago |
FaizHashmiCS22
|
bdb8de15e3
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
FaizHashmiCS22
|
09b2f8a23f
|
UI Fixes
|
3 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
3 years ago |
Fatimah Alshammari
|
0a0c173331
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
0cca8ec935
|
fix issues
|
3 years ago |
mirza.shafique
|
5880e22771
|
merge fix
|
3 years ago |
|
mirza.shafique
|
e9de5c340b
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
3 years ago |
|
devmirza121
|
f06238a93f
|
OTP dialog new design
|
3 years ago |
 Aamir Muhammad
|
77a56759dc
|
Chat Delivered&Seen Event Added.
|
3 years ago |
|
Aamir Muhammad
|
f0d2c78f83
|
Chat Delivered&Seen Event Added.
|
3 years ago |
|
Aamir Muhammad
|
96e1be7823
|
Chat Delivered&Seen Event Added.
|
3 years ago |
|
Aamir Muhammad
|
235dc6b1f4
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
7408e24245
|
Chat Delivered&Seen Event Added.
|
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
|
1a2c9d1b15
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!37
|
3 years ago |
|
haroon amjad
|
ba588cd3a3
|
Merge branch 'faiz_cs' into 'master'
Added Answer Selection Status in Marathon
See merge request Cloud_Solution/mohemm-flutter-app!38
|
3 years ago |
|
haroon amjad
|
d77f9a3362
|
Worklist fixes
|
3 years ago |
|
Aamir Muhammad
|
6d5b2323ac
|
Merge branch 'master' into development_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
710ec44293
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/ui/login/login_screen.dart
# lib/ui/marathon/marathon_screen.dart
|
3 years ago |
|
FaizHashmiCS22
|
11e4da6478
|
Added Answer Selected Status
|
3 years ago |
|
Sikander Saleem
|
6e409c77a0
|
mark attendance counter & ios nfc fixed 1.0
|
3 years ago |
|
Fatimah Alshammari
|
79774416b4
|
Merge branch 'master' into fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Fatimah Alshammari
|
69ded3dc43
|
fix my request
|
3 years ago |
|
Sikander Saleem
|
39240b734e
|
mark attendance counter & ios nfc fixed
|
3 years ago |
|
Aamir Muhammad
|
40b9cb9576
|
Chat Fixes
|
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 |
|
FaizHashmiCS22
|
db174035ca
|
Icons updated
|
3 years ago |
|
haroon amjad
|
8f84e51b6d
|
Merge branch 'master' into development_haroon
|
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 |
|
haroon amjad
|
5840a6b4fa
|
Merge branch 'master' into development_haroon
|
3 years ago |
 Sikander Saleem
|
1cd7cd4d76
|
issues fixed.
|
3 years ago |
|
FaizHashmiCS22
|
f0129399e6
|
Resolved issue in Release mode
|
3 years ago |
|
haroon amjad
|
b169b658dc
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
cf9f84f38b
|
PO fixes
|
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
|
f3623e29dc
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
haroon amjad
|
c1666b7140
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!30
|
3 years ago |
|
haroon amjad
|
966fb5e209
|
Worklist fixes
|
3 years ago |
|
FaizHashmiCS22
|
199a65a994
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
FaizHashmiCS22
|
5ed9991428
|
Added new Intimmation Screens with Lottie
|
3 years ago |
|
Fatimah Alshammari
|
2d40ede37f
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
2002359ff1
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
e4db7e0cc2
|
fix issues
|
3 years ago |
|
haroon amjad
|
2704fcd147
|
PR Fixes
|
3 years ago |
|
Fatimah Alshammari
|
7024a6b73a
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
e2519b5df2
|
fix issues
|
3 years ago |
|
haroon amjad
|
b2810b53ba
|
Revert yesterday changes
|
3 years ago |
|
haroon amjad
|
588e8f51f0
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
3 years ago |
|
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
70eceaf648
|
Adding interactions
|
3 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
3 years ago |
|
Fatimah Alshammari
|
af56d8f71b
|
fix issues
|
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 |
|
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
|
3 years ago |
|
Fatimah Alshammari
|
7b4fe5bcbc
|
fix issues
|
3 years ago |
|
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
Aamir Muhammad
|
912ac80707
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
636d6935bc
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
82afd0ae61
|
Chat Fixes
|
3 years ago |
|
Fatimah Alshammari
|
1b13b732b8
|
fix issues
|
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
|
e7d2299b43
|
improvement.
|
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 |
|
Aamir Muhammad
|
90b60ce55a
|
Chat Search User Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
a623765510
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
haroon amjad
|
109c0ca0a2
|
PR PO fixes, Worklist fixes
|
3 years ago |
|
Aamir Muhammad
|
05c6cc7f14
|
Chat Search User Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
d4b31d4338
|
Chat Login Api Implementation
|
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
|
eea0df3614
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Aamir Muhammad
|
a90da83fa5
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/api/chat/chat_provider_model.dart
|
3 years ago |
|
Sikander Saleem
|
b544273416
|
improvements
|
3 years ago |
|
Aamir Muhammad
|
d24103b872
|
Chat Login Api Implementation
|
3 years ago |
|
Sikander Saleem
|
02aff92726
|
advance search improvement, approve delegate added.
|
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
|
f07167e734
|
Leave balance fix, Items for sale fix
|
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 |
|
haroon amjad
|
8923b49546
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/login/login_screen.dart
|
3 years ago |
|
haroon amjad
|
34cb722b96
|
updates
|
3 years ago |
|
Sikander Saleem
|
200b56a992
|
improvements
|
3 years ago |
|
Sikander Saleem
|
49bd4114ce
|
improvements
|
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 |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
e115137205
|
Chat Implementation Version 1
|
3 years ago |
|
Sikander Saleem
|
d26b7e0753
|
worklist improvements
|
3 years ago |
|
Sikander Saleem
|
91abaa8475
|
improvements.
|
3 years ago |
|
Sikander Saleem
|
5c5da60b12
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
d61315a5fe
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
f0ec4843b4
|
end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.
|
3 years ago |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
3 years ago |
Sultan khan
|
eaae618f25
|
bug fixes
|
3 years ago |
|
Sultan khan
|
b3d76df457
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
398880c4ad
|
bug fixes
|
3 years ago |
|
devmirza121
|
0d0832277f
|
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/work_list/worklist_fragments/detail_fragment.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
116175efaa
|
Work list UI Change
|
3 years ago |
|
Sikander Saleem
|
bf7a18b91c
|
action colors added. contact details improvement
|
3 years ago |
|
Sikander Saleem
|
f36606f603
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/work_list_screen.dart
|
3 years ago |
|
Sikander Saleem
|
06810486e3
|
dynamic list center issue fixed.
|
3 years ago |
|
Sultan khan
|
ca3febeccd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
|
Sultan khan
|
8d9561b570
|
COC changes
|
3 years ago |
|
Sikander Saleem
|
d6315b0674
|
fixes.
|
3 years ago |
|
Sikander Saleem
|
ba8e272885
|
pull to refresh added on worklist screen.
|
3 years ago |
|
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
ba65fbb79d
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
13e9c5fa21
|
centering issue in dynamic list view screen fixed.
|
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 |
|
haroon amjad
|
4c1927bee5
|
ITG request flow fixed
|
3 years ago |
|
haroon amjad
|
9f74c3c39a
|
ITG request flow fixed
|
3 years ago |
|
Sikander Saleem
|
6cd0c4c358
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
e8c8c225c7
|
icon direction bug fixes
|
3 years ago |
|
devmirza121
|
0fa88555fb
|
Employee Digital Id Fixed
|
3 years ago |
|
Sikander Saleem
|
ef96f9703f
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug fixes
|
3 years ago |
|
devmirza121
|
c05b8eee29
|
Remote Changed
|
3 years ago |
|
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
3 years ago |
|
Sikander Saleem
|
0c7fbde013
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/my_attendance/services_menu_list_screen.dart
|
3 years ago |
|
Sikander Saleem
|
9a0131277b
|
create request by manager in my team, improvements
|
3 years ago |
|
haroon amjad
|
dd26452663
|
Fixes & updates
|
3 years ago |
|
Sikander Saleem
|
9ce042e7d3
|
bussiness card improvement.
|
3 years ago |
|
haroon amjad
|
c14bfd22db
|
Mohemm Android build given to QA
|
3 years ago |
|
devmirza121
|
d8938ba256
|
improvement
|
3 years ago |