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
|
86eb349919
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!74
|
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
|
30d9dca034
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!73
|
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
|
5db6d96ce6
|
Merge branch 'development_aamir' into 'master'
Chat Fixes & Chat Media Preview Api Implementation
See merge request Cloud_Solution/mohemm-flutter-app!72
|
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 |
|
haroon amjad
|
4d14184f34
|
Merge branch 'development_aamir' into 'master'
Chat Fixes
See merge request Cloud_Solution/mohemm-flutter-app!71
|
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
|
26e276d074
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!70
|
3 years ago |
|
Sikander Saleem
|
7f2aa4415d
|
improvement.
|
3 years ago |
|
Aamir Muhammad
|
4860f28bd9
|
Merge branch 'master' into development_aamir
|
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 |
|
Sikander Saleem
|
13e89c53ba
|
Merge branch 'development_aamir' into 'master'
Chat Fixes & ITG Notification
See merge request Cloud_Solution/mohemm-flutter-app!69
|
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
|
2695cfa7fe
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!68
|
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 |
|
haroon amjad
|
1b4bd7eac4
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!67
|
3 years ago |
Fatimah Alshammari
|
387c3f5e28
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
8169936bc0
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
90c34ccbc5
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!66
|
3 years ago |
|
Sikander Saleem
|
7068708694
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
cecfd7034e
|
assets added for services & worklist
|
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 |
|
haroon amjad
|
2a65af9414
|
Merge branch 'sultan-dev' into 'master'
Sultan dev
See merge request Cloud_Solution/mohemm-flutter-app!65
|
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 |