Commit Graph

199 Commits (13822c25346d3d6378097b00f19842bc96e3165a)

Author SHA1 Message Date
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
Sultan khan 61904ca5f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 3 years ago
Aamir Muhammad a746b607df Fixes 3 years ago
Aamir Muhammad 3871d3f1e3 Fixes 3 years ago
Aamir Muhammad 35f814b74a Merge branch 'master' into development_aamir 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Aamir Muhammad 4635c7f3bc 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
Sikander Saleem 642fee7331 worklist setting update data payload issue fixed. 3 years ago
Aamir Muhammad fb3b3e8e46 Voice Chat Fixes & Audio Player Implementation 3 years ago
Aamir Muhammad 47a697f352 chat voice message implementation 3 years ago
Aamir Muhammad abd1fa9375 chat voice message implementation 3 years ago
haroon amjad ece6a68a95 fixes 3 years ago
haroon amjad 3b6f3f5c4f Address info issue fixed 3 years ago
Aamir Muhammad feff454e65 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Aamir Muhammad 1144664d64 Images Fixes 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
haroon amjad 4a513c08d9 fixes 3 years ago
haroon amjad 65e1540f97 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 43fb34c218 fixes 3 years ago
Aamir Muhammad 30c7f5738d Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
Faiz Hashmi 8ae8f6d2fe Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
Faiz Hashmi 810920a934 Pushing after resolving multiple times API calling issue 3 years ago
Sultan khan a212963ad7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sultan khan d25e608565 bug fixes 3 years ago
Faiz Hashmi f31db58a76 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
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
Aamir Muhammad 3e666eb6be Chat Fixes & User Chat Counter 3 years ago
Sikander Saleem 93901ce444 Merge branch 'faiz_cs' into 'master'
Integrated Questions API and Answer Selection -> InProgress

See merge request Cloud_Solution/mohemm-flutter-app!77
3 years ago
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
Aamir Muhammad 5430fd2d32 Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image 3 years ago
Faiz Hashmi 59ad00ca2a Fetched Questoins and Added Answer Interactivity 3 years ago
Faiz Hashmi 904e4df424 Questions Fetching process in Progress 3 years ago
Faiz Hashmi 8b388220cf Added Question Dart Object 3 years ago
Faiz Hashmi cbe251829f Added HubConnection Code 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 f4f9b442c8 Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad 2e88275285 Chat Updates & Counter Event Modifications 3 years ago
haroon amjad e8043f6980 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!54
3 years ago
Fatimah Alshammari ba1a5c66ef fix issues 3 years ago
Aamir Muhammad 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 68939f6256 Chat Call UI 3 years ago
Aamir Muhammad ee0e774611 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/colors.dart
#	lib/classes/consts.dart
3 years ago