 Aamir Muhammad
|
7152b0d57b
|
Chat Fix
|
3 years ago |
|
Aamir Muhammad
|
c8f9826266
|
Permission Issue
|
3 years ago |
Faiz Hashmi
|
c337b82676
|
Pushing before removing the isCorrectOption
|
3 years ago |
|
Faiz Hashmi
|
5592989b44
|
Added Demo Marathon Module
|
3 years ago |
|
Faiz Hashmi
|
ddaffe3af8
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
24c118a66e
|
Removed GapTime for last question and some minor bugs fixed!
|
3 years ago |
|
Aamir Muhammad
|
407899a602
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/provider/chat_provider_model.dart
# lib/ui/chat/my_team_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
3871d3f1e3
|
Fixes
|
3 years ago |
|
Faiz Hashmi
|
cdf016fc9b
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
e5310eff4e
|
Removed Unnecessary API call
|
3 years ago |
|
Aamir Muhammad
|
35f814b74a
|
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 |
|
Aamir Muhammad
|
773a99e8d9
|
Merge branch 'master' into development_aamir
|
3 years ago |
haroon amjad
|
8a393c1e73
|
App update screen implemented
|
3 years ago |
|
Faiz Hashmi
|
02fdfc746c
|
Pushing stable (acc to me :p) marathon
|
3 years ago |
|
Aamir Muhammad
|
12defa65ac
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
5d93451c13
|
chat voice message implementation
|
3 years ago |
|
Aamir Muhammad
|
abd1fa9375
|
chat voice message implementation
|
3 years ago |
 Sikander Saleem
|
3a6d1c3273
|
leave balance issues fixed-2.
|
3 years ago |
|
Sikander Saleem
|
fe02776a69
|
leave balance issues fixed.
|
3 years ago |
|
Faiz Hashmi
|
4cb7bbee5d
|
Pushing while testing!
|
3 years ago |
|
Aamir Muhammad
|
f60394cc38
|
chat voice message implementation
|
3 years ago |
|
Aamir Muhammad
|
e40cd2c5c8
|
Chat Error Handling & Voice
|
3 years ago |
|
Faiz Hashmi
|
3f7e1cd0be
|
Pushing before updating API Structure
|
3 years ago |
|
Aamir Muhammad
|
f62253374d
|
Chat Error Handling
|
3 years ago |
|
Faiz Hashmi
|
885a1aa377
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
58fb7a7894
|
Pushing for testing
|
3 years ago |
|
haroon amjad
|
660fdb63dd
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
3b6f3f5c4f
|
Address info issue fixed
|
3 years ago |
|
Aamir Muhammad
|
2266ace39a
|
Chat Fixes & Call Button Disabled
|
3 years ago |
|
Faiz Hashmi
|
2caf5b6caa
|
Pushing for testing
|
3 years ago |
|
haroon amjad
|
a39e6808d7
|
fixes & updates
|
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 |
|
haroon amjad
|
4c53fcfdb6
|
updates & fixes
|
3 years ago |
|
Faiz Hashmi
|
810920a934
|
Pushing after resolving multiple times API calling issue
|
3 years ago |
Fatimah Alshammari
|
cd813a163f
|
fix issues
|
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
|
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 |