mespeche
|
44dc4dbcc8
|
Setting creation form language
|
2013-09-23 10:22:14 +02:00 |
|
mespeche
|
0eabcb4f28
|
Setting languages view and route
|
2013-09-23 09:55:54 +02:00 |
|
mespeche
|
eab7cd9fa8
|
Password type on password field
|
2013-09-20 16:12:49 +02:00 |
|
mespeche
|
7e081d99e4
|
Creation of mailing system configuration variables management view
|
2013-09-20 16:10:53 +02:00 |
|
mespeche
|
265da6a57e
|
Add default language & editing language default field
|
2013-09-20 12:00:39 +02:00 |
|
mespeche
|
93fd189198
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-20 10:39:34 +02:00 |
|
mespeche
|
b933a96c8e
|
Vertical align middle tables
|
2013-09-20 10:39:02 +02:00 |
|
franck
|
cb5f6d4c70
|
Fixed translations
|
2013-09-20 09:57:30 +02:00 |
|
mespeche
|
5abae4db7d
|
Setting profile update
|
2013-09-20 09:35:56 +02:00 |
|
mespeche
|
8731bf3c37
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 17:31:37 +02:00 |
|
mespeche
|
169b3c2659
|
Setting profile edition route and view
|
2013-09-19 17:30:57 +02:00 |
|
franck
|
e672677748
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/category-edit.html
|
2013-09-19 17:27:46 +02:00 |
|
franck
|
05aa284f4b
|
Fixed minor UI glithces
|
2013-09-19 17:06:10 +02:00 |
|
mespeche
|
8a5f15c952
|
All tables are now responsive
|
2013-09-19 17:01:17 +02:00 |
|
mespeche
|
1627b80df7
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 16:42:23 +02:00 |
|
mespeche
|
1d90e8ba54
|
Responsive management header
|
2013-09-19 16:42:03 +02:00 |
|
Etienne Roudeix
|
4ac9a0afad
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:24:05 +02:00 |
|
mespeche
|
e1c2f8da0a
|
Add link on ref to edit customer
|
2013-09-19 16:10:14 +02:00 |
|
mespeche
|
1a92b8c92f
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 16:08:15 +02:00 |
|
mespeche
|
3fd5e4f3ad
|
Setting of modules index view
|
2013-09-19 16:07:45 +02:00 |
|
Manuel Raynaud
|
b71c107f7e
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:04:00 +02:00 |
|
Manuel Raynaud
|
41bd8a7cec
|
icomplete product page
|
2013-09-19 15:39:36 +02:00 |
|
Etienne Roudeix
|
3c02a9d23c
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 15:12:37 +02:00 |
|
Etienne Roudeix
|
61fab3a62a
|
order creation
|
2013-09-19 15:11:54 +02:00 |
|
mespeche
|
94aab3ea8a
|
Add modules routing and default action/view
|
2013-09-19 13:27:47 +02:00 |
|
mespeche
|
2640794af7
|
Change properties of bootstrap-select field
|
2013-09-19 13:21:42 +02:00 |
|
mespeche
|
f02505f6d4
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 12:51:35 +02:00 |
|
mespeche
|
260fc5b51a
|
Width 100% on bootstrap-select
|
2013-09-19 12:47:56 +02:00 |
|
Manuel Raynaud
|
42e43de9a6
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 12:45:50 +02:00 |
|
Manuel Raynaud
|
5a79c6c016
|
force_return as default value tue in Image loop
|
2013-09-19 12:45:02 +02:00 |
|
mespeche
|
b1af4debe1
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 12:32:34 +02:00 |
|
mespeche
|
0ebaf458ed
|
- Adding of bootstrap-select
- Finish shipping_configuration view
- bootstrap-select on shipping_zones view
|
2013-09-19 12:31:46 +02:00 |
|
Manuel Raynaud
|
96ffe88938
|
fix loop image argument
|
2013-09-19 12:30:35 +02:00 |
|
mespeche
|
78067575fa
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 10:16:10 +02:00 |
|
mespeche
|
a02ba364be
|
Change background image to simple background color
|
2013-09-19 10:15:14 +02:00 |
|
mespeche
|
18d9e03172
|
Finish shipping configuration default view
|
2013-09-18 23:14:29 +02:00 |
|
Manuel Raynaud
|
f2acbed9d6
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-18 21:12:12 +02:00 |
|
Etienne Roudeix
|
66536d0b31
|
Merge branch 'master' into template
Conflicts:
core/lib/Thelia/Core/Template/Loop/Product.php
|
2013-09-18 20:03:13 +02:00 |
|
Manuel Raynaud
|
f3367aed45
|
finish import
|
2013-09-18 19:33:29 +02:00 |
|
mespeche
|
86078d3054
|
- Edit shipping_zone routes
- Create shipping_configuration routes
|
2013-09-18 19:33:24 +02:00 |
|
mespeche
|
42ad62d2cd
|
Shipping zones views and routes creation
|
2013-09-18 19:20:51 +02:00 |
|
mespeche
|
8841958646
|
Add languages files and set english by default
|
2013-09-18 18:09:07 +02:00 |
|
mespeche
|
72c0685bfa
|
Setting of tinymce and filemanager
|
2013-09-18 18:00:44 +02:00 |
|
Etienne Roudeix
|
b8c2bdc8df
|
cheque module
|
2013-09-18 16:23:10 +02:00 |
|
mespeche
|
9fdf648451
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-18 15:39:03 +02:00 |
|
mespeche
|
25becbe0cc
|
WIP : Setting Folders management
|
2013-09-18 15:38:08 +02:00 |
|
franck
|
0214836a54
|
Added {url file='...'} to get file pathes
|
2013-09-18 12:15:17 +02:00 |
|
mespeche
|
742b90b24c
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-18 11:55:04 +02:00 |
|
mespeche
|
c7a6fe060f
|
- Setting dashboard view with jqplot plugin
|
2013-09-18 11:53:39 +02:00 |
|
franck
|
d02f13f021
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Model/Product.php
|
2013-09-18 00:35:48 +02:00 |
|