Etienne Roudeix
977bbb55fa
Merge branch 'cleanmaster' into modules
2013-12-16 11:32:54 +01:00
Etienne Roudeix
86f1e06e42
document repositioning after delation
2013-12-16 11:32:05 +01:00
Etienne Roudeix
c5e69ebbb9
Merge branch 'cleanmaster' into modules
2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6
document positioning
2013-12-16 10:55:18 +01:00
Etienne Roudeix
536c88b4f8
Merge branch 'cleanmaster' into modules
...
Conflicts:
core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
2013-12-16 09:57:35 +01:00
Manuel Raynaud
f4c5f23d00
Change AdminLog logging request behavior, fixing issue #145
2013-12-14 14:16:45 +01:00
Etienne Roudeix
76cd704f80
review tests
2013-12-12 15:56:13 +01:00
Etienne Roudeix
162f364df6
reveiw test
2013-12-12 15:55:52 +01:00
Etienne Roudeix
d1a1e14c0a
fix test
2013-12-12 15:54:52 +01:00
Etienne Roudeix
297f197fed
Merge branch 'cleanmaster' into modules
2013-12-12 15:45:45 +01:00
Etienne Roudeix
c9e052188c
images are positionable
2013-12-12 15:41:35 +01:00
Etienne Roudeix
93537b8d71
in progress : reorder image
2013-12-12 15:30:10 +01:00
Etienne Roudeix
ff828bf1ba
test rewritten url reassignment
2013-12-11 13:10:03 +01:00
Etienne Roudeix
6acb1924d8
test url reassignment
2013-12-11 13:07:02 +01:00
Etienne Roudeix
02b9d2e509
Merge branch 'cleanmaster' into modules
2013-12-10 15:57:37 +01:00
Etienne Roudeix
63f48b79da
fix rewrinting tests
2013-12-10 15:56:59 +01:00
Etienne Roudeix
f9d4fe1e5c
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-10 15:55:07 +01:00
Etienne Roudeix
83cac71895
fix urls in loops
2013-12-10 15:48:22 +01:00
Manuel Raynaud
4c9eff379a
Merge pull request #138 from gmorel/french_translation
...
Adding some French translation for backoffice
2013-12-09 06:39:21 -08:00
Etienne Roudeix
95d327f976
fix tests
2013-12-09 15:31:27 +01:00
gmorel
5c602bc2cb
Translation replace tab by 4 spaces
2013-12-09 15:19:15 +01:00
Etienne Roudeix
28d2add37d
fix tests
2013-12-09 15:02:09 +01:00
Etienne Roudeix
79e4193791
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-09 13:02:04 +01:00
Etienne Roudeix
090b201fea
test rewriting
2013-12-09 13:01:39 +01:00
Manuel Raynaud
80a17e6438
Merge pull request #135 from gmorel/french_translation
...
Translation : Ordering existing translations by keys
2013-12-09 03:22:07 -08:00
Franck Allimant
bf64cd117e
Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur
...
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
Adding translation for Backoffice
Adding translation for Backoffice
fix close #131
fix updatePositionDownTest
Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur
Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
2013-12-09 12:14:15 +01:00
Manuel Raynaud
8944446776
display admin hook if in debug mode and specific parameter in url
2013-12-09 12:12:20 +01:00
Etienne Roudeix
f4a2744d19
url management in backoffice
2013-12-09 11:28:13 +01:00
Etienne Roudeix
cc4fce9add
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-09 10:29:49 +01:00
Manuel Raynaud
9885c67ade
add some phpdoc in TheliaEvents class
2013-12-09 09:45:06 +01:00
Franck Allimant
8c864021f5
Added sorting and position ùmanagement to modules.
2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d
Merge branch 'master' into modules
2013-12-06 17:16:14 +01:00
Etienne Roudeix
14e7181d06
rewritten url update
2013-12-06 16:35:14 +01:00
Franck Allimant
0fcbb409e3
Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete()
2013-12-06 12:26:39 +01:00
Etienne Roudeix
c703f25f73
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-06 11:51:10 +01:00
Etienne Roudeix
926ff410d1
fix #128
2013-12-06 11:50:29 +01:00
Manuel Raynaud
06c875455f
remove unused constant events
2013-12-06 11:27:32 +01:00
Etienne Roudeix
d06e0a14cf
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-06 11:20:53 +01:00
Etienne Roudeix
a9a2a256fa
fix updatePositionDownTest
2013-12-06 11:20:15 +01:00
Franck Allimant
5b0307b5b3
Merge branch 'master' of https://github.com/thelia/thelia
2013-12-06 10:44:39 +01:00
Franck Allimant
52c7c6c9f7
Added translation of email templates
2013-12-06 10:44:06 +01:00
Etienne Roudeix
0c5683ef25
fix close #131
2013-12-06 10:37:08 +01:00
Franck Allimant
c2292b75d4
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
2013-12-05 18:46:35 +01:00
Franck Allimant
5dfe8584ae
Removed forgotten echo
2013-12-05 18:08:36 +01:00
Franck Allimant
5857c07ef0
Fixed issue 118
2013-12-05 15:57:56 +01:00
Franck Allimant
de0542b33c
Changed direct accesses to verifyStok by calls to checkAvailableStock
2013-12-05 13:02:13 +01:00
Franck Allimant
8e56fcc651
Fixed exception when log file could not be renamed
2013-12-05 13:01:43 +01:00
Franck Allimant
0a7b8f05d0
Added checkAvailableStock(), changed getPassedUrlView() to
...
getObsoleteRewrittenUrlView()
2013-12-05 13:01:09 +01:00
Franck Allimant
3e4bc0378c
Fixxed assets URLs (on Windows, DS is \ !)
2013-12-02 18:07:11 +01:00
Etienne Roudeix
9b165483d9
fix tax engine instance
2013-12-02 13:16:14 +01:00
