TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
771 Commits 1 Branch 0 Tags
19ea6d25df2deef4a15a1c7d77d849fa83d3c5e9
Commit Graph

771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
19ea6d25df WIP 
Merge on master
 2013-09-03 11:02:36 +02:00
gmorel
6ee99b6cad Working 
- implementation Coupon Read page
 2013-09-03 11:02:02 +02:00
gmorel
6383de251e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Added missing CategoryEvent class
 2013-09-02 17:34:24 +02:00
franck
5568f2dc62 Added missing CategoryEvent class 2013-09-02 17:34:11 +02:00
gmorel
4a62419bf6 Working 
- fix composer.json
 2013-09-02 17:30:48 +02:00
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
 2013-09-02 17:25:25 +02:00
gmorel
451dc93eb3 Working 
- Fully automatic reset script
 2013-09-02 17:09:14 +02:00
gmorel
4b1de5fe93 WIP 
- Coupon Controller
 2013-09-02 17:08:47 +02:00
gmorel
ae0f2e766b Working 
- merge schema
 2013-09-02 17:08:01 +02:00
gmorel
c3650b4482 WIP 
Coupon Loop
 2013-09-02 17:07:25 +02:00
gmorel
273e6144aa Working 
- Add parameters to command
 2013-09-02 16:57:34 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
Manuel Raynaud
fd80139a9c change symfony/icu version for compatibility 2013-09-02 15:25:01 +02:00
Manuel Raynaud
58484b6c80 add file reset_install.sh 2013-09-02 13:20:26 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
gmorel
eef57ba30a WIP 
- Coupon controller
 2013-09-02 09:17:47 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php 2013-09-02 01:37:12 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-02 00:18:29 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
Manuel Raynaud
932bf00532 update propel version and dependencies 2013-09-01 19:26:13 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
533f18bcec Typo :( 2013-08-31 11:39:14 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
d9d8190fa6 Fixed URL::absoluteUrl() 2013-08-30 19:56:24 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/default/login.html
 2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
Etienne Roudeix
6fa4d3a923 rewriting 2013-08-30 16:47:13 +02:00
Etienne Roudeix
d8df46737d specific rewrittend url retrievement 2013-08-30 16:02:37 +02:00
gmorel
180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:43:43 +02:00
Etienne Roudeix
e63ff065c7 product page 2013-08-30 15:04:08 +02:00
Etienne Roudeix
c0a4b8b987 Merge branch 'master' into rewrite 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Attribute.php
	core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
	core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Content.php
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Loop/Currency.php
	core/lib/Thelia/Core/Template/Loop/Feature.php
	core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Image.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Loop/Title.php
	core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
 2013-08-30 15:02:48 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
gmorel
fd63115c97 WIP 
- Update Coupon Controller/Form/Event - create()
 2013-08-30 12:23:49 +02:00
gmorel
df57c8fccd Merge remote-tracking branch 'origin/coupon' into coupon 2013-08-30 11:06:49 +02:00
gmorel
71fa04a193 WIP 
- Update Coupon Controller/Form/Event - create()
- Rule serialization/unserialization managed in Model/Coupon now
 2013-08-30 11:06:33 +02:00
Etienne Roudeix
4ba16dc290 sid : rewriting 2013-08-30 09:13:54 +02:00
mespeche
ed763344ec WIP 
Début de mise en place de coupon/add (coupon/edit)
 2013-08-29 17:51:50 +02:00
gmorel
8dd8c733d3 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By Michaël ESPECHE
# Via Michaël ESPECHE
* 'coupon' of https://github.com/thelia/thelia:
  WIP
  Working
  WIP
 2013-08-29 16:22:01 +02:00
gmorel
37659415ad WIP 
- Add Coupon Event
- Customer Parameter
 2013-08-29 16:20:41 +02:00
Michaël ESPECHE
6a7d5ec98e WIP 
Merge master
 2013-08-29 16:17:49 +02:00
Michaël ESPECHE
2396b78ce9 Working 
Ajout du .DS_Store
 2013-08-29 16:17:28 +02:00
Michaël ESPECHE
4b9a54fa68 WIP 
- Implémentation coupon/list en cours
- Implémentation coupon/read OK
- Implémentation coupon/edit en cours
 2013-08-29 16:16:21 +02:00
Etienne Roudeix
75b4564297 rewriting tables 2013-08-29 09:20:58 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00
franck
cce270fdcc Factorized ModelCriterialTools calls in loops 2013-08-28 19:47:31 +02:00
gmorel
6f31460be6 Working 
- Fix serialization not tested
 2013-08-28 19:45:21 +02:00
gmorel
1d87708d3b Working 
- Update Coupon BackOffice routing
 2013-08-28 19:21:48 +02:00