Commit Graph

49 Commits

Author SHA1 Message Date
Christophe Laffont
3db2df3253 Close the dialog box when the user presses the escape (ESC) key. 2014-06-11 14:53:41 +02:00
Franck Allimant
0101a47431 Added Colissimo to the list of standard modules 2014-04-24 16:29:56 +02:00
Christophe Laffont
5eb8f3a13d Missing htaccess 2014-03-11 10:02:11 +01:00
Christophe Laffont
dce97917c3 Improve gitignore rules for modules and templates 2014-03-11 09:59:07 +01:00
Manuel Raynaud
d130edc2b9 track php-cs file 2014-03-10 09:56:25 +01:00
Franck Allimant
b7c076445c Merge branch 'optim' of https://github.com/thelia/thelia into optim
Conflicts:
	core/lib/Thelia/Action/Order.php
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
2014-01-31 15:49:59 +01:00
Manuel Raynaud
55d0fd2ae2 configure upload dir for tonymce module 2014-01-14 11:20:12 +01:00
Manuel Raynaud
2f91816c2a prepare tinymce module 2014-01-13 17:54:22 +01:00
Manuel Raynaud
fc49b13ef8 remove composer.phar from tracked files 2013-10-23 19:33:35 +02:00
Manuel Raynaud
d7b3d536b0 update .gitignore file 2013-10-06 15:30:36 +02:00
Manuel Raynaud
cca7414f80 remove unused directory 2013-10-06 14:38:38 +02:00
Manuel Raynaud
7f7bb595c5 ignore new content in web/cache 2013-10-06 14:34:40 +02:00
Manuel Raynaud
ac1a3ce143 indexes web/cache directory 2013-10-06 14:33:47 +02:00
Manuel Raynaud
640c0fbde8 add .htaccess in tracking files 2013-09-17 16:02:44 +02:00
gmorel
d4d876c783 Working : .gitignore phpmyadmin (vm) 2013-09-16 10:09:34 +02:00
mespeche
7350acc437 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	.gitignore
2013-09-10 14:38:26 +02:00
mespeche
6353b8670c Saving current status 2013-09-10 14:36:06 +02:00
Michaël ESPECHE
2396b78ce9 Working
Ajout du .DS_Store
2013-08-29 16:17:28 +02:00
gmorel
f1ed03a96a WIP Coupon
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
2013-08-28 09:35:56 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
a56e05b36b Added image action and loop 2013-08-15 11:46:46 +02:00
Manuel Raynaud
76d2340cde complete .gitignore 2013-08-14 09:29:46 +02:00
Manuel Raynaud
df371355b9 change phpdoc api generator to phpdoc 2013-08-08 13:26:49 +02:00
Manuel Raynaud
25a8b28c61 track composer.lock file 2013-07-09 10:19:35 +02:00
franck
18e49e7ebe Introduction of loop scopes. 2013-07-02 19:18:41 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
Manuel Raynaud
0502879c0d ignore web/assets directory 2013-06-18 12:08:38 +02:00
franck
88199c2240 Merge branch 'admin' of https://github.com/thelia/thelia into admin
Conflicts:
	.gitignore
2013-06-10 16:43:53 +02:00
franck
a84205f5ce track admin ârt 2013-06-10 16:42:08 +02:00
Manuel Raynaud
dda7fd02ae remove composer.lock from index 2013-06-10 16:37:13 +02:00
Manuel Raynaud
785b450537 create new command allowing to install thelia using cli tools 2013-06-05 14:23:05 +02:00
Manuel Raynaud
29c05e53f2 fix bootstrap for unit test 2013-04-04 12:18:18 +02:00
Manuel Raynaud
1fb04635b5 remove logger to Tpex 2013-03-04 09:20:38 +01:00
Manuel Raynaud
cfb2d00b13 add composer.lock and new documentation 2013-02-18 14:19:17 +01:00
Manuel Raynaud
3b08bad735 fix propel version in composer file and exclude some directory in
phpunit code-coverage parameter
2013-02-16 09:25:22 +01:00
Manuel Raynaud
f8273b0e53 ignore local session 2013-02-13 12:19:19 +01:00
Manuel Raynaud
4af7d1c6ce clean .gitignore file 2013-02-11 09:09:46 +01:00
Manuel Raynaud
ec35cf998e add class-loader component, needed for HttpKernel component in dev mode 2013-02-05 11:28:36 +01:00
Manuel Raynaud
9309c75e07 remove symfony classLoader component, using composer autoloader with
dump optimized option
2013-02-04 14:55:20 +01:00
Manuel Raynaud
99092c27f2 ignore cache and log dir 2013-01-16 11:48:21 +01:00
Manuel Raynaud
99fdc30d06 add htaccess to cache directory 2013-01-16 11:47:11 +01:00
Manuel Raynaud
94a36c7912 track log directory 2013-01-16 11:45:08 +01:00
Manuel Raynaud
f5493f86af configure Tlog and TlogFile 2012-12-27 18:05:50 +01:00
Manuel Raynaud
856785dc19 put autoload classmap into composer.json 2012-12-20 11:39:33 +01:00
Manuel Raynaud
0ed8c2dd00 add NotORM to composer and create classMap for autoloading 2012-12-20 11:33:50 +01:00
Manuel Raynaud
0fc2551b21 remove dependencies 2012-12-18 10:57:59 +01:00
Manuel Raynaud
647424d649 add sample config for oracle connection 2012-12-18 10:16:25 +01:00
Manuel Raynaud
497c16d4b8 reverse thelia schema 2012-12-17 17:39:25 +01:00
Manuel Raynaud
4682d484fd declare base folders 2012-10-02 15:23:26 +02:00