Faiz Hashmi
|
2f825151a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/consts.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/marathon/marathon_intro_screen.dart
# lib/ui/marathon/marathon_provider.dart
# lib/ui/marathon/marathon_screen.dart
# lib/ui/marathon/marathon_winner_selection.dart
# lib/ui/marathon/widgets/question_card.dart
# pubspec.yaml
|
3 years ago |
Faiz Hashmi
|
c57f6e5be3
|
Added QuestionsAnswer Statuses Handling
|
3 years ago |
Sikander Saleem
|
91a0be7974
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
Sikander Saleem
|
7d651c247a
|
marathon improvements.
|
3 years ago |
haroon amjad
|
0ca002d9be
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/chat/chat_home_screen.dart
|
3 years ago |
Faiz Hashmi
|
59ad00ca2a
|
Fetched Questoins and Added Answer Interactivity
|
3 years ago |
haroon amjad
|
46af0c42c7
|
updates & fixes
|
3 years ago |
Aamir Muhammad
|
04f5847af9
|
Chat Fixes & Chat Media Preview Api Implementation
|
3 years ago |
Aamir Muhammad
|
0538a3c313
|
Chat Fixes & Chat Media Preview Api Implementation
|
3 years ago |
Aamir Muhammad
|
967257ec2e
|
Chat Fixes
|
3 years ago |
Faiz Hashmi
|
904e4df424
|
Questions Fetching process in Progress
|
3 years ago |
haroon amjad
|
f39817936f
|
Merge branch 'master' into development_haroon
|
3 years ago |
Aamir Muhammad
|
545c33ee4a
|
Chat Fixes
|
3 years ago |
haroon amjad
|
ff0c1e1efc
|
Merge branch 'master' into development_haroon
|
3 years ago |
Aamir Muhammad
|
d99bc6e206
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
Sikander Saleem
|
7f2aa4415d
|
improvement.
|
3 years ago |
Sikander Saleem
|
ccb89584e2
|
chat structure issues.
|
3 years ago |
Aamir Muhammad
|
fa36cd7ddf
|
Advertisement Image/ Video Module
|
3 years ago |
Sikander Saleem
|
ce0de886c6
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
# lib/provider/chat_provider_model.dart
# lib/ui/chat/chat_detailed_screen.dart
|
3 years ago |
Sikander Saleem
|
8018120c6a
|
chat structure issues.
|
3 years ago |
Aamir Muhammad
|
bdc00e39d9
|
Merge branch 'master' into development_aamir
|
3 years ago |
Aamir Muhammad
|
fa7e08c215
|
Advertisement Image/ Video Module
|
3 years ago |
Faiz Hashmi
|
192647031a
|
Merge branch 'master' into faiz_cs
|
3 years ago |
Faiz Hashmi
|
8b388220cf
|
Added Question Dart Object
|
3 years ago |
Aamir Muhammad
|
db3e1427c5
|
Advertisement Image/ Video Module
|
3 years ago |
Sikander Saleem
|
cd45330243
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sikander Saleem
|
ef723fe468
|
self user checks added while delegate
|
3 years ago |
Faiz Hashmi
|
cbe251829f
|
Added HubConnection Code
|
3 years ago |
haroon amjad
|
6a0c488435
|
translation fix
|
3 years ago |
Fatimah Alshammari
|
8169936bc0
|
fix issues
|
3 years ago |
Aamir Muhammad
|
ed15ce92b6
|
Chat Updates & Stability
|
3 years ago |
Aamir Muhammad
|
68ebecf98a
|
Chat Updates & Stability
|
3 years ago |
Aamir Muhammad
|
eb7e5a4837
|
Chat Updates & Stability
|
3 years ago |
Faiz Hashmi
|
790cb727e9
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/consts.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
|
3 years ago |
Faiz Hashmi
|
35a4b780a7
|
Added initial APIs for Marathon
|
3 years ago |
Aamir Muhammad
|
dc9d1715d9
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Aamir Muhammad
|
622404896c
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Aamir Muhammad
|
f4f9b442c8
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Sultan khan
|
557a4c3737
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
Sultan khan
|
bcf4a9ec42
|
my team probation issue fixed
|
3 years ago |
haroon amjad
|
c1527f5f0a
|
Merge branch 'master' into development_haroon
|
3 years ago |
Aamir Muhammad
|
ab5de25c81
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Aamir Muhammad
|
32ee792041
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Aamir Muhammad
|
76169e5cb8
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Aamir Muhammad
|
2e88275285
|
Chat Updates & Counter Event Modifications
|
3 years ago |
haroon amjad
|
7cf7824df7
|
Merge branch 'master' into development_haroon
|
3 years ago |
haroon amjad
|
2d8ee5a8eb
|
Merge branch 'development_aamir' into 'master'
Chat Fix
See merge request Cloud_Solution/mohemm-flutter-app!62
|
3 years ago |
Aamir Muhammad
|
c1f3f17c89
|
Chat Updates & Counter Event Modifications
|
3 years ago |
Aamir Muhammad
|
fab16db8b3
|
Chat Updates & Counter Event Modifications
|
3 years ago |
haroon amjad
|
42d2de2ec8
|
Merge branch 'master' into development_haroon
|
3 years ago |