 Kevin Granger
|
fae1fd58a9
|
// tweak on switch + admin import
|
2013-11-25 17:16:59 +01:00 |
|
|
Kevin Granger
|
aa95454c4e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/images/content.tpl
|
2013-10-22 10:07:03 +02:00 |
|
|
Kevin Granger
|
eb82297f45
|
// small fixs
|
2013-10-22 10:04:45 +02:00 |
|
|
Jerome Nadaud
|
3ba337f19a
|
// Image preference bootstraping
|
2013-10-22 09:25:05 +02:00 |
|
|
Jerome Nadaud
|
f336cc599b
|
// Btn-primary replacement
|
2013-10-21 18:56:41 +02:00 |
|
|
Kevin Granger
|
0e7a7f8be4
|
// replace fieldset with div for responsive table
|
2013-10-15 18:09:53 +02:00 |
|
|
Jerome Nadaud
|
d88857610d
|
// Toolbar modifs
|
2013-10-08 18:42:07 +02:00 |
|
|
Jerome Nadaud
|
4bb0a5f794
|
// Preferences images bootstrap design
|
2013-09-23 11:43:31 +02:00 |
|
|
Kevin Granger
|
f8f2c99d28
|
// Modules page + Warning
|
2013-08-26 11:38:10 +02:00 |
|
|
Kevin Granger
|
ff16de05de
|
// fix, design and fun !
|
2013-08-06 19:06:56 +02:00 |
|
|
Sarah Lorenzini
|
e2abf3ecb7
|
// update preferences tab -> images controller
|
2013-08-01 17:26:53 +02:00 |
|
|
Sarah Lorenzini
|
047ab9d681
|
// update images controller
|
2013-08-01 16:45:46 +02:00 |
|
|
Sarah Lorenzini
|
50a54240b9
|
// update images controller
|
2013-08-01 16:43:58 +02:00 |
|
|
Kevin Granger
|
5defc39def
|
[+] BO Images / Marketing / Spe. Prices Rules
|
2013-08-01 14:42:43 +02:00 |
|
|
Kevin Granger
|
40f03d0ba1
|
[+] BO: Form components
|
2013-06-18 21:03:43 +02:00 |
|
|
Damien Metzger
|
7a76b8b6a0
|
// Removed deprecated block for new installs
|
2013-04-25 09:03:32 +02:00 |
|
|
fram
|
77efe4c04e
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
|
djfm
|
714a5e08cc
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +01:00 |
|
|
Francois Gaillard
|
8baf87eef5
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
|
vAugagneur
|
be946319be
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
|
lLefevre
|
c669c21977
|
[-] BO : fixed #PSFV-727 (issue #9 to #13)
|
2012-04-05 13:51:40 +00:00 |
|
|
lLefevre
|
74cd81a66c
|
// Fix replace //" by " in english keys and change french keys
|
2012-03-14 17:25:41 +00:00 |
|
|
lLefevre
|
05c2b696ce
|
// revert to revision 14160
|
2012-03-14 15:05:13 +00:00 |
|
|
lLefevre
|
6608328a2a
|
// Fix replace \\" by " in english keys
|
2012-03-14 14:58:48 +00:00 |
|
|
lLefevre
|
c21bef2acf
|
// Fix update english key of translations in all files
|
2012-03-14 12:25:51 +00:00 |
|
|
rMalie
|
1dc629a949
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
|
mMarinetti
|
677a4e485c
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
|
lLefevre
|
6356a6bdea
|
// fixed small modifications
|
2012-02-09 08:37:47 +00:00 |
|
|
tDidierjean
|
b1e9cedf42
|
// Move controller templates to subfolder controllers/
|
2012-01-09 17:23:42 +00:00 |
|