dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

4313 Commits

Author SHA1 Message Date
Damien Metzger
53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Damien Metzger
c75cb99b51 // Code cleaning 2013-10-08 14:45:22 +02:00
Damien Metzger
a14118863e // Code cleaning 2013-10-08 14:45:21 +02:00
Kevin Granger
3e6f425bd4 // Orders WIP 2013-10-08 12:26:48 +02:00
Damien Metzger
b7e13e2e7f // Code cleaning 2013-10-08 11:55:10 +02:00
Kevin Granger
3e2d2e2afc // fix Orders 2013-10-07 18:54:28 +02:00
Francois Gaillard
77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
Sarah Lorenzini
8f1b19a30b // update customer service page 2013-10-07 16:45:48 +02:00
Jerome Nadaud
e94a32f80e // Localization Countries edit bootstraped 2013-10-07 14:50:57 +02:00
Jerome Nadaud
6f2358a0da // Manufacturer view bootstraped 2013-10-07 14:16:41 +02:00
Jerome Nadaud
2c4a20e21a // Add form group to referer view form items 2013-10-07 13:44:04 +02:00
Jerome Nadaud
efb041b747 // New referer Bootstraped 2013-10-07 13:40:36 +02:00
Jerome Nadaud
483aa8ad7d // Add block name fieldset and input_row 2013-10-07 13:34:35 +02:00
Francois Gaillard
f4610c06e0 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:21:16 +02:00
Francois Gaillard
68cba08303 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:18:44 +02:00
Jerome Nadaud
6fc12968b8 // Fix missing module configuration bar #PSCSX-3 2013-10-07 12:03:37 +02:00
Jerome Nadaud
97824b2335 // License 2013-10-07 12:02:51 +02:00
Fabio Chelly
a652590885 Merge remote-tracking branch 'origin/development' into development 2013-10-07 11:34:56 +02:00
Fabio Chelly
2515d81bdd [*] BO Module search: Quick search can now search modules by name and not only display name 2013-10-07 11:34:16 +02:00
gRoussac
e3db5570d0 [-] BO : Retro compat, PS_ADMIN_DIR not defined //bad commit sorry 2013-10-07 11:24:42 +02:00
Kevin Granger
2c3bf85ca7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 11:12:59 +02:00
Kevin Granger
ba7d9eec21 // fix Orders 2013-10-07 11:11:21 +02:00
Jerome Nadaud
a1f5455d07 // Fix Mark as favorite not updated 2013-10-07 11:03:03 +02:00
gRoussac
df0a24d63c [-] BO : Retro compat, PS_ADMIN_DIR not defined 2013-10-07 10:47:41 +02:00
Tomasz Slominski
b941ac007b bugfix: button tag on line 56 weren't closed 2013-10-07 09:57:55 +02:00
Kevin Granger
2ab3f08eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-04 19:13:13 +02:00
Kevin Granger
c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02:00
Fabio Chelly
48f20a4393 Merge remote-tracking branch 'origin/development' into development 2013-10-04 18:15:32 +02:00
Fabio Chelly
139a74e4cd [*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly 2013-10-04 18:15:12 +02:00
Damien Metzger
337725bb86 // Fixed KPI with 0 value 2013-10-04 17:28:03 +02:00
Jerome Nadaud
5b203cf789 // Remove languages select when only one language 2013-10-04 13:51:38 +02:00
Rémi Gaillard
6dacc07e62 // sometimes, translations files could not exist 2013-10-04 13:19:34 +02:00
Jerome Nadaud
9ae6546d90 // Features - Remove select language with one language and add autosize to textarea 2013-10-04 12:23:01 +02:00
Kevin Granger
bb7dd876af // orders WIP 2013-10-03 21:04:35 +02:00
Jerome Nadaud
874e17aa6f // remove javascript include from tpl 2013-10-03 17:55:30 +02:00
Jerome Nadaud
1dc07ab2ba // Modules positions drag and drop 2013-10-03 17:49:24 +02:00
Jerome Nadaud
39f0284aa3 // Modules positions drag and drop for bootstrap 2013-10-03 17:47:09 +02:00
gRoussac
c75cda2429 [*] BO : AdminImport, retrieve separators and lang selected 2013-10-03 17:35:20 +02:00
PhpMadman
f979cbef57 [*] BO: missing align on order for product warehouse 2013-10-03 15:26:09 +02:00
Jerome Nadaud
6059ad163b // Fix supply order state change save button 2013-10-03 11:51:08 +02:00
Jerome Nadaud
3585bf33c8 // Fix supply order change state save button 2013-10-03 11:49:16 +02:00
Jerome Nadaud
43a60f1b57 [-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses 2013-10-03 11:06:08 +02:00
Jerome Nadaud
89d86793b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-03 09:12:01 +02:00
Jerome Nadaud
33b5971a7a [-] BO : FixBug #PSCFV-10558 - Invalid HTML markup. 2013-10-03 09:11:26 +02:00
Jerome Nadaud
75771e0723 // Supply order bootstraping 2013-10-02 18:59:21 +02:00
Jerome Nadaud
f891f64cc4 // Stock cover bootstraping 2013-10-02 18:58:47 +02:00
Jerome Nadaud
b472aaed96 // Fix Stock Cover select submit 2013-10-02 17:53:56 +02:00
Kevin Granger
19af1cfda5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:39:03 +02:00
Kevin Granger
f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
Jerome Nadaud
dc06ef9c6d // Stock movement fix export button on select filter 2013-10-02 17:09:31 +02:00