TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,193 Commits 1 Branch 0 Tags
7a2469cdc868fcbb1e966adb2a018322dcda85ea
Commit Graph

853 Commits

Author SHA1 Message Date
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
de147b7b0c change visibility parameter in content and folder loops 2013-10-25 12:24:47 +02:00
Manuel Raynaud
8196349ceb change visibility parameter in category loop 2013-10-25 12:23:50 +02:00
Manuel Raynaud
e26c8fdd7c Merge branch 'master' of github.com:thelia/thelia 2013-10-25 11:29:00 +02:00
Manuel Raynaud
7ca339492f fix test suite 2013-10-25 11:21:39 +02:00
Etienne Roudeix
cc3aa39cae fix product loop 2013-10-25 11:18:20 +02:00
Manuel Raynaud
0d8c4f97a1 return empty value instead of throwing an exception for format_number 
smarty function
 2013-10-25 10:54:53 +02:00
Manuel Raynaud
3c4525d6d6 fix product loop 2013-10-25 10:52:41 +02:00
Manuel Raynaud
936af2ec91 return empty value instead of throwing an exception for format_date 
smarty function
 2013-10-25 10:43:40 +02:00
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
Manuel Raynaud
373fe13287 save thelia version 2013-10-25 09:10:27 +02:00
Franck Allimant
d9fc945015 Added TAX_RUl_ID to simple part of product loop 2013-10-25 00:46:25 +02:00
Franck Allimant
0d50557269 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-25 00:33:52 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Etienne Roudeix
d8611c2965 admin search in customer and products 2013-10-24 20:26:00 +02:00
Etienne Roudeix
6ea61ff68c searchLoopInterface + use in OrderLoop 2013-10-24 19:50:09 +02:00
Etienne Roudeix
32725832f1 Merge branch 'master' of github.com:thelia/thelia 2013-10-24 17:42:22 +02:00
Etienne Roudeix
2dc4589126 non-complex product loop returns default PSE 2013-10-24 17:41:32 +02:00
Manuel Raynaud
91f2920336 remove http cache 2013-10-24 17:35:17 +02:00
Etienne Roudeix
5b008a8b17 Merge branch 'master' into loops 2013-10-24 17:15:48 +02:00
Etienne Roudeix
c3fe31c0af new product loop 2013-10-24 17:15:16 +02:00
Manuel Raynaud
10f78b90a5 Merge pull request #49 from thelia/frontend 
Frontend
 2013-10-24 08:07:18 -07:00
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
Franck Allimant
db6d5692eb Merge branch 'catalog' 
Conflicts:
	local/config/schema.xml
 2013-10-24 16:47:53 +02:00
Franck Allimant
4f7e7660ca Finished PSE management for products with no combinations 2013-10-24 16:39:22 +02:00
Etienne Roudeix
ecaf0ccd07 consider FROM_DEFAULT_CURRENCY in pse loop 2013-10-24 15:23:16 +02:00
Etienne Roudeix
7b9585b11b consider FROM_DEFAULT_CURRENCY field in product loop 2013-10-24 15:15:29 +02:00
Etienne Roudeix
ca03e374f2 newsletter modification from account 
email modification from account
 2013-10-24 12:10:35 +02:00
Etienne Roudeix
4065f338b9 Merge branch 'master' into tax 2013-10-24 10:37:05 +02:00
Etienne Roudeix
fb4e15ae77 fix issue #47 2013-10-24 10:36:06 +02:00
badsuricate
b9e5b4d9c7 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-24 09:12:52 +02:00
Manuel Raynaud
3f7300bdee add some control for knwoing if user is in install mode 2013-10-24 08:31:49 +02:00
Franck Allimant
5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
 2013-10-24 00:16:33 +02:00
touffies
04c43a12da Add new event NEWSLETTER_UNSUBSCRIBE 2013-10-24 00:15:51 +02:00
Franck Allimant
7ca2399573 Worked on catalog 2013-10-23 23:47:44 +02:00
Franck Allimant
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00
badsuricate
b26c3216c5 Fix 404 error page 2013-10-23 23:25:41 +02:00
Manuel Raynaud
a7796cf481 manage lanf <=> url assignment 2013-10-23 19:04:49 +02:00
Etienne Roudeix
a631a4e174 fix tagged_form_field 2013-10-23 18:00:04 +02:00
Etienne Roudeix
cf67a0478e Merge branch 'master' into tax 2013-10-23 16:32:10 +02:00
Etienne Roudeix
fb8b82093a administrators management 2013-10-23 16:31:37 +02:00
Manuel Raynaud
3dd51d98b6 process default behacior for languages 2013-10-23 15:41:41 +02:00
badsuricate
5e62da9d29 Add new Arguments for CartLoop 
New args = Limit and position
 2013-10-23 15:20:42 +02:00
Manuel Raynaud
53e25ce7c1 process delete language 2013-10-23 12:38:33 +02:00
Manuel Raynaud
b16edfbd1d create language delete event object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
24b504ad3b finish language creation process 2013-10-23 12:38:32 +02:00
Manuel Raynaud
d356974ef7 create lang toggleDefault object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
38761a7275 process lang udate action 2013-10-23 12:38:32 +02:00
Manuel Raynaud
a2d292f6a3 create lang object events 2013-10-23 12:38:32 +02:00
Manuel Raynaud
7915552fe6 create ajax modal for lang edition 2013-10-23 12:38:32 +02:00