 Aamir Muhammad
|
670a5fbc03
|
Chat Favorite Screen & Fixes
|
2 years ago |
|
Aamir Muhammad
|
55ff08c3f3
|
Chat Favorite Screen & Fixes
|
2 years ago |
|
Aamir Muhammad
|
ee0e774611
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/colors.dart
# lib/classes/consts.dart
|
2 years ago |
|
Aamir Muhammad
|
8ba3dcf43b
|
Chat Fixes & Favorite Api Implementation
|
2 years ago |
haroon amjad
|
2fdde18b52
|
Merge branch 'faiz_cs' into 'master'
Updated Banner Again :D
See merge request Cloud_Solution/mohemm-flutter-app!49
|
2 years ago |
FaizHashmiCS22
|
9bdb6bfb71
|
Updated Banner Again :D
|
2 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
|
2 years ago |
|
FaizHashmiCS22
|
034436425a
|
Added success tone
|
2 years ago |
|
FaizHashmiCS22
|
b2e03b2647
|
Added attendance svg
|
2 years ago |
|
FaizHashmiCS22
|
fe8c6f9060
|
Updated Marathon Banner Design
|
2 years ago |
haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
ea676e19ca
|
JIRA Fixes
|
2 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
2 years ago |
mirza.shafique
|
5880e22771
|
merge fix
|
2 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
|
2 years ago |
|
devmirza121
|
f06238a93f
|
OTP dialog new design
|
2 years ago |
|
Aamir Muhammad
|
235dc6b1f4
|
Merge branch 'master' into development_aamir
|
2 years ago |
|
haroon amjad
|
1a2c9d1b15
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!37
|
2 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
|
2 years ago |
|
haroon amjad
|
d77f9a3362
|
Worklist fixes
|
2 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
|
2 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
|
2 years ago |
|
FaizHashmiCS22
|
710ec44293
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/ui/login/login_screen.dart
# lib/ui/marathon/marathon_screen.dart
|
2 years ago |
Fatimah Alshammari
|
79774416b4
|
Merge branch 'master' into fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
2 years ago |
|
Fatimah Alshammari
|
69ded3dc43
|
fix my request
|
2 years ago |
|
FaizHashmiCS22
|
db174035ca
|
Icons updated
|
2 years ago |
|
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
2 years ago |
|
FaizHashmiCS22
|
f3623e29dc
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
2 years ago |
|
haroon amjad
|
966fb5e209
|
Worklist fixes
|
2 years ago |
|
FaizHashmiCS22
|
5ed9991428
|
Added new Intimmation Screens with Lottie
|
2 years ago |
|
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
2 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
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 |
|
Aamir Muhammad
|
912ac80707
|
Chat Fixes
|
2 years ago |
 Sikander Saleem
|
defa8a8adb
|
redirection added on worklist detail when approve or reject.
|
2 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
2 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
2 years ago |
|
Sikander Saleem
|
200b56a992
|
improvements
|
2 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
|
Sikander Saleem
|
d61315a5fe
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
f0ec4843b4
|
end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.
|
2 years ago |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
2 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
|
2 years ago |
|
devmirza121
|
116175efaa
|
Work list UI Change
|
2 years ago |
|
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
2 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
2 years ago |