Commit Graph

787 Commits (6b56d40349a0acab2436392f833d3a4e20108a84)

Author SHA1 Message Date
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 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
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 f933539395 dialog added to app settings 3 years ago
haroon amjad c763e16f41 Merge branch 'master' into development_haroon 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
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
Aamir Muhammad 54961c875f Ios Stream Audio 3 years ago
Sikander Saleem 3083a0e9da improvement. 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 5028a3b860 App Bar online / Offline & Fixes 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 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 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
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 2ab39e0d7b updates 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 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
Aamir Muhammad 35f814b74a Merge branch 'master' into development_aamir 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Aamir Muhammad 4635c7f3bc Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 8c3745b747 Voice Chat Fixes & Audio Player Implementation 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
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem f39a5dec71 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/provider/chat_provider_model.dart
3 years ago