Commit Graph

264 Commits (107846dd82d024a198ffdadd04414cc25e2ddf81)

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 c7e44965d6 Get Ticket Accural Balance Changes 2 weeks ago
haroon amjad 04a2561f7f Update to stores VersionID 9.2 3 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-csol c8fa64171e coreLibraryDesugaringEnabled 2 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 3 months ago
Aamir Muhammad d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
3 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 3 months ago
Aamir Muhammad 515ffef14e tickt booking implementation 3 months ago
Aamir Muhammad f61817937b tickt booking implementation 3 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 3 months ago
Aamir Muhammad cd36d61640 logins apis 4 months ago
haroon amjad dcbf7b386a Survey link launch issue fixed, Updated to Stores VersionID 9.1 4 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
haroon amjad c57c22a58c ERM Channel Text URL implemented 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 6e15336cc4 image changes. 9 months ago
sultan khan 822a99a291 countdown updated. 9 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 c1503cc236 updates & fixes 10 months ago
Sikander Saleem 4eb3e6d52d progress bar added on erm video. & skip button relocation. 11 months ago
haroon amjad 2682158590 ERM Channel Video changes 11 months ago
Sikander Saleem e8fbffdc9c scroll, padding & content by language added on image ad. 1 year 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
Sultan khan 88be17249d Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
2 years ago
Aamir Muhammad 6cf7340417 Business Card Design Update 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 2 years ago
haroon amjad a48d703642 ITG ADs update 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 2 years ago
haroon amjad 15c8e80799 ERM Video fixes 2 years ago
haroon amjad 45fdb4a466 updates 3 years ago
haroon amjad 1f369e9122 survey updates 3 years ago
haroon amjad 1dca3076d9 Survey dynamic questions 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 b1e140fb75 PR Details implemented 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
mirza.shafique 13d8aac22e ERM fixes 3 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 3 years ago
haroon amjad 379015ca6c chat privilege added 3 years ago