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
|
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
|
02b9d2e509
|
Merge branch 'cleanmaster' into modules
|
2013-12-10 15:57:37 +01:00 |
|
Etienne Roudeix
|
cc4fce9add
|
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
|
2013-12-09 10:29:49 +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
|
926ff410d1
|
fix #128
|
2013-12-06 11:50:29 +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
|
0a7b8f05d0
|
Added checkAvailableStock(), changed getPassedUrlView() to
getObsoleteRewrittenUrlView()
|
2013-12-05 13:01:09 +01:00 |
|
Etienne Roudeix
|
81fa5a291c
|
fix tax rules issue
|
2013-11-28 15:31:09 +01:00 |
|
gmorel
|
94e2d7881d
|
Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
fix typo
Implemented mail messages templates and layouts
Email template + test email
|
2013-11-27 22:22:26 +01:00 |
|
Franck Allimant
|
33e0a854f2
|
Implemented mail messages templates and layouts
|
2013-11-27 21:21:07 +01:00 |
|
gmorel
|
e7038c9369
|
Spelling rewritten with 2 t
|
2013-11-27 20:37:40 +01:00 |
|
Etienne Roudeix
|
48409c29a9
|
Colissimo in progress
|
2013-11-14 11:21:34 +01:00 |
|
Etienne Roudeix
|
be9aba9fb8
|
fix stuff + module management
|
2013-11-08 15:11:45 +01:00 |
|
Etienne Roudeix
|
422a80fcce
|
module modification
|
2013-11-08 11:26:06 +01:00 |
|
Franck Allimant
|
361e4a9d74
|
Implementing translations (still in progress)
|
2013-11-06 10:49:03 +01:00 |
|
Etienne Roudeix
|
06ee460e8a
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-04 16:16:21 +01:00 |
|
Etienne Roudeix
|
969c077f81
|
admin home stats and information
|
2013-11-04 16:15:48 +01:00 |
|
Franck Allimant
|
2aefb87db7
|
Finished log configuration. All loggers are currentrly working
|
2013-11-01 16:15:19 +01:00 |
|
Etienne Roudeix
|
e5f5570d2b
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 11:20:42 +01:00 |
|
Etienne Roudeix
|
083dde5e93
|
admin home stats
|
2013-10-30 16:32:24 +01:00 |
|
Franck Allimant
|
a11a013eb0
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-10-30 15:44:57 +01:00 |
|
Franck Allimant
|
0cabe7b9e8
|
Combination creation management
|
2013-10-30 15:44:32 +01:00 |
|
Etienne Roudeix
|
52fa6783f3
|
datepicker in admin logs
|
2013-10-30 12:00:48 +01:00 |
|
Etienne Roudeix
|
19e373f7fe
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-29 16:10:10 +01:00 |
|
Etienne Roudeix
|
a055f3b3eb
|
admin log
|
2013-10-29 16:09:50 +01:00 |
|
Manuel Raynaud
|
c74422f5dc
|
implement module inclusion
|
2013-10-29 15:56:03 +01:00 |
|
Etienne Roudeix
|
082f9aff8d
|
admin logs
|
2013-10-29 12:22:34 +01:00 |
|
Manuel Raynaud
|
7a2469cdc8
|
allow to create a customer in bakcoffice
|
2013-10-28 16:55:07 +01:00 |
|
Etienne Roudeix
|
2eb5fc821c
|
mailing sytem admin
|
2013-10-28 12:24:59 +01:00 |
|
Franck Allimant
|
0d50557269
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-10-25 00:33:52 +02:00 |
|
Franck Allimant
|
06cc8ce1ea
|
Finished product combinations edition
|
2013-10-25 00:32:56 +02:00 |
|
Etienne Roudeix
|
6ea61ff68c
|
searchLoopInterface + use in OrderLoop
|
2013-10-24 19:50:09 +02:00 |
|
Etienne Roudeix
|
5b008a8b17
|
Merge branch 'master' into loops
|
2013-10-24 17:15:48 +02:00 |
|
Etienne Roudeix
|
c3fe31c0af
|
new product loop
|
2013-10-24 17:15:16 +02:00 |
|
Manuel Raynaud
|
10f78b90a5
|
Merge pull request #49 from thelia/frontend
Frontend
|
2013-10-24 08:07:18 -07:00 |
|
touffies
|
ebec82d1d2
|
Merge with master
|
2013-10-24 16:52:03 +02:00 |
|
Franck Allimant
|
db6d5692eb
|
Merge branch 'catalog'
Conflicts:
local/config/schema.xml
|
2013-10-24 16:47:53 +02:00 |
|
Franck Allimant
|
b9410bba59
|
Implemented prices conversion management
|
2013-10-24 12:34:44 +02:00 |
|