Commit Graph

320 Commits (c3376c0e3bb3f2aff3bd373b606767822658019e)

Author SHA1 Message Date
haroon amjad c3376c0e3b Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
3 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 3 years ago
haroon amjad 165485965a Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
3 years ago
haroon amjad 9030b9bc81 Notification details implemented 3 years ago
haroon amjad 11d7e8bb8a Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
Sikander Saleem 879e2aa561 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 3 years ago
haroon amjad 7c53a39167 Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
haroon amjad cc110df55e Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad 064be6d195 updates & fixes 3 years ago
Sikander Saleem dc458f126e Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem cd091b696a worklist pagination added. 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
Faiz Hashmi 1dc6e1ae67 Reduced the option selection threshold from One to Zero 3 years ago
haroon amjad 8dcefa4f55 Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad c34d8a2633 Location updates 3 years ago
haroon amjad f39e40128e Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/classes/notifications.dart
#	lib/classes/utils.dart
3 years ago
haroon amjad d49a030580 PR details from PO implemented 3 years ago
haroon amjad 09a20f130b Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
3 years ago
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 3 years ago
haroon amjad 72501fd0d9 ITG Ads fix 3 years ago
haroon amjad 31a9dc79e8 Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
haroon amjad 8ca13c52da HMG Flutter updates 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