TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
757 Commits 1 Branch 0 Tags
5a1d6222846388f3399d9ba564a31e44cbe28993
Commit Graph

757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
gmorel
71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
 2013-08-28 18:19:38 +02:00
gmorel
6c2dbb0152 Working 
- Add regenerated Model classes
 2013-08-28 18:09:17 +02:00
gmorel
84a2314108 WIP 
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
 2013-08-28 18:06:22 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
gmorel
059317c266 Working 
- Add reset_instal.sh reseting Model/SQL/DB creation/Insert/Admin creation
Usage :
chmod +x reset_install.sh
./ reset_install.sh
 2013-08-28 16:35:14 +02:00
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
gmorel
844e142abb Working 
- Add error message when not in trusted IP list
 2013-08-28 15:49:55 +02:00
Etienne Roudeix
2d370bf9b8 rewriting tables 2013-08-28 15:48:19 +02:00
Etienne Roudeix
1de0e9f8a4 rewriting tables 2013-08-28 15:47:47 +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
Etienne Roudeix
61e13c416c rewriting tables 2013-08-28 15:35:10 +02:00
gmorel
8b07b96366 Working 
- Add error message when not in trusted IP list
 2013-08-28 15:31:27 +02:00
Etienne Roudeix
f54ff0f914 Merge branch 'master' into loops 2013-08-28 15:08:49 +02:00
gmorel
e085b162dd Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Added command for creating admin users on console
  Fixed typo
 2013-08-28 14:37:47 +02:00