Commit Graph

188 Commits (ddaffe3af8e2e03fcd661044a020ffaae295ee89)

Author SHA1 Message Date
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 3 years ago
Sikander Saleem 47732d67cb drawer item align issue fixed on arabic. 3 years ago
haroon amjad b522aab685 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad 08e0af8f64 Chat Bug's Fix 3 years ago
haroon amjad 631752cffa fixes 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 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
haroon amjad 915a7d208f Jira translation fix 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 c436908d25 updates & fixes 3 years ago
haroon amjad c22556d9b6 fixes 3 years ago
haroon amjad 28a882a2f6 Updates & Fixes 3 years ago
haroon amjad ea676e19ca JIRA Fixes 3 years ago
haroon amjad d1652ef04d Merge branch 'development_mirza' into 'master'
attendance file fixed

See merge request Cloud_Solution/mohemm-flutter-app!40
3 years ago
Sikander Saleem e4737f403e attendance file fixed 3 years ago
haroon amjad bf802f3d67 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!36
3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago