Commit Graph

13 Commits

Author SHA1 Message Date
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
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
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
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
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
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
vedatakd
54acd99271 update master 2021-03-04 09:58:13 +03:00
vedatakd
2e03040c95 fixed 3.8 error 2021-02-09 15:19:16 +03:00
Fatih Alp
6abb14dfb5 Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp 2021-02-07 23:42:14 +03:00
vedatakd
05124ddbae fixed 3.8 errors 2021-02-04 10:23:37 +03:00
vedatakd
db16677e99 fixed 3.8 deprecated 2021-01-30 18:17:57 +03:00