Commit Graph

257 Commits (ff508de9f78e295f331e3c3ce1d4d2e7b3d4dc2e)

Author SHA1 Message Date
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani 81a3d1ce87 no message 4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad b15bd2362b Updates & fixes 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 4c2410cfd5 Health plugin updated 4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
haroon amjad 3b9c1eb9ed Appointment booking fix 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad fe7baeab3c LiveCare permissions 4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad 6d970800f9 Book Appo fix 4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
haroon amjad 5692bc66a9 Removing anatomy pub from project 4 years ago
haroon amjad 668d725b25 Laser booking 4 years ago
haroon amjad 0853ecdc27 Body added 4 years ago
haroon amjad 2a212149ed Health converters UI done 4 years ago
haroon amjad b53d912996 Fixes & updates 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
haroon amjad f60684ad08 Notifications UI redesigned 4 years ago
haroon amjad 58c78656bf Rating dialog updates 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Sikander Saleem f6b96dcb7b Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByDoctor.dart
4 years ago
Sikander Saleem c9662c7451 schedule appointment navigation fix. 4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago