Commit Graph

298 Commits (1ebcbd10795c540d63fc3bf67f48285e1b39ea5f)

Author SHA1 Message Date
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 3 years ago
haroon amjad 72501fd0d9 ITG Ads fix 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
haroon amjad 20109cbe9e Attendance fixes 3 years ago
haroon amjad a142a5e8df Merge branch 'master' into development_haroon 3 years ago
haroon amjad 3b13701cec Android fixes 3 years ago
Faiz Hashmi dc864bcd05 Minor Fix 3 years ago
haroon amjad d3c5fd1467 Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
3 years ago
haroon amjad 6436062642 HMG Mohemm Setup 3 years ago
Sikander Saleem a59656184f session log out check change. 3 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
3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
3 years ago
mirza.shafique be58dfdee1 isAuthentication fixed in API Client 3 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
3 years ago
Sikander Saleem 33da1a103d mark attendance session expire fixed 3 years ago
Sikander Saleem f8ae5b0987 mark attendance session expire fixed 3 years ago
Sikander Saleem e10ea6b023 mark attendance session expire fixed 3 years ago
Aamir Muhammad 03ae216b69 Chat fix 3 years ago
Aamir Muhammad 7152b0d57b Chat Fix 3 years ago
haroon amjad 311b27cf2b Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/marathon/widgets/marathon_details_card.dart
3 years ago
haroon amjad a9bf383164 Updates & fixes 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 3 years ago
haroon amjad bd10bb4f1d Push notifications handler implemented 3 years ago
Faiz Hashmi c337b82676 Pushing before removing the isCorrectOption 3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 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 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 3871d3f1e3 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 5bb998a8d2 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart
3 years ago
Aamir Muhammad 773a99e8d9 Merge branch 'master' into development_aamir 3 years ago
haroon amjad 8a393c1e73 App update screen implemented 3 years ago
Faiz Hashmi 02fdfc746c Pushing stable (acc to me :p) marathon 3 years ago
Aamir Muhammad 12defa65ac Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 5d93451c13 chat voice message implementation 3 years ago
Aamir Muhammad abd1fa9375 chat voice message implementation 3 years ago
Sikander Saleem 3a6d1c3273 leave balance issues fixed-2. 3 years ago
Sikander Saleem fe02776a69 leave balance issues fixed. 3 years ago
Faiz Hashmi 4cb7bbee5d Pushing while testing! 3 years ago
Aamir Muhammad f60394cc38 chat voice message implementation 3 years ago
Aamir Muhammad e40cd2c5c8 Chat Error Handling & Voice 3 years ago
Faiz Hashmi 3f7e1cd0be Pushing before updating API Structure 3 years ago
Aamir Muhammad f62253374d Chat Error Handling 3 years ago
Faiz Hashmi 885a1aa377 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 58fb7a7894 Pushing for testing 3 years ago