Commit Graph

237 Commits (75603d753049ac5a45d0048bcf4d6d7fd8a601b7)

Author SHA1 Message Date
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
haroon amjad 6463dfc424 Reverting fatima changes 3 years ago
haroon amjad d80f93a6dc Revert "no message"
This reverts commit 323741ad06.
3 years ago
haroon amjad 323741ad06 no message 3 years ago
Fatimah Alshammari f43b4905c5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into fatima
# Conflicts:
#	lib/ui/misc/request_submit_screen.dart
3 years ago
Sultan khan 86be7ccc5f Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan c500da9a18 bug fix 3 years ago
Fatimah Alshammari 19ab49029f Merge branch 'master' into fatima 3 years ago
haroon amjad 8133542ae0 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
haroon amjad 62acd531b0 fixes 3 years ago
Faiz Hashmi 96e52abbb9 Committing before reverting from SignalR to Apis 3 years ago
Fatimah Alshammari 85be372ad8 Merge branch 'master' into fatima
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/leave_balance/add_leave_balance_screen.dart
3 years ago
Fatimah Alshammari 9d0bf4fe7e fix issues 3 years ago
Aamir Muhammad 3e666eb6be Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad cecb2d59e9 Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image 3 years ago
Faiz Hashmi 49b57cae08 Code Reformatting and Added Logics 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
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
Aamir Muhammad 545c33ee4a Chat Fixes 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
Faiz Hashmi cbe251829f Added HubConnection Code 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 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
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 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 fe36f12413 Merge branch 'development_aamir' into 'master'
Chat Updates & Counter Event Modifications

See merge request Cloud_Solution/mohemm-flutter-app!61
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 86ac29946f Chat Updates & Counter Event Modifications 3 years ago
haroon amjad 03c488c663 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart
3 years ago
Aamir Muhammad 5913452a43 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago