Commit Graph

993 Commits (master)

Author SHA1 Message Date
haroon amjad c34d8a2633 Location updates 2 years ago
haroon amjad 33294ee697 survey changes 2 years ago
haroon amjad 3c15f168d3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 2 years ago
haroon amjad a9e9e51f86 Version ID changed 2 years ago
mirza.shafique 13d8aac22e ERM fixes 2 years ago
mirza.shafique 7d7acfa2df Merge branch 'master' into development_mirza
# Conflicts:
#	lib/main.dart
2 years ago
haroon amjad 204aeebe5f Item for sale updates 2 years ago
haroon amjad e2cb0a3dec Add attachment fix 2 years ago
Faiz Hashmi e59b315438 Reduced the option selection threshold from One to Zero 2 years ago
haroon amjad 724227fc12 Item for sale attachment updates 2 years ago
haroon amjad d49a030580 PR details from PO implemented 2 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 2 years ago
haroon amjad 379015ca6c chat privilege added 2 years ago
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 2 years ago
haroon amjad 2911886803 Merge branch 'master' into development_haroon 2 years ago
haroon amjad 72501fd0d9 ITG Ads fix 2 years ago
Faiz Hashmi 8f1c223469 removed google api availability 2 years ago
Faiz Hashmi 990b830bfa Added test Dialog for Huawei 2 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 2 years ago
Faiz Hashmi 8439b58759 Added Huawei Checks 2 years ago
haroon amjad 13822c2534 Merge branch 'faiz_cs' into 'master'
QuickFix

See merge request Cloud_Solution/mohemm-flutter-app!170
2 years ago
Faiz Hashmi 7d0c5598a0 QuickFix 2 years ago
haroon amjad 8f83f89dc7 Item for sale improvements 2 years ago
haroon amjad 5e22bcc1da ERM Channel 2 years ago
haroon amjad ca369f2243 huawei attendance fixes 2 years ago
haroon amjad 736f9c70e9 Merge branch 'master' into development_haroon 2 years ago
haroon amjad 88abc86e39 version id update 2 years ago
haroon amjad 20109cbe9e Attendance fixes 2 years ago
Faiz Hashmi f37f748d6f QuickFix 2 years ago
Faiz Hashmi 9469997d33 Updated 2 years ago
haroon amjad a142a5e8df Merge branch 'master' into development_haroon 2 years ago
haroon amjad 3b13701cec Android fixes 2 years ago
Faiz Hashmi dc864bcd05 Minor Fix 2 years ago
Faiz Hashmi 3c57f8fd80 Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi 8671403385 Minor Fix 2 years ago
haroon amjad 851c70e60b Merge branch 'master' into development_haroon 2 years ago
haroon amjad 516f7ca301 Crashlytics implemented 2 years ago
Faiz Hashmi 14cb0b7e1f Added Marathon Specific Language Support 2 years ago
haroon amjad 053a64d5ed Merge branch 'master' into development_haroon 2 years ago
haroon amjad aacc7c6437 icon change 2 years ago
Faiz Hashmi 67af43df14 Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi 8f33d48c23 Added Marathon Specific Language Support 2 years ago
haroon amjad d3c5fd1467 Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
2 years ago
haroon amjad 8949a8b11b attendance fix 2 years ago
haroon amjad 9a30ddcf44 Huawei fixes 2 years ago
haroon amjad 99c1f95e1f Attendance Progress screen fixes 2 years ago
Faiz Hashmi e940c7ad8f Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi e73b88c651 minor fix 2 years ago
haroon amjad 6436062642 HMG Mohemm Setup 2 years ago
haroon amjad b760dc44a5 Updates & fixes 2 years ago
haroon amjad e0d02554b1 Merge branch 'master' into development_haroon 2 years ago
haroon amjad 182fa6774e Huawei push implementation 2 years ago
Sikander Saleem 2b35c3d8d6 Merge branch 'development_aamir' into 'master'
Chat  Fix & Web RTC -- Inprogress

See merge request Cloud_Solution/mohemm-flutter-app!154
2 years ago
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 2 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 2 years ago
mirza.shafique 2455e27595 hmg wifi implementation 2 years ago
Faiz Hashmi 33af55c28d some fixes while testing 2 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 2 years ago
Aamir Muhammad a78b5b0a19 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
2 years ago
Aamir Muhammad c55c3d6a91 Notification 2 years ago
haroon amjad be32b9c4a2 attendance fixes 2 years ago
Sikander Saleem 1f04dfced2 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!149
2 years ago
haroon amjad 06828cd711 Merge branch 'faiz_cs' into 'master'
Minor Fixes While Testing

