 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 |
Sikander Saleem
|
f8ae5b0987
|
mark attendance session expire fixed
|
3 years ago |
|
Aamir Muhammad
|
7152b0d57b
|
Chat Fix
|
3 years ago |
haroon amjad
|
a9bf383164
|
Updates & fixes
|
3 years ago |
|
Aamir Muhammad
|
c8f9826266
|
Permission Issue
|
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 |
Faiz Hashmi
|
5592989b44
|
Added Demo Marathon Module
|
3 years ago |
|
haroon amjad
|
f6c5e1de41
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
b4fc3dd5fd
|
version fixes
|
3 years ago |
|
Aamir Muhammad
|
09c401a157
|
Voice Chat Fixes & Audio Player Implementation
|
3 years ago |
|
haroon amjad
|
696a6881c4
|
date fixes & Items of sale updates
|
3 years ago |
|
Aamir Muhammad
|
e40cd2c5c8
|
Chat Error Handling & Voice
|
3 years ago |
 Sikander Saleem
|
86d6b57cbc
|
dynamic list screen items grid view improvements
|
3 years ago |
|
haroon amjad
|
a39e6808d7
|
fixes & updates
|
3 years ago |
|
Aamir Muhammad
|
ae559df29f
|
Chat Fixes & Counter Updated on Signal R
|
3 years ago |
|
haroon amjad
|
ecaede0deb
|
Updates & fixes
|
3 years ago |
|
Aamir Muhammad
|
3e666eb6be
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Aamir Muhammad
|
f6f801f9cf
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Aamir Muhammad
|
cecb2d59e9
|
Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
|
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
|
7d651c247a
|
marathon improvements.
|
3 years ago |
|
Faiz Hashmi
|
cbe251829f
|
Added HubConnection Code
|
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
|
68939f6256
|
Chat Call UI
|
3 years ago |
|
haroon amjad
|
7fc80367d0
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
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
|
8ba3dcf43b
|
Chat Fixes & Favorite Api Implementation
|
3 years ago |
|
haroon amjad
|
c22556d9b6
|
fixes
|
3 years ago |
haroon amjad
|
2fdde18b52
|
Merge branch 'faiz_cs' into 'master'
Updated Banner Again :D
See merge request Cloud_Solution/mohemm-flutter-app!49
|
3 years ago |
|
haroon amjad
|
21d396b3bb
|
Worklist updates
|
3 years ago |
Zohaib Iqbal Kambrani
|
143d0772f2
|
test commit from iMac with nothing special
|
3 years ago |
|
FaizHashmiCS22
|
034436425a
|
Added success tone
|
3 years ago |
|
Sikander Saleem
|
528b0930c2
|
mark attendance counter 1.0
|
3 years ago |
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
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
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
Sikander Saleem
|
7aa2e0f000
|
code of conduct, workmen regulations added. & improvement.
|
3 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
3 years ago |
|
devmirza121
|
0d0832277f
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/work_list/worklist_fragments/detail_fragment.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
116175efaa
|
Work list UI Change
|
3 years ago |
|
haroon amjad
|
866bb8a29e
|
Pull to refresh, Items for Sale & Offers n Discounts fixes
|
3 years ago |
|
haroon amjad
|
ff2f42303e
|
pubspec update
|
3 years ago |
|
haroon amjad
|
eb29553d26
|
NFC Fixes
|
3 years ago |
|
haroon amjad
|
b0b84c572c
|
Last Login Fixes
|
3 years ago |
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
3 years ago |
|
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
|
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
3 years ago |
|
haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
3 years ago |