Commit Graph

1246 Commits (879e2aa56115c9c38f1511f8f51289c9971eadf2)
 

Author SHA1 Message Date
Sikander Saleem 088fd6f318 Ios Fix 2 years ago
Sikander Saleem 05ff1fcf3f Merge remote-tracking branch 'origin/development_aamir' into development_aamir 2 years ago
Aamir Muhammad 54961c875f Ios Stream Audio 2 years ago
Sikander Saleem 935f959a02 Merge branch 'development_sikander' into 'master'
improvement.

See merge request Cloud_Solution/mohemm-flutter-app!129
2 years ago
Sikander Saleem 3083a0e9da improvement. 2 years ago
Sikander Saleem 3f8dedbf80 Merge remote-tracking branch 'origin/development_aamir' into development_aamir 2 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
2 years ago
Faiz Hashmi ddaffe3af8 Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi 24c118a66e Removed GapTime for last question and some minor bugs fixed! 2 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
2 years ago
Aamir Muhammad 5028a3b860 App Bar online / Offline & Fixes 2 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
2 years ago
Aamir Muhammad ebe353928f Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/consts.dart
2 years ago
Aamir Muhammad a746b607df Fixes 2 years ago
Sikander Saleem e847f7f2ec Merge branch 'development_sikander' into 'master'
Development sikander

See merge request Cloud_Solution/mohemm-flutter-app!125
2 years ago
Sikander Saleem a383a504aa improvement. 2 years ago
Sikander Saleem f21d75c24c Merge branch 'master' into development_sikander
# Conflicts:
#	lib/ui/profile/add_update_family_member.dart
2 years ago
Sikander Saleem 6cc84d4c31 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!124
2 years ago
Sikander Saleem 83820a8a20 worklist detail remove type lists when become empty. 2 years ago
Fatimah Alshammari 1c750a4084 Merge branch 'master' into fatima 2 years ago
Fatimah Alshammari b34225501c fix family member 2 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
2 years ago
Aamir Muhammad d096559a2f Fixes 2 years ago
Aamir Muhammad 3871d3f1e3 Fixes 2 years ago
Sikander Saleem c2d7684d33 Merge branch 'master' into development_aamir 2 years ago
haroon amjad 3e1fb6c6bc Merge branch 'development_haroon' into 'master'
Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!123
2 years ago
haroon amjad 975164f565 Merge branch 'faiz_cs' into 'master'
Updated Token API Call

See merge request Cloud_Solution/mohemm-flutter-app!121
2 years ago
haroon amjad 2ab39e0d7b updates 2 years ago
Sikander Saleem 47f76e40f7 Merge remote-tracking branch 'origin/development_aamir' into development_aamir 2 years ago
Sikander Saleem f5e74f5712 Merge branch 'main' into development_aamir 2 years ago
Sikander Saleem e4ab7e96d1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Sikander Saleem 1e478c9900 approve & reject button added on PO/PR & after request submission,loading issue fixed on worklist. 2 years ago
Aamir Muhammad ec2bdedeef Merge branch 'master' into development_aamir 2 years ago
Aamir Muhammad 4f780ad0aa Fixes 2 years ago
Faiz Hashmi cdf016fc9b Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi e5310eff4e Removed Unnecessary API call 2 years ago
haroon amjad f6c5e1de41 Merge branch 'master' into development_haroon 2 years ago
haroon amjad b4fc3dd5fd version fixes 2 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
2 years ago
Aamir Muhammad 35f814b74a Merge branch 'master' into development_aamir 2 years ago
Sikander Saleem 9a269b5b56 Merge branch 'faiz_cs' into 'master'
updated logical flow and added bufferTime parameter

See merge request Cloud_Solution/mohemm-flutter-app!119
2 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 2 years ago
Aamir Muhammad 4635c7f3bc Merge branch 'master' into development_aamir 2 years ago
Sikander Saleem f01cf2ac2e Merge branch 'development_sikander' into 'master'
Development sikander

See merge request Cloud_Solution/mohemm-flutter-app!120
2 years ago
Aamir Muhammad 8c3745b747 Voice Chat Fixes & Audio Player Implementation 2 years ago
Faiz Hashmi 5bb998a8d2 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart
2 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 2 years ago
Sikander Saleem f39a5dec71 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/provider/chat_provider_model.dart
2 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 2 years ago
haroon amjad 738658d514 Merge branch 'development_haroon' into 'master'
Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!118
2 years ago