 Jerome Nadaud
|
9229d6cb52
|
// Features and attributes title and buttons
|
2013-11-21 12:10:15 +01:00 |
|
|
Jerome Nadaud
|
2e16a1e5d4
|
// Better products attributes list button handle
|
2013-11-21 11:25:09 +01:00 |
|
|
fram
|
5a9bb5106f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-21 10:16:47 +01:00 |
|
|
Jerome Nadaud
|
89f400d3fc
|
// Remove unnecessary button from shipping options
|
2013-11-21 10:12:53 +01:00 |
|
|
Jerome Nadaud
|
24daa6fa05
|
// Changing add new title button label
|
2013-11-21 10:04:03 +01:00 |
|
|
Jerome Nadaud
|
a536833f52
|
// Some bootstrap changes in controllers
|
2013-11-20 18:44:20 +01:00 |
|
|
Jerome Nadaud
|
a5cc9efa76
|
// Languages boostraping
|
2013-11-20 18:20:19 +01:00 |
|
|
fram
|
64e84ff296
|
// when adding a translation pack, do not install translations for modules that are not on the disk
|
2013-11-20 17:35:09 +01:00 |
|
|
Jerome Nadaud
|
e2aa776a64
|
// update cms controller title
|
2013-11-20 15:19:07 +01:00 |
|
|
Jerome Nadaud
|
62a149ebe6
|
[-] BO : FixBug #PSCSX-33 Misplaced save button
|
2013-11-20 14:50:31 +01:00 |
|
|
Jerome Nadaud
|
339fb86f4b
|
// oops
|
2013-11-18 17:42:26 +01:00 |
|
|
Jerome Nadaud
|
04bc320080
|
// Small fix
|
2013-11-18 17:41:16 +01:00 |
|
|
Damien Metzger
|
1f71090b86
|
// Timeout increased for translation download #PSCFV-11046
|
2013-11-18 15:37:34 +01:00 |
|
|
Rémi Gaillard
|
4cba2623e5
|
Merge pull request #926 from djfm/loc_ui
//Localization
|
2013-11-18 06:32:34 -08:00 |
|
|
Jerome Nadaud
|
2ba5dc18fd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
modules/themeconfigurator/themeconfigurator.php
|
2013-11-18 14:49:27 +01:00 |
|
|
Jerome Nadaud
|
bcc851c98c
|
// Update image fix
|
2013-11-18 14:44:23 +01:00 |
|
|
Jerome Nadaud
|
46dc93fd7e
|
// Adding update button on to page header toolbar on module
|
2013-11-18 14:41:49 +01:00 |
|
|
Damien Metzger
|
b62952accf
|
[*] BO : Added simulation mode to the dashboard
|
2013-11-15 18:07:23 +01:00 |
|
|
Jerome Nadaud
|
5106a5f1e3
|
// Fix products controller title
|
2013-11-15 17:25:12 +01:00 |
|
|
Jerome Nadaud
|
5fb4ac5044
|
// Fix missing last actions button in tracking controller list
|
2013-11-15 16:25:31 +01:00 |
|
|
gRoussac
|
bfed3532bf
|
[*] BO : AdminPerformances Hide warnings message when not necessary
|
2013-11-15 16:12:07 +01:00 |
|
|
gRoussac
|
73bf2a7db1
|
[-] BO : Fix #PSCFV-11016 typo
|
2013-11-15 15:16:02 +01:00 |
|
|
Jerome Nadaud
|
44f89053e4
|
// Invoice search fix
|
2013-11-15 15:00:56 +01:00 |
|
|
Jerome Nadaud
|
50eee795ed
|
// Add truncate category description preserving html tags
|
2013-11-15 11:03:06 +01:00 |
|
|
Jerome Nadaud
|
18a2e026ef
|
// Adding more buttons to module configuration
|
2013-11-14 15:49:17 +01:00 |
|
|
Jerome Nadaud
|
299a8e9e9f
|
// Update attributes group title
|
2013-11-14 14:13:28 +01:00 |
|
|
gRoussac
|
6393746f04
|
[-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c
|
2013-11-14 11:43:05 +01:00 |
|
|
Vincent Augagneur
|
9a0b308846
|
//remove preactivationLink ajax and move in gamification module
|
2013-11-14 10:54:29 +01:00 |
|
|
gRoussac
|
db99f188a2
|
[-] BO : AdminImport, execption when creating groups
|
2013-11-13 18:23:41 +01:00 |
|
|
Rémi Gaillard
|
83400c691c
|
Merge pull request #973 from djfm/development
//translations
|
2013-11-13 06:34:38 -08:00 |
|
|
fram
|
28e1a94bb6
|
// instead instead of insted
|
2013-11-13 15:10:06 +01:00 |
|
|
gRoussac
|
5a8c335d78
|
[-] FO : Bad value for back when controller name is sent
|
2013-11-13 12:30:39 +01:00 |
|
|
Jerome Nadaud
|
2cbf8af2b2
|
// Cms title
|
2013-11-13 09:36:58 +01:00 |
|
|
gRoussac
|
6ddf220aee
|
[-] Fo : Call Gmaps on https if required
|
2013-11-12 21:16:09 +01:00 |
|
|
Kevin Granger
|
4fbc8deaa8
|
// fix products
|
2013-11-12 18:21:36 +01:00 |
|
|
gRoussac
|
f0f3679cbd
|
[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956
|
2013-11-12 15:56:04 +01:00 |
|
|
gRoussac
|
3f42a381a4
|
[*] FO : Redirect to address.tpl when !Address::isCountryActiveById
|
2013-11-12 12:12:19 +01:00 |
|
|
Jerome Nadaud
|
c7fff6b20d
|
// Change edit title on employees controller
|
2013-11-12 12:05:00 +01:00 |
|
|
Jerome Nadaud
|
d6df601d0e
|
// Preferences identrifer names
|
2013-11-12 11:55:54 +01:00 |
|
|
Jerome Nadaud
|
fe387fa8ed
|
// Set Identifier name for search engine
|
2013-11-12 11:30:26 +01:00 |
|
|
Jerome Nadaud
|
41196f3c5f
|
// General modification for view and edit title
|
2013-11-12 11:06:20 +01:00 |
|
|
Jerome Nadaud
|
44d1ed0982
|
// Add category name to page header title
|
2013-11-12 10:45:17 +01:00 |
|
|
gRoussac
|
a7869a1f06
|
[*] CORE : Remove duplicate SQL queries
|
2013-11-11 13:41:23 +01:00 |
|
|
Jerome Nadaud
|
ef469d7782
|
// Move spin and ladda js to products controller
|
2013-11-08 17:47:09 +01:00 |
|
|
Jerome Nadaud
|
bf67bd56a3
|
// Add uploader to products controller
|
2013-11-08 16:29:07 +01:00 |
|
|
fram
|
be38a438e2
|
// sprintf & English
|
2013-11-08 11:39:59 +01:00 |
|
|
Kevin Granger
|
42af175d22
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 21:49:11 +01:00 |
|
|
Rémi Gaillard
|
855c8a8de4
|
// add 2 useful hooks
|
2013-11-07 18:33:49 +01:00 |
|
|
Kevin Granger
|
51e962195c
|
// This Controller needs a toolbar and a title
|
2013-11-07 17:15:40 +01:00 |
|
|
Jerome Nadaud
|
01d8376ee7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 16:48:56 +01:00 |
|