Commit Graph

272 Commits (a7d87b7b442c4c05e2c1ecf074b25236825c0539)

Author SHA1 Message Date
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
Sikander Saleem 5ec6fbdf42 Chat Fixes 3 years ago
Sikander Saleem 3cac5eebbc Chat Fixes 3 years ago
Sikander Saleem 33609ea773 Chat Fixes 3 years ago
Sikander Saleem 5aa56450d9 Chat Fixes 3 years ago
Aamir Muhammad 44d76f0687 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
haroon amjad dd0d4b82a3 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad ab6f265ef4 Chat Favorite Screen & Fixes 3 years ago
Sikander Saleem 55187f4e36 Chat Fixes 3 years ago
Sikander Saleem 7c00f7dce8 Chat Fixes 3 years ago
haroon amjad 80e18911b7 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
haroon amjad c436908d25 updates & fixes 3 years ago
Aamir Muhammad ae917a4154 Chat Favorite Screen & Fixes 3 years ago
Sikander Saleem 70dd6e1c99 Chat Fixes 3 years ago
Aamir Muhammad c190fbf5ca Chat Favorite Screen & Fixes 3 years ago
Aamir Muhammad 670a5fbc03 Chat Favorite Screen & Fixes 3 years ago
Aamir Muhammad fb54403584 Chat Favorite Screen & Fixes 3 years ago
Sikander Saleem 8f80c396d1 Chat Fixes 3 years ago
Aamir Muhammad 4433f538b7 Chat Favorite Screen & Fixes 3 years ago
Aamir Muhammad b18ebf7a54 Chat Favorite Screen & Fixes 3 years ago
Sikander Saleem 29626ea408 Chat Fixes 3 years ago
Sikander Saleem f1aadf5031 Chat Fixes 3 years ago
Sikander Saleem 027b6ca7b6 Chat Fixes 3 years ago
Aamir Muhammad 5412dcaf35 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 67f4fdef28 Chat Fixes & Favorite Api Implementation 3 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 3 years ago
haroon amjad 21d396b3bb Worklist updates 3 years ago
haroon amjad 37ff4db9f6 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 26ddc00048 Updates & fixes 3 years ago
Fatimah Alshammari c83f0c1199 fix issues 3 years ago
Aamir Muhammad 235dc6b1f4 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 7408e24245 Chat Delivered&Seen Event Added. 3 years ago
haroon amjad 1a2c9d1b15 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!37
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
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
haroon amjad c87a00df6a Jira fixes 3 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 3 years ago
FaizHashmiCS22 f9885fa979 Merge branch 'master' into development_faiz 3 years ago
Sikander Saleem 0a73cced51 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 212f8e6663 worklist & itg counters issue resolved, delegate & request info in itg added. 3 years ago
FaizHashmiCS22 f3623e29dc Merge branch 'master' into development_faiz
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
haroon amjad 966fb5e209 Worklist fixes 3 years ago
FaizHashmiCS22 199a65a994 Merge branch 'master' into development_faiz 3 years ago
haroon amjad 588e8f51f0 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 8b0bae0891 Worklist updates 3 years ago
FaizHashmiCS22 3d7b80b8a0 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
FaizHashmiCS22 60e7b5a2a0 Adjusted the font settings 3 years ago
Fatimah Alshammari f515c0b39a Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 years ago
Fatimah Alshammari 7b4fe5bcbc fix issues 3 years ago
Aamir Muhammad 82afd0ae61 Chat Fixes 3 years ago
Aamir Muhammad a623765510 Merge branch 'master' into development_aamir 3 years ago
haroon amjad 109c0ca0a2 PR PO fixes, Worklist fixes 3 years ago
Aamir Muhammad 05c6cc7f14 Chat Search User Api Implementation 3 years ago
Aamir Muhammad d4b31d4338 Chat Login Api Implementation 3 years ago
Aamir Muhammad a90da83fa5 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/api/chat/chat_provider_model.dart
3 years ago
Aamir Muhammad d24103b872 Chat Login Api Implementation 3 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 3 years ago
Sikander Saleem 49bd4114ce improvements 3 years ago
Aamir Muhammad 57ebe40b5d Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Aamir Muhammad e115137205 Chat Implementation Version 1 3 years ago
Sikander Saleem f0ec4843b4 end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 3 years ago
Aamir Muhammad b190a248bf Chat Implementation Version 1 3 years ago