See merge request Cloud_Solution/mohemm-flutter-app!148
2 years ago
Aamir Muhammad 4a431fb752 Notification Fix 2 years ago
mirza.shafique d458e8ac45 Merge branch 'master' into development_mirza 2 years ago
Faiz Hashmi f72f49c719 Merge branch 'master' into faiz_cs 2 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 2 years ago
Faiz Hashmi 580c7d62f5 some fixes while testing 2 years ago
Sikander Saleem a59656184f session log out check change. 2 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 2 years ago
haroon amjad 0c7771dab9 updates 2 years ago
haroon amjad 7257fa88cc Merge branch 'master' into development_haroon 2 years ago
haroon amjad 9a2a85f848 updates 2 years ago
haroon amjad 6749074479 Merge branch 'master' into development_haroon 2 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 2 years ago
haroon amjad 59885b29f6 Merge branch 'development_aamir' into 'master'
notification to chat navigate

See merge request Cloud_Solution/mohemm-flutter-app!142
2 years ago
haroon amjad a07563e7b1 Merge branch 'master' into development_haroon 2 years ago
haroon amjad 9dd53ad3ab Push notification fixes 2 years ago
Sultan khan 61904ca5f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
2 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 2 years ago
Sikander Saleem 787d6d7ab2 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!140
2 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
2 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 2 years ago
Faiz Hashmi 7e235c9d8c Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi 70861807c5 Resolved VideoPlayer Bug on IOS 2 years ago
mirza.shafique be58dfdee1 isAuthentication fixed in API Client 2 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
2 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 2 years ago
Sikander Saleem dd6627f216 firebase notification token issue fix. 2 years ago
Sikander Saleem 84a07df310 Merge branch 'master' into development_sikander 2 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
2 years ago
Aamir Muhammad 698aee3482 Notification 2 years ago
Aamir Muhammad 81a060012e Chat Fix 2 years ago
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
2 years ago
Sikander Saleem 33da1a103d mark attendance session expire fixed 2 years ago
Sikander Saleem f8ae5b0987 mark attendance session expire fixed 2 years ago
Sikander Saleem e10ea6b023 mark attendance session expire fixed 2 years ago
Aamir Muhammad 03ae216b69 Chat fix 2 years ago
Aamir Muhammad 7152b0d57b Chat Fix 2 years ago
mirza.shafique 5f525f16a0 local network test 2 years ago
haroon amjad 311b27cf2b Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/marathon/widgets/marathon_details_card.dart
2 years ago
haroon amjad a9bf383164 Updates & fixes 2 years ago
Aamir Muhammad c8f9826266 Permission Issue 2 years ago
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 2 years ago
haroon amjad bd10bb4f1d Push notifications handler implemented 2 years ago
Faiz Hashmi 10ef069a06 Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi c337b82676 Pushing before removing the isCorrectOption 2 years ago
Aamir Muhammad b152f8a6d6 Permission Issue 2 years ago
Aamir Muhammad 1f69ee262d Permission Issue 2 years ago
Faiz Hashmi a72ac34122 Updated the text 2 years ago
haroon amjad f933539395 dialog added to app settings 2 years ago
haroon amjad c763e16f41 Merge branch 'master' into development_haroon 2 years ago
haroon amjad e685cf188c updates 2 years ago
Aamir Muhammad 538fd133aa Title Fix On AppBar 2 years ago
Aamir Muhammad dbb13515fc Audio Fix 2 years ago
Sikander Saleem 377fd48693 Ios Fix 2 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
2 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 2 years ago
Aamir Muhammad 83b8691a31 Ios Stream Audio 2 years ago
Faiz Hashmi a13a972083 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
2 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 2 years ago
Sikander Saleem 16ea3b7c66 Ios Fix 2 years ago
haroon amjad 1da23d874a Merge branch 'master' into development_haroon 2 years ago
haroon amjad 0d2052346e updates 2 years ago
Sikander Saleem 088fd6f318 Ios Fix 2 years ago
Aamir Muhammad 54961c875f Ios Stream Audio 2 years ago
Sikander Saleem 3083a0e9da improvement. 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
Aamir Muhammad 5028a3b860 App Bar online / Offline & Fixes 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 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 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
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 2ab39e0d7b updates 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 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
Aamir Muhammad 35f814b74a Merge branch 'master' into development_aamir 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