hussam al-habibeh
|
c56e4a1a5c
|
cart fix
|
4 years ago |
Mohammad Aljammal
|
1f9e7563a9
|
Merge branch 'product_detail_page' into 'development'
fix scaffold
See merge request Cloud_Solution/diplomatic-quarter!409
|
4 years ago |
Elham Rababh
|
ad0c8eaffb
|
fix scaffold
|
4 years ago |
Mohammad Aljammal
|
361b72624b
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!407
|
4 years ago |
Elham Rababh
|
65cf4316ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Elham Rababh
|
bb96201c2e
|
remove the custom scaffold
|
4 years ago |
hussam al-habibeh
|
f3000d0ee3
|
My account design fix
|
4 years ago |
Mohammad Aljammal
|
424552d672
|
Merge branch 'pharmacy_fix' into 'development'
add pharmacy icons for bottom nav
See merge request Cloud_Solution/diplomatic-quarter!403
|
4 years ago |
Elham Rababh
|
d5f1a162c0
|
replace bottom sheet button
|
4 years ago |
hussam al-habibeh
|
85e6032875
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
d4fd95606e
|
add pharmacy icons for bottom nav
|
4 years ago |
mosazaid
|
c558fe6bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
fdb61c78c5
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
cb2b9db0ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
|
4 years ago |
Mohammad Aljammal
|
b53bd5fd62
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
43e7bb9ff3
|
fix bottom navigation bar
|
4 years ago |
mosazaid
|
a398ede172
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
2265487ccd
|
remove cart cout & icon from AppBar
|
4 years ago |
Elham Rababh
|
769dc4e0ac
|
first step of ProductDetailPage refactor
|
4 years ago |
Elham Rababh
|
a269b514a9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/config/config.dart
|
4 years ago |
Elham Rababh
|
c7a0d39aab
|
first step of ProductDetailPage refactor
|
4 years ago |
Mohammad Aljammal
|
d64e2a469f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Mohammad Aljammal
|
8ecd4a24d8
|
fix product tile
|
4 years ago |
Mohammad Aljammal
|
8c7f397ac8
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!397
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
Elham Rababh
|
a6a7ed4e1b
|
remove cart from product details
|
4 years ago |
hussam al-habibeh
|
7427cd68ff
|
fix bottom nav bar ui
|
4 years ago |
Fatimah Alshammari
|
62167baec5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
4 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
4 years ago |
haroon amjad
|
e679c7df0d
|
updates & fixes
|
4 years ago |
haroon amjad
|
44d59ed01a
|
updates & fixes
|
4 years ago |
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
4 years ago |
Fatimah Alshammari
|
b6981299d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
239ad530ce
|
fixed isuues
|
4 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
4 years ago |
haroon amjad
|
72dbdd2c2b
|
Merge branch 'development' into Haroon
|
4 years ago |
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
4 years ago |
haroon amjad
|
73097d15de
|
Covid Lab result generate certificate implemented
|
4 years ago |
Elham Rababh
|
13737548bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
4 years ago |
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
4 years ago |
Elham Rababh
|
f85c359cf4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
Elham Rababh
|
69df61afb1
|
remove footer from pharmacy pages
|
4 years ago |
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
4 years ago |
Elham Rababh
|
8626b4f269
|
first step from add footer for all pages
|
4 years ago |
Fatimah Alshammari
|
bbb8e04066
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Zohaib Iqbal Kambrani
|
429fcb1e60
|
Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
10a147860c
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
4 years ago |
Fatimah Alshammari
|
b8ba80b361
|
Merge branch 'fatima-new' into development
|
4 years ago |