 Aamir Muhammad
|
1eca46600d
|
Merge branch 'master' into development_aamir
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# ios/Runner/Info.plist
# lib/api/chat/chat_api_client.dart
# lib/ui/login/login_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
07dad71610
|
Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir
Conflicts:
lib/api/chat/chat_api_client.dart
|
3 years ago |
|
Aamir Muhammad
|
7f9c82d165
|
ChatFix
|
3 years ago |
Sikander Saleem
|
33da1a103d
|
mark attendance session expire fixed
|
3 years ago |
|
Sikander Saleem
|
f8ae5b0987
|
mark attendance session expire fixed
|
3 years ago |
|
Aamir Muhammad
|
03ae216b69
|
Chat fix
|
3 years ago |
|
Aamir Muhammad
|
7152b0d57b
|
Chat Fix
|
3 years ago |
haroon amjad
|
a97b367c6a
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!136
|
3 years ago |
haroon amjad
|
311b27cf2b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
# lib/ui/marathon/widgets/marathon_details_card.dart
|
3 years ago |
|
haroon amjad
|
a9bf383164
|
Updates & fixes
|
3 years ago |
|
Aamir Muhammad
|
c8f9826266
|
Permission Issue
|
3 years ago |
 Sikander Saleem
|
6b56d40349
|
Merge branch 'faiz_cs' into 'master'
Sorted the Sequence Number in Question Options and Removed isCorrectOption
See merge request Cloud_Solution/mohemm-flutter-app!135
|
3 years ago |
Faiz Hashmi
|
7f02dff689
|
Added the Sequence Number in Question Options and Removed isCorrectOption
|
3 years ago |
|
haroon amjad
|
bd10bb4f1d
|
Push notifications handler implemented
|
3 years ago |
|
haroon amjad
|
ed220b80a0
|
Merge branch 'faiz_cs' into 'master'
Updating with the DEMO MARATHON
See merge request Cloud_Solution/mohemm-flutter-app!134
|
3 years ago |
|
Faiz Hashmi
|
10ef069a06
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
c337b82676
|
Pushing before removing the isCorrectOption
|
3 years ago |
|
haroon amjad
|
a7d87b7b44
|
Merge branch 'development_aamir' into 'master'
Microphone Permission Fix
See merge request Cloud_Solution/mohemm-flutter-app!133
|
3 years ago |
|
Aamir Muhammad
|
b152f8a6d6
|
Permission Issue
|
3 years ago |
|
Aamir Muhammad
|
1f69ee262d
|
Permission Issue
|
3 years ago |
|
Faiz Hashmi
|
a72ac34122
|
Updated the text
|
3 years ago |
|
haroon amjad
|
c865eca9c9
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!132
|
3 years ago |
|
haroon amjad
|
f933539395
|
dialog added to app settings
|
3 years ago |
|
haroon amjad
|
c763e16f41
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
4d7db61a36
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
|
haroon amjad
|
df72594f14
|
Merge branch 'development_aamir' into 'master'
Audio Fix
See merge request Cloud_Solution/mohemm-flutter-app!131
|
3 years ago |
|
haroon amjad
|
e685cf188c
|
updates
|
3 years ago |
|
Aamir Muhammad
|
538fd133aa
|
Title Fix On AppBar
|
3 years ago |
|
Aamir Muhammad
|
dbb13515fc
|
Audio Fix
|
3 years ago |
|
Sikander Saleem
|
377fd48693
|
Ios Fix
|
3 years ago |
|
Sikander Saleem
|
a165ac2e91
|
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 |
|
haroon amjad
|
47a274b1d3
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
3003f354b8
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
|
haroon amjad
|
fe5807c997
|
version update
|
3 years ago |
|
haroon amjad
|
a23b273129
|
Merge branch 'faiz_cs' into 'master'
Added Demo Marathon Module
See merge request Cloud_Solution/mohemm-flutter-app!130
|
3 years ago |
|
Aamir Muhammad
|
83b8691a31
|
Ios Stream Audio
|
3 years ago |
|
Faiz Hashmi
|
a13a972083
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Faiz Hashmi
|
5592989b44
|
Added Demo Marathon Module
|
3 years ago |
|
Sikander Saleem
|
16ea3b7c66
|
Ios Fix
|
3 years ago |
|
haroon amjad
|
1da23d874a
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
0d2052346e
|
updates
|
3 years ago |
|
Sikander Saleem
|
088fd6f318
|
Ios Fix
|
3 years ago |
|
Sikander Saleem
|
05ff1fcf3f
|
Merge remote-tracking branch 'origin/development_aamir' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
54961c875f
|
Ios Stream Audio
|
3 years ago |
|
Sikander Saleem
|
935f959a02
|
Merge branch 'development_sikander' into 'master'
improvement.
See merge request Cloud_Solution/mohemm-flutter-app!129
|
3 years ago |
|
Sikander Saleem
|
3083a0e9da
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
3f8dedbf80
|
Merge remote-tracking branch 'origin/development_aamir' into development_aamir
|
3 years ago |
|
haroon amjad
|
914ae0eb0e
|
Merge branch 'faiz_cs' into 'master'
Removed GapTime for last question and some texts fixed!
See merge request Cloud_Solution/mohemm-flutter-app!128
|
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 |