Commit Graph

302 Commits

Author SHA1 Message Date
Fatih Alp
a4f295d1f4 Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp
 Conflicts:
	addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php
2021-04-15 15:06:54 +03:00
vedatakd
b17573e257 cloudinary refactored 2021-04-15 14:50:30 +03:00
vedatakd
d946afee3d Merge branch 'master' of https://github.com/openclassify/openclassify into fatihalp
# Conflicts:
#	addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
#	addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
#	addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
2021-04-14 09:38:15 +03:00
Diatrex
ac92307102 Merge branch 'master' of https://github.com/openclassify/openclassify 2021-04-12 14:47:36 +03:00
Diatrex
b3e930d692 fix category text title 2021-04-12 12:51:41 +03:00
Muammer Top
7c66e50f5e
Merge pull request #1028 from openclassify/dia
#3472 listing design improvments - Integrate
2021-04-12 11:34:12 +03:00
vedatakd
b7748687bb fixed cfController 2021-04-12 11:30:58 +03:00
Diatrex
8f39d05d42 #3472 listing design improvments - Integrate 2021-04-12 11:28:24 +03:00
vedatakd
84f6e9814c Merge branch 'master' of https://github.com/openclassify/openclassify into fatihalp
# Conflicts:
#	addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
#	addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
#	addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
#	addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
#	addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
2021-04-12 10:22:34 +03:00
Diatrex
ed40e8a8be #3472 listing design improvments - Integrate 2021-04-09 17:44:00 +03:00
Fatih Alp
8ad08334ec Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp
 Conflicts:
	addons/default/visiosoft/advs-module/composer.json
2021-04-04 14:33:31 +03:00
Muammer Top
bda95f5da4
Merge pull request #1010 from openclassify/dia
#2138 Remove unused code
2021-03-30 10:31:48 +03:00
vedatakd
2c72899729 Merge branch 'fatihalp' of https://github.com/openclassify/openclassify into fatihalp 2021-03-29 18:09:06 +03:00
vedatakd
3bc34af19f fixed request error 2021-03-29 18:08:52 +03:00
vedatakd
1835ca681f fixes 2021-03-29 12:13:05 +03:00
Diatrex
4c9ebda75d Merge branch 'master' of https://github.com/openclassify/openclassify 2021-03-29 10:40:29 +03:00
vedatakd
6781349fba auth preview page 2021-03-29 10:15:54 +03:00
Fatih Alp
397b33847c Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp
 Conflicts:
	addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
	addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
2021-03-27 22:39:07 +03:00
Muammer Top
ea947ce1b1 fixed configured ads 2021-03-26 17:46:40 +03:00
Diatrex
203af16862 Merge branch 'master' of https://github.com/openclassify/openclassify 2021-03-26 17:27:41 +03:00
Fatih Alp
ab92313c4c Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp
 Conflicts:
	addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
2021-03-18 23:26:39 +03:00
Muammer Top
69d24bc30e #3570 added foreign_currencies func in new ads 2021-03-17 15:22:19 +03:00
Muammer Top
c8c5571810 #3568 product detail currency 2021-03-16 16:34:03 +03:00
vedatakd
61a7bbcad6 fixed image upload error 2021-03-15 12:12:28 +03:00
Fatih Alp
b0b858b7ea Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp
 Conflicts:
	addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
	addons/default/visiosoft/cats-module/src/CatsModule.php
	addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php
	addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
2021-03-12 23:17:04 +03:00
Diatrex
d15cadf8da Merge branch 'master' of https://github.com/openclassify/openclassify
 Conflicts:
	addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
2021-03-05 10:21:42 +03:00
spektra2147
eeda3c585b
Merge branch 'master' into muammer 2021-03-04 18:01:07 +03:00
Diatrex
43c457a048 #3481 [advs-module] Currency error when viewing an ad 2021-03-04 16:27:12 +03:00
Muammer Top
d0765d2d2f currency error fixed 2021-03-04 15:41:59 +03:00
Diatrex
0941e43f6c #3367 Ad price hide by category (franch) 2021-03-04 13:37:10 +03:00
Diatrex
c74b8139e3 #3481 [advs-module] Currency error when viewing an ad 2021-03-04 13:30:38 +03:00
vedatakd
54acd99271 update master 2021-03-04 09:58:13 +03:00
Muammer Top
8405702412 Merge branch 'master' of https://github.com/openclassify/openclassify into muammer 2021-03-03 15:30:12 +03:00
Muammer Top
c75769e45c #3408 header currency 2021-03-03 15:28:01 +03:00
vedatakd
a08e5f3255 fixed error 2021-03-02 11:58:54 +03:00
vedatakd
9633ab2600 fixed view ad for admin 2021-03-01 16:34:27 +03:00
Diatrex
34ee9af233 Merge branch 'dia' of https://github.com/openclassify/openclassify 2021-02-26 16:35:39 +03:00
vedatakd
0b0bf71f5d fixed AdBlock error 2021-02-24 17:04:19 +03:00
Diatrex
f8de9a4462 #3231 [recommendedads-module] Table buttons disappear if recommended-module is active 2021-02-24 16:32:56 +03:00
vedatakd
a3d22d972b completed checkout for customer without translate 2021-02-24 15:30:48 +03:00
Diatrex
7f9257e164 #3025 Making the announcement status flexible. 2021-02-24 12:20:13 +03:00
Diatrex
0a1c83d0dd #3025 Making the announcement status flexible. 2021-02-24 12:17:46 +03:00
Diatrex
ac3f51194a #3409 Arapça sorunu 2021-02-23 16:17:04 +03:00
Fatih Alp
8eab51e20e
Merge pull request #958 from openclassify/muammertop
addCart action changed and added cart count
2021-02-18 18:19:29 +03:00
Muammer Top
7c06f4338c addCart action changed and added cart count 2021-02-18 18:12:55 +03:00
Dia Shalabi
c9e72c4e2a
Merge pull request #957 from openclassify/muammertop
addCart action changed and added cart count
2021-02-18 14:49:55 +03:00
Muammer Top
160a3ecc0c addCart action changed and added cart count 2021-02-18 14:47:59 +03:00
Muammer Top
699ed091bd addCart action changed and added cart count 2021-02-18 14:10:49 +03:00
Diatrex
dbf6d51148 #3349 [advs-module] Error on detail page 2021-02-15 11:11:24 +03:00
vedatakd
0d791492d7 created deleted and deleting event 2021-02-12 12:02:05 +03:00