Skip to content
Open

Dev #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
199 commits
Select commit Hold shift + click to select a range
3c3c2d0
Update README.md
Lebioda Oct 25, 2013
26bb0bd
Update README.md
Lebioda Oct 25, 2013
47c3e40
Merge branch 'master' of https://github.com/Lebioda/PrestaShop-module…
Lebioda Oct 25, 2013
28e8094
possibility to add any words before /{rewrite}
Lebioda Oct 28, 2013
d3fd8f2
New version in config file
Lebioda Oct 28, 2013
a8fe02a
Fixed getCategoryLink method:
drAlberT Nov 25, 2013
0559ef3
Fixed canonicalRedirection()
drAlberT Feb 18, 2014
1975ad2
Merge duplicate-URL-check-fix into master
drAlberT Feb 18, 2014
22153e5
Update config.xml
drAlberT Apr 22, 2014
5bbe439
Update config.xml
drAlberT Apr 22, 2014
625ad7d
Update Link.php
drAlberT Apr 22, 2014
7a471ae
Merge pull request #1 from ZiZuu-store/master
drAlberT Apr 22, 2014
96c7d40
Link.php: Fix category_disable_rewrite assignation
drAlberT Apr 29, 2014
db6e2a0
BUG FIXED
drAlberT Apr 29, 2014
e0ec0ad
Update Link.php
drAlberT Apr 29, 2014
2987e3d
Restore hide Home category until a conf switch
drAlberT Sep 19, 2014
a341331
added smartblog url rewrite support
wayann Dec 28, 2014
9ff7df7
Update README.md
wayann Dec 28, 2014
c3e1e9c
Update Dispatcher.php
wayann Dec 28, 2014
a7298d7
Update Dispatcher.php
wayann Dec 28, 2014
e1deb73
Update README.md
wayann Jan 23, 2015
a1baa10
Update README.md
wayann Jan 23, 2015
af66e33
Update Link.php
wayann Jan 23, 2015
dc0d1bf
Update Link.php
wayann Jan 23, 2015
0fa2e90
Update README.md
wayann Feb 5, 2015
16d0c76
Update README.md
wayann Feb 5, 2015
67c49cd
Update README.md
wayann Feb 5, 2015
f8f67cb
Update README.md
wayann Feb 5, 2015
63464f8
Update README.md
wayann Feb 5, 2015
e330c75
Update Dispatcher.php
wayann Feb 5, 2015
0270361
Update Dispatcher.php
wayann Feb 5, 2015
900ee0a
Update README.md
wayann Feb 7, 2015
4c5256e
Update README.md
wayann Feb 7, 2015
a7e9b01
Create Meta.php
wayann Feb 9, 2015
baccc04
Merge pull request #2 from wayann/iNRG-CleanURLs
drAlberT Feb 13, 2015
4e84fe5
Revert "merge changes by wayann"
drAlberT Feb 26, 2015
4698401
Merge pull request #3 from ZiZuu-store/revert-2-iNRG-CleanURLs
drAlberT Feb 26, 2015
5fbd0d5
Update config.xml
drAlberT Feb 26, 2015
b3b78f5
Update Dispatcher.php
drAlberT Feb 26, 2015
d52de68
Update Link.php
drAlberT Feb 26, 2015
5428e30
Update cleanurls.php
drAlberT Feb 26, 2015
b7b6ea5
Update config.xml
drAlberT Feb 26, 2015
7577a94
Update cleanurls.php
drAlberT Feb 26, 2015
8584322
Update config.xml
drAlberT Feb 26, 2015
fcfa16c
Fix wrong category link in blocklanguages
wayann Feb 27, 2015
ef11ef3
Merge pull request #4 from wayann/iNRG-CleanURLs
drAlberT Mar 10, 2015
b2ada65
Update README.md
drAlberT Mar 10, 2015
8fa8654
Just some indentation cleanup on config.xml
drAlberT Mar 10, 2015
4a0b271
Updated .. should work with current PS
drAlberT Mar 10, 2015
4c2c8d1
test release v0.7
drAlberT Mar 10, 2015
fdc34d2
Directories levels prune
drAlberT Mar 11, 2015
9791c21
just some code cleanup
drAlberT Mar 11, 2015
25b0b01
Update README.md
drAlberT Mar 11, 2015
0b3830f
Added security _PS_VERSION_ check
drAlberT Mar 11, 2015
4e2ef94
Some coding standard
drAlberT Mar 12, 2015
cb6a7d3
added index.php
drAlberT Mar 12, 2015
bdc8900
Cleaned git related giles
drAlberT Mar 13, 2015
399e334
- fixed parse error on cleanurls.php
drAlberT Mar 13, 2015
02fe391
- just minimal on README.md
drAlberT Mar 13, 2015
35fd839
* Again security fixes over SQL injection
drAlberT Mar 13, 2015
42a1ee6
* removed install stuff, parent already do the job
drAlberT Mar 13, 2015
86eab06
* fix module name constant use
drAlberT Mar 13, 2015
37b5946
* v0.8.1
drAlberT Mar 25, 2015
bd1b243
* Fixed routing issues. Now should work in PS >= 1.6.0.11 too
drAlberT Mar 25, 2015
e7f64d9
* reintroduced possibility of use ".html" extension
drAlberT Mar 25, 2015
3395cb1
Update README.md
drAlberT Mar 25, 2015
13af5e4
Update README.md
drAlberT Mar 25, 2015
16a5650
Update README.md
drAlberT Mar 26, 2015
8ddc380
Update README.md
drAlberT Mar 26, 2015
4c5edb9
Updated logo
drAlberT Mar 26, 2015
ba3f2ff
* release v0.9
drAlberT Mar 26, 2015
b68c68d
* Renamed module to 'zzcleanurls', fixed config parameters
drAlberT Mar 27, 2015
9599456
Update README.md
drAlberT Mar 27, 2015
6afc75f
Add php-cs-fixer configuration
drAlberT Jul 27, 2015
0fa4893
added logo.gif as some modules still needs it
drAlberT Jul 27, 2015
fc54202
Should fix $category_disable_rewrite infinite grown
drAlberT Jul 31, 2015
180840c
Added gif logo, fix $category_disable_rewrite
drAlberT Aug 3, 2015
5b362bd
Fix category name from short_link
drAlberT Aug 25, 2015
6847244
Update README.md
drAlberT Aug 25, 2015
b4eaf46
Update zzcleanurls.php
drAlberT Aug 25, 2015
c729b80
Update README.md
drAlberT Aug 25, 2015
8a9382a
PSR2
drAlberT Aug 25, 2015
5ec816c
/\t/ /
drAlberT Aug 25, 2015
72feb5b
Update README.md
drAlberT Aug 26, 2015
b17c86c
Update zzcleanurls.php
drAlberT Aug 26, 2015
eb4b921
Update config.xml
drAlberT Aug 26, 2015
e0496a6
Merge pull request #10 from ZiZuu-store/dev
drAlberT Aug 26, 2015
2e68643
Update README.md
drAlberT Aug 26, 2015
b32bddf
Update README.md
drAlberT Aug 26, 2015
6a6a887
Added Gitter badge
gitter-badger Aug 28, 2015
f660009
Merge pull request #12 from gitter-badger/gitter-badge
drAlberT Aug 28, 2015
574b84d
move the gitter badge up
drAlberT Aug 28, 2015
7e729e0
Update README.md
drAlberT Sep 1, 2015
2be04ab
Just spaces fix
drAlberT Sep 7, 2015
95feb8c
Merge branch 'dev' of https://github.com/ZiZuu-store/PrestaShop_modul…
drAlberT Sep 7, 2015
8eba97a
Fix license disclaimer
drAlberT Sep 9, 2015
c49af57
code cleanup on front controllers
drAlberT Sep 9, 2015
99abeb4
better comment for hack
drAlberT Sep 9, 2015
3bddb20
better comments on FrontController.php
drAlberT Sep 9, 2015
7cd2e4b
sync Link.php with its alter-ego in current PS
drAlberT Sep 9, 2015
2b38cad
added italian translation for the module config
drAlberT Sep 10, 2015
f510fad
Make overrides to install/unistall cleanly
drAlberT Sep 17, 2015
e67423b
Merge pull request #14 from ZiZuu-store/fix_override_install_remove
drAlberT Sep 17, 2015
368a071
fixed translations mechanism
drAlberT Sep 18, 2015
b4a70c5
Merge branch 'dev' of https://github.com/ZiZuu-store/zzCleanURLs into…
drAlberT Sep 18, 2015
2c4809c
better translations
drAlberT Sep 18, 2015
6396927
fixed missing format string for translation
drAlberT Sep 18, 2015
00613a1
fix categories, canonical redirection
drAlberT Sep 22, 2015
7c61268
fix Dispatcher constructor
drAlberT Sep 23, 2015
3214073
Release 0.11.0
drAlberT Sep 23, 2015
262511c
Release v0.11.0 (Merge branch 'dev')
drAlberT Sep 23, 2015
1a0cc29
Fixed modules' controllers. Release version 1.0.0
drAlberT Sep 23, 2015
8079d37
Merge pull request #17 from ZiZuu-store/dev
drAlberT Sep 23, 2015
240559d
Update README.md
drAlberT Sep 24, 2015
32f0f04
Added Sensio Insight medal badge
drAlberT Sep 24, 2015
6bc2f18
Fix insight's issues
drAlberT Sep 24, 2015
866d761
Merge pull request #18 from ZiZuu-store/dev
drAlberT Sep 24, 2015
4a00b47
Create .sensiolabs.yml
drAlberT Sep 24, 2015
c7df96e
Update zzcleanurls.php
drAlberT Sep 24, 2015
20b5246
Update .sensiolabs.yml
drAlberT Sep 24, 2015
7be64ff
Fix insight issues
drAlberT Sep 24, 2015
947a0a0
Update .sensiolabs.yml
drAlberT Sep 24, 2015
4b6da47
Create travis-ci-apache-vhost.conf
drAlberT Sep 25, 2015
fc02921
Delete travis-ci-apache-vhost.conf
drAlberT Sep 25, 2015
ea85a87
Merge pull request #19 from ZiZuu-store/dev
drAlberT Oct 2, 2015
aa87ad1
still not workig ..
drAlberT Nov 12, 2015
0482f1b
Update Dispatcher.php
drAlberT Nov 12, 2015
e4cdace
Update Dispatcher.php
drAlberT Nov 12, 2015
c2385ec
Update CmsController.php
drAlberT Nov 12, 2015
3d9c7dc
Update CmsController.php
drAlberT Nov 12, 2015
52bce0f
Fixed 404 on CMS category
drAlberT Nov 13, 2015
889cc4a
Merge pull request #21 from ZiZuu-store/fix_cms_category
drAlberT Nov 13, 2015
15690e3
Merge pull request #22 from ZiZuu-store/dev
drAlberT Nov 13, 2015
a2d1dc3
Added some badges
drAlberT Nov 13, 2015
182a624
Update README.md
drAlberT Nov 13, 2015
bc2c7cf
Update README.md
drAlberT Nov 13, 2015
79f82f3
Update README.md
drAlberT Nov 13, 2015
c690180
Update README.md
drAlberT Nov 13, 2015
d70105e
Update README.md
drAlberT Nov 13, 2015
ede448b
Update README.md
drAlberT Nov 13, 2015
f9ab62e
Update README.md
drAlberT Nov 13, 2015
32e273a
Update README.md
drAlberT Nov 16, 2015
2d435a7
Update README.md
drAlberT Nov 16, 2015
23cd3e0
Fixed manufacturers and suppliers .. still have to fix their listing
drAlberT Nov 30, 2015
5b7d02c
Fixed manufacturers/suppliers pages
drAlberT Dec 1, 2015
67f7642
Merge pull request #26 from ZiZuu-store/fix-manufacturer-supplier
drAlberT Dec 1, 2015
0f2febd
Release 1.0.2
drAlberT Dec 1, 2015
85757b1
Merge pull request #27 from ZiZuu-store/dev
drAlberT Dec 1, 2015
e340b7b
Release 1.0.3
drAlberT Dec 1, 2015
707e226
Merge pull request #29 from ZiZuu-store/dev
drAlberT Dec 1, 2015
0c80eb7
Added license and composer support
drAlberT Dec 2, 2015
0831f72
Update README.md
drAlberT Dec 2, 2015
436d9e2
Merge pull request #30 from ZiZuu-store/dev
drAlberT Dec 2, 2015
cb85d1b
Some badge adjustments
drAlberT Dec 2, 2015
1b30977
Update composer.json
drAlberT Dec 2, 2015
78025b0
update license in composer
drAlberT Dec 2, 2015
5b11455
Update README.md
drAlberT Dec 7, 2015
a80cc6f
Delete LICENSE.md
drAlberT Dec 7, 2015
162eb06
Merge pull request #31 from ZiZuu-store/dev
drAlberT Dec 7, 2015
63e1422
Added more powerful debugging capabilities
drAlberT Dec 15, 2015
4733b43
moved category_rule on top as the original
drAlberT Dec 16, 2015
16e757b
adjust debugging stuff
drAlberT Dec 16, 2015
a5c37da
Fix variable name in isCategoryLink()
drAlberT Dec 16, 2015
d5bfc5d
Merge pull request #34 from ZiZuu-store/add_debugging
drAlberT Dec 16, 2015
0acbf7a
Update zzcleanurls.php
drAlberT Jan 2, 2016
f9b4744
fixed "forks" badge
drAlberT Jan 3, 2016
a890fac
Remove annoying warning
MJ-Aristote Jan 8, 2016
52ad1e4
remove concatenation on an empty string
MJ-Aristote Jan 11, 2016
957f1c8
Merge pull request #37 from MJ-Aristote/patch-1
drAlberT Jan 12, 2016
cf98263
Merge pull request #39 from ZiZuu-store/master
drAlberT Jan 12, 2016
5a694ec
Update zzcleanurls.php
drAlberT Jan 16, 2016
53cfd18
Try to avoid __construct, override loadRoutes()
drAlberT Feb 9, 2016
f527491
no new line at EOF
drAlberT Feb 10, 2016
3804360
Merge pull request #48 from ZiZuu-store/avoid-contructor-override
drAlberT Feb 10, 2016
559ef7e
Update config.xml
drAlberT Feb 10, 2016
3571a58
Update .gitignore
drAlberT Feb 10, 2016
75a5d43
Release 1.0.4
drAlberT Feb 10, 2016
2c41d07
Update composer.json
drAlberT Feb 10, 2016
687dfdc
Closes #41
drAlberT Feb 15, 2016
04d96f5
use self:: instead of class name
drAlberT Feb 15, 2016
64b420a
Made a better install paragraph
drAlberT Apr 28, 2016
781e488
Update composer.json
drAlberT Jun 6, 2016
0c91c3a
Migrate the module to the new Faktiva maintainer
drAlberT Oct 21, 2016
13af279
Update composer.json
drAlberT Oct 21, 2016
eb0029c
upadte sensio insight badge
drAlberT Oct 21, 2016
97a9cf4
Update composer.json
drAlberT Oct 21, 2016
cde70f1
update composer
drAlberT Oct 21, 2016
3cfb93f
fix typo in license badge
drAlberT Oct 22, 2016
c741778
Update composer dependencies
drAlberT Oct 24, 2016
2625802
Add .editorconfig [Close #61]
drAlberT Oct 24, 2016
b9a988e
Fix PHP-CS-FIXER to work on version >= 1.12
drAlberT Oct 24, 2016
dde918f
Added sensiolabs/security-checker
drAlberT Oct 24, 2016
11cffb0
Enforced better Coding Style
drAlberT Oct 24, 2016
75bc9b7
better README
drAlberT Oct 24, 2016
526cd1f
Release 1.1.1
drAlberT Oct 24, 2016
2c30131
Change @author in header comment
drAlberT Oct 24, 2016
0a1f227
Backport release 1.1.0 into dev
drAlberT Oct 22, 2016
c4c232c
Stil Coding Style adjustments
drAlberT Oct 25, 2016
72a2da4
Another update to the SL badge
drAlberT Oct 25, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
; top-most EditorConfig file
root = true

[*]
end_of_line = LF
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4
22 changes: 0 additions & 22 deletions .gitattributes

This file was deleted.

218 changes: 4 additions & 214 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,215 +1,5 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
vendor/
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf

#############
## Windows detritus
#############

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
.DS_Store


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg
.php_cs.cache
config_*.xml
*.zip
39 changes: 39 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

$header = <<<EOF
This file is part of the "Prestashop Clean URLs" module.

(c) Faktiva (http://faktiva.com)

NOTICE OF LICENSE
This source file is subject to the CC BY-SA 4.0 license that is
available at the URL https://creativecommons.org/licenses/by-sa/4.0/

DISCLAIMER
This code is provided as is without any warranty.
No promise of being safe or secure

@author Emiliano 'AlberT' Gabrielli <albert@faktiva.com>
@license https://creativecommons.org/licenses/by-sa/4.0/ CC-BY-SA-4.0
@source https://github.com/faktiva/prestashop-clean-urls
EOF;

Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);

$finder = Symfony\CS\Finder::create()
->in(__DIR__.'/faktiva_clean_urls');

return Symfony\CS\Config\Config::create()
->setUsingCache(true)
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers(array(
'header_comment',
'empty_return',
'long_array_syntax',
'newline_after_open_tag',
'short_echo_tag',
))
->finder($finder)
;

// vim:ft=php
17 changes: 17 additions & 0 deletions .sensiolabs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
global_exclude_dirs:
- translations
- upgrade

exclude_patterns:
- tools/debug.php

rules:
php.absolute_path_present:
enabled: true
allowed_paths: []
php.method_too_long:
enabled: true
max_length: 50
threshold: 15
php.psr1:
enabled: false
Loading