TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,866 Commits 1 Branch 0 Tags
79dafd109ee9f8899e7a750e3c7867d13d58eefc
Commit Graph

2866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
79dafd109e create tinymce module 2014-01-13 18:07:23 +01:00
Manuel Raynaud
2f91816c2a prepare tinymce module 2014-01-13 17:54:22 +01:00
Etienne Roudeix
0f6ecbb732 Merge branch 'master' of github.com:thelia/thelia 2014-01-13 11:31:16 +01:00
Etienne Roudeix
ebd4e76e0a type 2014-01-13 11:30:49 +01:00
Manuel Raynaud
6f972d8cf8 create update file 2014-01-13 10:42:52 +01:00
Manuel Raynaud
882bfeb80c import missing namespaces in Proruct controller 2014-01-13 10:12:08 +01:00
Manuel Raynaud
7aad8b23f0 hide passord on admin creation using CLI 2014-01-13 10:00:20 +01:00
Manuel Raynaud
a1636e1f50 Merge branch 'master' of github.com:thelia/thelia 2014-01-10 16:47:17 +01:00
Manuel Raynaud
46b9919ab5 update thelia version for next beta version 2014-01-10 16:46:57 +01:00
Etienne Roudeix
f732bbed5e Merge branch 'master' of github.com:thelia/thelia 2014-01-10 16:29:27 +01:00
Etienne Roudeix
a293cb3a76 remove useless code in auth loop 2014-01-10 16:28:29 +01:00
Manuel Raynaud
8ba24482da Merge pull request #166 from enurit/patch-2 
Adding translation
 2014-01-10 06:43:03 -08:00
enurit
cabe894e13 English translation 
Fix some english translation
 2014-01-10 15:37:32 +01:00
enurit
d4f47333f2 Front Translation 
Adding translation for front default template
 2014-01-10 15:33:59 +01:00
Manuel Raynaud
798129a094 update default VAT 2014-01-10 15:21:20 +01:00
enurit
b40894e2d4 French translation 
Add of missing french translations
 2014-01-10 15:18:30 +01:00
Manuel Raynaud
029a7ab957 complete changelog 2014-01-10 15:07:18 +01:00
Manuel Raynaud
3121fc4f5f clear order and consumed coupon in session after processing order. Fix #162 2014-01-10 14:55:52 +01:00
Manuel Raynaud
9d0121f321 fix cs 2014-01-10 11:41:55 +01:00
Manuel Raynaud
ab0fbb6e27 update changelog 2014-01-10 11:37:12 +01:00
Manuel Raynaud
149a943a0e don't save the currentCoupons in a property. Retrieve them from the 
session
 2014-01-10 11:20:57 +01:00
Manuel Raynaud
75007cc6c5 don't save order untill it's not the payment method 2014-01-10 10:34:57 +01:00
Manuel Raynaud
7ec7fcfa5e check if pbject exists before deleting it 2014-01-10 09:40:33 +01:00
Manuel Raynaud
74b314b5df update some code 2014-01-08 16:35:17 +01:00
Manuel Raynaud
8dcbed7b8d import missing namespace 2014-01-08 16:25:30 +01:00
Manuel Raynaud
8214ab77ec refactor update process. Now only available with command line 2014-01-08 16:23:54 +01:00
Manuel Raynaud
4d1a82e7a7 add new thelia version in migration script 2014-01-08 15:49:06 +01:00
Manuel Raynaud
f1ce5a3f70 increase thelia version 2014-01-08 15:47:49 +01:00
Manuel Raynaud
653c418aa6 log more events in update process 2014-01-08 14:37:58 +01:00
Manuel Raynaud
c8755071c9 complete changelog 2014-01-08 14:22:30 +01:00
Manuel Raynaud
366454ebe8 create sql script for migrations 2014-01-08 14:16:32 +01:00
Manuel Raynaud
97a9ff26be finish update process 2014-01-08 12:16:25 +01:00
Manuel Raynaud
6a9fd30a53 create new entry in config menu and not needed update page 2014-01-08 12:16:25 +01:00
Manuel Raynaud
b72fab5212 start update process 2014-01-08 12:16:25 +01:00
Manuel Raynaud
6070d74ac3 update propel version 2014-01-08 12:05:56 +01:00
Manuel Raynaud
3c19388078 fix propel type in schema file 2014-01-07 11:17:26 +01:00
Manuel Raynaud
7d085e2a88 Merge pull request #159 from enurit/patch-1 
update breadcrumb.tpl unescape the last item
 2014-01-07 02:08:41 -08:00
enurit
535f3dd850 update breadcrumb.tpl unescape the last item 
The last item need to be unescape too
 2014-01-07 11:02:08 +01:00
Etienne Roudeix
678aa0c5a0 fix the mess 2014-01-07 10:04:30 +01:00
Etienne Roudeix
d517c9a4ff fix parser 2014-01-06 15:58:19 +01:00
Etienne Roudeix
26aae5adfc remove cache behavior from product table 2014-01-06 14:20:12 +01:00
Etienne Roudeix
4e847bf5ae fix model 2014-01-06 12:23:01 +01:00
Etienne Roudeix
6a64f827ce fix conflicts 2014-01-06 12:14:56 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
Manuel Raynaud
d4582f467f Merge pull request #158 from gmorel/coupon 
Coupon - Refactor the way conditions are managed when building Coupon
 2014-01-06 00:44:25 -08:00
gmorel
e038c330c7 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia:
  update changelog
  delete product on category removal. delete only when it's the default category. Fix issue #151
  delete all sub categories on category removal, fix issue #150
  session parameter is needed on TaxEngine::getInstance method
  put at the beginning of changelog file the new features
  start a new section in changelog file
  uncomment needed loop for parent folder
  add missing value in folder modification form
  uncomment needed return statement
  Use $parent instead of $folder_id in folders admin template
 2014-01-05 20:20:11 +01:00
gmorel
b8c2c2d703 Coupon : Condition module : add tooltip on condition select 2014-01-05 20:17:30 +01:00
gmorel
db09e0b224 Coupon : Condition module fix unit tests 2014-01-05 19:02:19 +01:00
gmorel
716e26986f Coupon : Condition module cleaning 2014-01-05 01:14:41 +01:00
gmorel
e606a6f8ce Coupon : Condition module refactor 
Less crappy unmaintainable javascript
More logic in extendable php
 2014-01-05 00:00:15 +01:00