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

159 Commits

Author SHA1 Message Date
Manuel Raynaud
c8c1e6ca0c create module tab on order-edit tempalte 2014-02-05 10:57:27 +01:00
Manuel Raynaud
db7ffb33b7 remove less usage usage, only use as source now 2014-02-04 11:52:49 +01:00
Franck Allimant
cf48db1261 Merge branch 'master' of https://github.com/thelia/thelia 2014-02-04 09:58:38 +01:00
Franck Allimant
02da205a52 Added the flag bar to the "Modules" tab of products, categories, folders 
and contents.
 2014-02-04 02:15:58 +01:00
Franck Allimant
5381bb2f44 Fixed typo (are -> is) 2014-02-04 01:37:56 +01:00
Franck Allimant
3efc724101 Improved empty "Modules" tab in products, folders, categories and content. 2014-02-04 01:31:39 +01:00
Franck Allimant
9c85013cec Merge branch 'master' of https://github.com/thelia/thelia 2014-01-29 15:50:52 +01:00
Franck Allimant
c140560d4a Fixed typo in order menu. 2014-01-29 15:49:59 +01:00
Manuel Raynaud
6e33670e04 update translations 2014-01-29 14:42:06 +01:00
Franck Allimant
3363200607 Improved languages management, added many country flags. Fix #183 2014-01-27 23:22:02 +01:00
Franck Allimant
7043a9e388 Fixed #196 2014-01-27 22:12:29 +01:00
Manuel Raynaud
d3c276041f add new translations 2014-01-27 16:56:05 +01:00
Franck Allimant
c5cc6aae76 Added administrator preferred locale (see issue #183) 2014-01-27 14:29:37 +01:00
Franck Allimant
d52d49ae05 Fixed wrong values displayed for empty text feature values 2014-01-27 12:50:18 +01:00
Franck Allimant
3c36a3e1b2 Language menu in the B.O to switch UI language on the fly. (see issue #183) 2014-01-26 22:03:11 +01:00
Franck Allimant
6b78a33f97 Improved order management in back-office 2014-01-25 19:14:57 +01:00
Franck Allimant
bb452c2efc Changed "Details" by "Price" 2014-01-23 15:35:52 +01:00
Manuel Raynaud
dbf0c78fa5 remove hardcoded annotation 2014-01-23 11:43:06 +01:00
Manuel Raynaud
1023790822 remove myserious annotation... 2014-01-23 11:41:15 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab TaxManager is now a service in the container. 2014-01-22 01:18:28 +01:00
Manuel Raynaud
ce0fbb11a1 add missing close block 2014-01-21 12:25:57 +01:00
Manuel Raynaud
91cf069313 fix associations tab in product modification page 2014-01-21 11:27:15 +01:00
Manuel Raynaud
87bc1a83aa change content if on product associated content 2014-01-21 11:27:15 +01:00
Manuel Raynaud
502b149d32 change good content id for category associated content 2014-01-21 11:27:15 +01:00
Franck Allimant
8bc1f67a51 Added link to associated content 2014-01-21 02:13:55 +01:00
Franck Allimant
76926dce68 Removed the empty "details" tab 2014-01-21 02:12:43 +01:00
Manuel Raynaud
2bd23777ca "save and close" button had now effect. Fix #185 2014-01-20 14:52:44 +01:00
Manuel Raynaud
3e4eff172f fix getExistingObject method for several controller. 2014-01-20 12:01:25 +01:00
Franck Allimant
4d933b8a46 Fixed module position change 2014-01-16 12:24:50 +01:00
Franck Allimant
66683a9169 Delete module request contains now "data data" flag 2014-01-16 12:00:51 +01:00
Franck Allimant
6fb448a461 Form content is now integrated in the modal body 2014-01-16 11:59:42 +01:00
Manuel Raynaud
2f91816c2a prepare tinymce module 2014-01-13 17:54:22 +01:00
Etienne Roudeix
ebd4e76e0a type 2014-01-13 11:30:49 +01:00
enurit
cabe894e13 English translation 
Fix some english translation
 2014-01-10 15:37:32 +01:00
enurit
b40894e2d4 French translation 
Add of missing french translations
 2014-01-10 15:18: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
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
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
gmorel
b8c2c2d703 Coupon : Condition module : add tooltip on condition select 2014-01-05 20:17:30 +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
gmorel
8574e1b36e Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:58:43 +01:00
Manuel Raynaud
c47d0d0276 uncomment needed loop for parent folder 2013-12-29 17:18:52 +01:00
Manuel Raynaud
fda7002418 add missing value in folder modification form 2013-12-29 17:18:52 +01:00
Manuel Raynaud
b3b414cb70 Use $parent instead of $folder_id in folders admin template 2013-12-29 17:18:52 +01:00
gmorel
ae1a05eb85 Merge 2013-12-29 04:28:11 +01:00
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
gmorel
e18298bbba Refactor : Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too (Event are used for custom inputs) 2013-12-26 23:47:07 +01:00