TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,274 Commits 1 Branch 0 Tags
edd84fb622541a33cbb9fc81ad9d8fd80704ad98
Commit Graph

26 Commits

Author SHA1 Message Date
Manuel Raynaud
edd84fb622 icreate install wizard 2013-09-17 12:17:48 +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
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
 2013-09-08 00:08:02 +02:00
mespeche
e5f8f65f77 WIP 
Suite de mise en place de la page d'édition des coupons avec miniBrowser
 2013-08-30 15:47:13 +02:00
gmorel
844e142abb Working 
- Add error message when not in trusted IP list
 2013-08-28 15:49:55 +02:00
gmorel
086f813e15 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  load test
  url output in loops
  backend loop translation
  backend trasnlation in loops
 2013-08-28 15:46:56 +02:00
gmorel
8b07b96366 Working 
- Add error message when not in trusted IP list
 2013-08-28 15:31:27 +02:00
Etienne Roudeix
f8dfa64059 load test 2013-08-26 16:38:56 +02:00
Manuel Raynaud
0a0470a184 exit script if not authorized ip 2013-07-29 15:03:07 +02:00
franck
3d5caa2341 Fix source header alignment 2013-07-17 15:06:53 +02:00
franck
2b0fdc670b Merge 2013-07-08 13:25:08 +02:00
franck
962afc6d14 Removed shared .htaccess 2013-07-05 11:49:44 +02:00
Manuel Raynaud
200ace2fc0 add 404 rule in admin 2013-06-26 10:45:43 +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
a114e559d2 Merge branch 'admin' of github.com:thelia/thelia into admin 
Conflicts:
	core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterSmartyPluginPass.php
	core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
 2013-06-19 16:40:36 +02:00
franck
89abfaad48 Integration of Assetic in SmartyParser, extended it to Admin (we can now 
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
 2013-06-19 02:07:43 +02:00
Manuel Raynaud
fa69e6e7f0 change rule in .htaccess and fix link for asset 2013-06-18 12:24:45 +02:00
Manuel Raynaud
234d74b9eb modify .htaccess 2013-06-18 12:02:20 +02:00
franck
9d8c07775b Integration de assetic 2013-06-17 15:36:05 +02:00
franck
088f5a3402 Intégration de Assetic 2013-06-17 15:29:13 +02:00
franck
0b40f1a525 Changement emplacmement templates 2013-06-10 15:36:02 +02:00
franck
f9068878c7 Debut du travail sur le B.O. 2013-06-07 15:31:05 +02:00
Manuel Raynaud
e7ddd995f5 add Thelia conf into Kernel process 2013-03-28 18:04:45 +01:00
Manuel Raynaud
630ac72aaa reindente some code 
verify if config database file exists beforeinitializing Propel
 2013-01-24 20:45:16 +01:00
Manuel Raynaud
65291cf471 move front controller to web directory 2012-12-18 16:14:43 +01:00