Commit Graph

2940 Commits (2e72d6a5502d42c0298fa19a79dc3661f3aef6d3)
 

Author SHA1 Message Date
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad a6c6651363 Updates & fixes 3 years ago
haroon amjad 9674376163 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Packages and offers fixes, HMG Internet work in progress,

See merge request Cloud_Solution/diplomatic-quarter!582
3 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
3 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 3 years ago
haroon amjad 7f5f3ababe Registration fix 3 years ago
haroon amjad 0acc134e6e Updates & fixes 3 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 3 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
3 years ago
haroon amjad 7f34a1fe71 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad 7dbc00a864 ancillary orders update 3 years ago
haroon amjad 693f8cb090 Updates & fixes 3 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 3 years ago
haroon amjad 4acdad0e99 fixes & updates 3 years ago
haroon amjad 56b640ff91 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!579
3 years ago
haroon amjad 8f91d0a0dc lakum fix 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 3 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad cd797123a3 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!578
3 years ago
Fatimah Alshammari 55cc5dae4f Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari 0985436a10 fix translation issue 3 years ago
haroon amjad 28107f9a48 Compare duplication fixed 3 years ago
haroon amjad 8c3b443f79 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad 4e3d99b007 Updates & fixes 3 years ago
haroon amjad bac6774534 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!576
3 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
3 years ago
haroon amjad 1fc45e3f7c Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!577
3 years ago
haroon amjad 6d88607631 Updates & fixes 3 years ago
Fatimah Alshammari 9740f88e6b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 3 years ago
haroon amjad 1f19af01c4 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad c175139a29 pharmacy fixes 3 years ago
haroon amjad 0ac937aa7d Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!575
3 years ago
Fatimah Alshammari 71a28e2ed6 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari cc783045bb fix categories & cantact design 3 years ago
haroon amjad 3fcad86ef3 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad 5ae5f75b4f Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!574
3 years ago
haroon amjad c05772c63a pharmacy fixes 3 years ago
haroon amjad 432ed4172a Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!573
3 years ago
haroon amjad 2ebff634c4 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad b15bd2362b Updates & fixes 3 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
3 years ago
Fatimah Alshammari d7c3cb3dbc fix conflict 3 years ago
haroon amjad 98d50a9b42 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad d624136eab Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!572
3 years ago
haroon amjad c2b0326676 Updates & fixes 3 years ago
haroon amjad 98d9839ac2 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!571
3 years ago
haroon amjad 3107d1e86d Updates & fixes 3 years ago
haroon amjad eea701907d Login fixes 3 years ago