Commit Graph

146 Commits (0b08606813201dc0152331159d6964b8f7f11a32)

Author SHA1 Message Date
aamir-csol 107846dd82 Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	android/app/build.gradle
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/services_widget.dart
2 weeks ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 1 month ago
aamir-csol 1bcecde59b ticket changes moved to dashboard 2 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 3 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 3 months ago
Sultan khan b2ffa0c619 Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/dialogs/otp_dialog.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/theme/app_theme.dart
#	lib/ui/attendance/monthly_attendance_screen.dart
#	lib/ui/chat/chat_home_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/delete_family_member.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/ui/work_list/worklist_detail_screen.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	lib/widgets/app_bar_widget.dart
#	lib/widgets/image_picker.dart
#	lib/widgets/nfc/nfc_reader_sheet.dart
#	pubspec.yaml
4 months ago
Sultan khan 3b3046804e upgraded 5 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 6 months ago
sultan khan 75ba1283d3 event activity page added. 9 months ago
Sikander Saleem 6e3fc55fde event activity added - cont 9 months ago
Sikander Saleem c35074576a offer and discount, do not show if api have issue. 9 months ago
haroon amjad 10a337ddd7 Added additional details in VIDA Access Request in ITG 2 years ago
haroon amjad 55c096aa7e Chat video fixes 2 years ago
haroon amjad d3358d578c Update to stores 2 years ago
Sikander Saleem 449c93649a multiple survey added. 2 years ago
Sikander Saleem 610d4788c2 parameter added in survey. 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
haroon amjad a48d703642 ITG ADs update 2 years ago
haroon amjad 1dca3076d9 Survey dynamic questions 3 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 3 years ago
haroon amjad 379015ca6c chat privilege added 3 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
haroon amjad aacc7c6437 icon change 3 years ago
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 3 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 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
Aamir Muhammad 948689b67a Notification To Specific Screen 3 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 3 years ago
Sikander Saleem 84a07df310 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad e685cf188c updates 3 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 3 years ago
haroon amjad 631752cffa fixes 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 3 years ago