Commit Graph

159 Commits (etqan_ovr_integration)

Author SHA1 Message Date
haroon amjad 2c9db30d6a Merge branch 'master' into etqan_ovr_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/provider/dashboard_provider_model.dart
2 months ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 2 months ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 3 months ago
aamir-csol a28eb4426b Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration 3 months ago
aamir-csol dfa7d9a713 approval level commented Code for filter . 3 months ago
haroon amjad 9112b26987 updates 3 months ago
aamir-csol d021c95def Parking Qr Solution 4 months ago
aamir-csol 74bcf3e1b7 translation 4 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 4 months ago
Sultan khan fb35e256e7 CS Standard Change Request
CR-7260

Fixed Asset Disposal Request amendment
6 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 10 months ago
Aamir Muhammad 8d6c3ddc0b mazaya banner changes 10 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
10 months ago
sultan khan 75ba1283d3 event activity page added. 1 year ago
haroon amjad b20e0a8c7b updates 1 year ago
Sikander Saleem 8e49df98a2 translation issue fixed. 1 year ago
Sikander Saleem 5ecb4845a1 po item history chart and scrollable list view added. 1 year ago
haroon amjad 11881b0ba1 hotfix for payment request WL 2 years ago
Sultan khan ea7467502f updated changes for payment worklist. 2 years ago
Sikander Saleem 030887452d generate QR Api added. 2 years ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad 43e1e4df6b forgot password changes 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 3 years ago
haroon amjad a58d4753e4 Merge branch 'sultan-dev' into development_haroon
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 23b4e81170 my documents added. 3 years ago
Sultan khan 608a8fcb97 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
3 years ago
Sultan khan 790103bdc9 chat changes 3 years ago
Sultan khan fd6058e87d 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/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart
3 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago
mirza.shafique 13d8aac22e ERM fixes 3 years ago
mirza.shafique 2455e27595 hmg wifi implementation 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
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
3 years ago
Faiz Hashmi 10ef069a06 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi a72ac34122 Updated the text 3 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
3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
Aamir Muhammad 54961c875f Ios Stream Audio 3 years ago
Faiz Hashmi 24c118a66e Removed GapTime for last question and some minor bugs fixed! 3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
haroon amjad 660fdb63dd Updates & fixes 3 years ago
Faiz Hashmi 86d25d3ecc Added Privileged logic for Marathon 3 years ago
Fatimah Alshammari 29c9caddde Merge branch 'master' into fatima
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/misc/request_submit_screen.dart
3 years ago
Fatimah Alshammari c51af6522c fix issues 3 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 3 years ago
Faiz Hashmi 96e52abbb9 Committing before reverting from SignalR to Apis 3 years ago