Commit Graph

95 Commits (f31db58a7611421d0fede00699b52617b72ccaaf)

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
Aamir Muhammad e94a8d9a5e Hub Connection Fix 3 years ago
Aamir Muhammad abc586b81e Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 8d5cc7ed23 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 4e96108207 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0db4a5a7cd Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad fb97319164 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 3 years ago
Sikander Saleem 3438b9c174 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem b718f96c3a counter direction issue fix. 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
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
Faiz Hashmi 59ad00ca2a Fetched Questoins and Added Answer Interactivity 3 years ago
Aamir Muhammad 545c33ee4a Chat Fixes 3 years ago
Aamir Muhammad fa36cd7ddf Advertisement Image/ Video Module 3 years ago
Aamir Muhammad fa7e08c215 Advertisement Image/ Video Module 3 years ago
Aamir Muhammad db3e1427c5 Advertisement Image/ Video Module 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
haroon amjad 1ec45c35aa Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
haroon amjad 4f88f30368 updates 3 years ago
Aamir Muhammad 5708c93ae5 Chat Updates 3 years ago
Aamir Muhammad a64ae80a4a Chat Updates 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 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
haroon amjad c22556d9b6 fixes 3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
haroon amjad c87a00df6a Jira fixes 3 years ago
haroon amjad e1030d73b2 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
haroon amjad 09d2d9936b Jira Fixes 3 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 3 years ago
FaizHashmiCS22 3457136cdc Updated the Banner calling 3 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 3 years ago
FaizHashmiCS22 3c6e4a725f Merge branch 'master' into faiz_cs
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
3 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 3 years ago
Sikander Saleem 0ad9d4dd9e Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 3 years ago
haroon amjad aabc86290a Language change option added in app drawer 3 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 3 years ago
haroon amjad 4024e5fd3f updates & fixes 3 years ago
haroon amjad 8f9fb5eb1d image fixes 3 years ago
haroon amjad c8d25c997b Revert "updates"
This reverts commit 981fc9f8d207334488189c9051042d3792452592.
3 years ago
haroon amjad da7929bf3e updates 3 years ago
haroon amjad 847b9df6fc date fix in dashboard 3 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 3 years ago