Faiz Hashmi
|
4cb7bbee5d
|
Pushing while testing!
|
3 years ago |
|
Faiz Hashmi
|
3f7e1cd0be
|
Pushing before updating API Structure
|
3 years ago |
haroon amjad
|
660fdb63dd
|
Updates & fixes
|
3 years ago |
|
Faiz Hashmi
|
86d25d3ecc
|
Added Privileged logic for Marathon
|
3 years ago |
Fatimah Alshammari
|
dde200fd7a
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
29c9caddde
|
Merge branch 'master' into fatima
# Conflicts:
# lib/classes/consts.dart
# lib/ui/misc/request_submit_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
c51af6522c
|
fix issues
|
3 years ago |
 Aamir Muhammad
|
34c15e7026
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
7f043e6048
|
Chat Tune Added
|
3 years ago |
|
Faiz Hashmi
|
603ff1b19f
|
Committing after API replacement from SignalR => InProgress
|
3 years ago |
|
Faiz Hashmi
|
96e52abbb9
|
Committing before reverting from SignalR to Apis
|
3 years ago |
|
Faiz Hashmi
|
49b57cae08
|
Code Reformatting and Added Logics
|
3 years ago |
|
Faiz Hashmi
|
c57f6e5be3
|
Added QuestionsAnswer Statuses Handling
|
3 years ago |
 Sikander Saleem
|
cecfd7034e
|
assets added for services & worklist
|
3 years ago |
Sikander Saleem
|
3cac5eebbc
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
f19d734dbb
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
670a5fbc03
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
55ff08c3f3
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
ee0e774611
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/colors.dart
# lib/classes/consts.dart
|
3 years ago |
|
Aamir Muhammad
|
8ba3dcf43b
|
Chat Fixes & Favorite Api Implementation
|
3 years ago |
haroon amjad
|
2fdde18b52
|
Merge branch 'faiz_cs' into 'master'
Updated Banner Again :D
See merge request Cloud_Solution/mohemm-flutter-app!49
|
3 years ago |
|
FaizHashmiCS22
|
9bdb6bfb71
|
Updated Banner Again :D
|
3 years ago |
|
haroon amjad
|
00e81999de
|
Merge branch 'faiz_cs' into 'master'
Updated Banner Design and Success tone on Lottiee
See merge request Cloud_Solution/mohemm-flutter-app!46
|
3 years ago |
|
FaizHashmiCS22
|
034436425a
|
Added success tone
|
3 years ago |
|
FaizHashmiCS22
|
b2e03b2647
|
Added attendance svg
|
3 years ago |
|
FaizHashmiCS22
|
fe8c6f9060
|
Updated Marathon Banner Design
|
3 years ago |
|
haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
ea676e19ca
|
JIRA Fixes
|
3 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
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
|
235dc6b1f4
|
Merge branch 'master' into development_aamir
|
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
|
c0ee98b06e
|
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 |
|
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 |
|
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 |
|
FaizHashmiCS22
|
db174035ca
|
Icons updated
|
3 years ago |
|
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
|
FaizHashmiCS22
|
f3623e29dc
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
haroon amjad
|
966fb5e209
|
Worklist fixes
|
3 years ago |
|
FaizHashmiCS22
|
5ed9991428
|
Added new Intimmation Screens with Lottie
|
3 years ago |
|
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
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 |
|
Sikander Saleem
|
defa8a8adb
|
redirection added on worklist detail when approve or reject.
|
3 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
3 years ago |
|
Sikander Saleem
|
200b56a992
|
improvements
|
3 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
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 |
|
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 |
|
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug fixes
|
3 years ago |
|
Sikander Saleem
|
e090b9be0b
|
Merge branch 'development_mirza' into 'master'
Login with face and finger fixed
See merge request mirza.shafique/mohem_flutter_app!83
|
3 years ago |
|
devmirza121
|
8ce3a09375
|
Login with face and finger fixed
|
3 years ago |
|
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
3 years ago |
|
Fatimah Alshammari
|
957c88f58f
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
241172b7e7
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
b7685295d9
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
cfe0460ea5
|
my team issues fixed
|
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
|
2eedef7c2c
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
7eadd97869
|
item for sale ui improvements & translation added.
|
3 years ago |
Sultan Khan
|
70a7108d9c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
|
Sultan Khan
|
f3477fb5f3
|
perforamce page updates
|
3 years ago |
|
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
3 years ago |
|
Sikander Saleem
|
2ce3c535d2
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
3 years ago |
|
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
3 years ago |
|
Fatimah Alshammari
|
907b205d21
|
added subordinate leave
|
3 years ago |
|
Sikander Saleem
|
9314ea0514
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
|
3 years ago |
|
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 years ago |
|
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
3 years ago |
|
Sikander Saleem
|
1404715425
|
Vacation rule translation added.
|
3 years ago |
|
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
3 years ago |
|
Sultan Khan
|
39b916bcc8
|
performance page added
|
3 years ago |
|
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
b502e038a5
|
fix issue
|
3 years ago |
|
Sikander Saleem
|
0d812cf266
|
Vacation rule added.
|
3 years ago |
|
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
3 years ago |
|
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
3 years ago |
|
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
3 years ago |