 Aamir Muhammad
|
35f814b74a
|
Merge branch 'master' into development_aamir
|
3 years ago |
Faiz Hashmi
|
5bb998a8d2
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/utils.dart
# lib/ui/marathon/widgets/marathon_banner.dart
|
3 years ago |
|
Faiz Hashmi
|
d9749fc402
|
Updated NoWinnerFoundDesign and some Logical Up gradations
|
3 years ago |
|
Aamir Muhammad
|
12defa65ac
|
Merge branch 'master' into development_aamir
|
3 years ago |
haroon amjad
|
bcf67895b9
|
Dynamic forms & my team fixes
|
3 years ago |
|
Aamir Muhammad
|
abd1fa9375
|
chat voice message implementation
|
3 years ago |
|
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 |