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 |
|
Sikander Saleem
|
438217adcb
|
Merge branch 'development_aamir' into 'master'
App Bar Online / Offline & Fixes
See merge request Cloud_Solution/mohemm-flutter-app!127
|
3 years ago |
|
Aamir Muhammad
|
5028a3b860
|
App Bar online / Offline & Fixes
|
3 years ago |
|
haroon amjad
|
d24fa6b61b
|
Merge branch 'development_aamir' into 'master'
Chat Search Api Update/ Fav Unfav/ Fixes
See merge request Cloud_Solution/mohemm-flutter-app!126
|
3 years ago |
|
Aamir Muhammad
|
ebe353928f
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Aamir Muhammad
|
a746b607df
|
Fixes
|
3 years ago |
|
Sikander Saleem
|
e847f7f2ec
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!125
|
3 years ago |
|
Sikander Saleem
|
a383a504aa
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
f21d75c24c
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/profile/add_update_family_member.dart
|
3 years ago |
|
Sikander Saleem
|
6cc84d4c31
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!124
|
3 years ago |
|
Sikander Saleem
|
83820a8a20
|
worklist detail remove type lists when become empty.
|
3 years ago |
Fatimah Alshammari
|
1c750a4084
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
b34225501c
|
fix family member
|
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
|
d096559a2f
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
3871d3f1e3
|
Fixes
|
3 years ago |
|
Sikander Saleem
|
c2d7684d33
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
haroon amjad
|
3e1fb6c6bc
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!123
|
3 years ago |
|
haroon amjad
|
975164f565
|
Merge branch 'faiz_cs' into 'master'
Updated Token API Call
See merge request Cloud_Solution/mohemm-flutter-app!121
|
3 years ago |
|
haroon amjad
|
2ab39e0d7b
|
updates
|
3 years ago |
|
Sikander Saleem
|
47f76e40f7
|
Merge remote-tracking branch 'origin/development_aamir' into development_aamir
|
3 years ago |
|
Sikander Saleem
|
f5e74f5712
|
Merge branch 'main' into development_aamir
|
3 years ago |
|
Sikander Saleem
|
e4ab7e96d1
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
|
3 years ago |
|
Sikander Saleem
|
1e478c9900
|
approve & reject button added on PO/PR & after request submission,loading issue fixed on worklist.
|
3 years ago |
|
Aamir Muhammad
|
ec2bdedeef
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
4f780ad0aa
|
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 |
|
haroon amjad
|
f6c5e1de41
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
b4fc3dd5fd
|
version fixes
|
3 years ago |
|
Sikander Saleem
|
37fe3f46b0
|
Merge branch 'development_aamir' into 'master'
Chat Fixes & Scroll & IOS Fix. Voice Chat Scenarios --- In progress.
See merge request Cloud_Solution/mohemm-flutter-app!116
|
3 years ago |