2288 Commits (2a22edfdd04d08fec7a256ba71e23164316dd028)

Author	SHA1	Message	Date
haroon amjad	19dadd2b35	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
haroon amjad	a6c6651363	Updates & fixes	4 years ago
Zohaib Iqbal	259e27d4a7	Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5' ... # Conflicts: # lib/pages/landing/fragments/home_page_fragment2.dart # lib/uitl/app_shared_preferences.dart # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
Zohaib Iqbal Kambrani	ab8b62bc3a	Packages and offers fixes, HMG Internet work in progress,	4 years ago
haroon amjad	7f5f3ababe	Registration fix	4 years ago
haroon amjad	0acc134e6e	Updates & fixes	4 years ago
haroon amjad	e45c2c5652	covid & pharmacy updates	4 years ago
haroon amjad	eb6b0aefc0	Merge branch 'fatima_v2' into 'development_v2.5' ... Fatima v2 See merge request Cloud_Solution/diplomatic-quarter!580	4 years ago
haroon amjad	7dbc00a864	ancillary orders update	4 years ago
haroon amjad	693f8cb090	Updates & fixes	4 years ago
Fatimah Alshammari	f83adbc6ff	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	4 years ago
Fatimah Alshammari	0b21252ae7	fix category issue	4 years ago
haroon amjad	4acdad0e99	fixes & updates	4 years ago
haroon amjad	8f91d0a0dc	lakum fix	4 years ago
haroon amjad	40d649dfa4	Updates & fixes	4 years ago
haroon amjad	e53ba65ddd	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
Fatimah Alshammari	0985436a10	fix translation issue	4 years ago
haroon amjad	28107f9a48	Compare duplication fixed	4 years ago
haroon amjad	8c3b443f79	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
haroon amjad	4e3d99b007	Updates & fixes	4 years ago
Fatimah Alshammari	e5f0f5777b	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 ... # Conflicts: # lib/services/pharmacy_services/product_detail_service.dart	4 years ago
haroon amjad	6d88607631	Updates & fixes	4 years ago
Fatimah Alshammari	57d10d9e1f	fix compare issue	4 years ago
haroon amjad	1f19af01c4	Merge branch 'development_v2.5' into haroon_development_2.5	4 years ago
haroon amjad	c175139a29	pharmacy fixes	4 years ago
Fatimah Alshammari	71a28e2ed6	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2	4 years ago
Fatimah Alshammari	cc783045bb	fix categories & cantact design	4 years ago
haroon amjad	c05772c63a	pharmacy fixes	4 years ago
haroon amjad	b15bd2362b	Updates & fixes	4 years ago
Fatimah Alshammari	7634c35e3d	Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 ... # Conflicts: # lib/widgets/input/text_field.dart	4 years ago
Fatimah Alshammari	d7c3cb3dbc	fix conflict	4 years ago
haroon amjad	c2b0326676	Updates & fixes	4 years ago
haroon amjad	3107d1e86d	Updates & fixes	4 years ago
haroon amjad	eea701907d	Login fixes	4 years ago
haroon amjad	0ae4a13c02	Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5' ... Zik new design flutter v2.5 See merge request Cloud_Solution/diplomatic-quarter!570	4 years ago
Zohaib Iqbal Kambrani	1a6a26be75	Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 ... * development_v2.5: (36 commits) merge improvements Health plugin updated fix search issue JIRA bug fixes updates & fixes Fixes & updates six issues nfc plugin improvement. disable lakum on check out page fix issue fix lakum issues Smartwatch fixes screen plugin improvement. Updates & fixes video call camera view issue fix, barcode plugin change, smart watches improvements. add quantity filed fixed pharmacy uo fix Fixes fix issue Speech to text fix in iOS ... # Conflicts: Resolved # android/app/build.gradle # android/app/src/main/AndroidManifest.xml # android/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # lib/pages/conference/web_rtc/widgets/cam_view_widget.dart # lib/pages/landing/landing_page.dart # lib/pages/livecare/incoming_call.dart	4 years ago
Sikander Saleem	c8b5602d8e	flutter 2.8 improvements.	4 years ago
Sikander Saleem	3ad90f1a01	Merge branch 'development_new_design_2.0' into development_v2.5	4 years ago
haroon amjad	7733c74f00	Updates & fixes	4 years ago
Zohaib Iqbal Kambrani	63ffabcc86	no message	4 years ago
Sikander Saleem	684add0090	merge improvements	4 years ago
Sikander Saleem	9ba7b3b44b	Merge branch 'development_new_design_2.0' into development_v2.5 ... # Conflicts: # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/medical/smart_watch_health_data/syncHealthData.dart # lib/pages/vaccine/my_vaccines_screen.dart # lib/widgets/in_app_browser/InAppBrowser.dart # pubspec.yaml	4 years ago
haroon amjad	c379c6a37b	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	4c2410cfd5	Health plugin updated	4 years ago
Fatimah Alshammari	216cc4a7e3	Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design	4 years ago
Fatimah Alshammari	d767febcd0	fix search issue	4 years ago
haroon amjad	7bc8f69dfb	JIRA bug fixes	4 years ago
haroon amjad	2670d0be57	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
haroon amjad	9c0337aa01	updates & fixes	4 years ago
haroon amjad	330f2d6c86	Fixes & updates	4 years ago