dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
72b046d5f005e2440ddd3ab6daf2c8b61ff10e0c
PrestaShop/admin-dev/themes/default/template/controllers
T
History
Kevin Granger 9e5bbac559 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-07-25 19:21:59 +02:00
..
access
[-] BO: fixed bug #PSCFV-7440
2013-06-18 14:20:59 +02:00
addons_catalog
// Welcome 2013
2013-01-04 11:19:03 +01:00
addresses
[-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672
2013-07-04 17:00:27 +02:00
attachments
// Welcome 2013
2013-01-04 11:19:03 +01:00
attribute_generator
[+] BO: Form components
2013-06-18 21:03:43 +02:00
attributes
// BO attributes
2013-07-25 15:51:41 +02:00
attributes_groups
// Welcome 2013
2013-01-04 11:19:03 +01:00
backup
//Porting more components to bootstrap
2013-06-21 17:47:05 +02:00
carriers
// Welcome 2013
2013-01-04 11:19:03 +01:00
cart_rules
[+] BO Wip BS -> Products + fix
2013-07-05 18:36:42 +02:00
carts
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
categories
// fix input + switch
2013-07-25 11:55:27 +02:00
cms
// Welcome 2013
2013-01-04 11:19:03 +01:00
cms_categories
// Welcome 2013
2013-01-04 11:19:03 +01:00
cms_content
// Welcome 2013
2013-01-04 11:19:03 +01:00
countries
[-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0
2013-05-27 19:06:59 +02:00
customer_threads
//Porting more components to bootstrap
2013-06-21 17:47:05 +02:00
customers
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
emails
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
employees
// No escape in JS links
2013-06-07 12:33:44 +02:00
feature_value
// Welcome 2013
2013-01-04 11:19:03 +01:00
features
// Welcome 2013
2013-01-04 11:19:03 +01:00
geolocation
// Welcome 2013
2013-01-04 11:19:03 +01:00
groups
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
home
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
images
[+] BO: Form components
2013-06-18 21:03:43 +02:00
import
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
information
//Porting more components to bootstrap
2013-06-21 17:47:05 +02:00
invoices
// update order tab
2013-07-15 17:58:23 +02:00
languages
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
localization
// Reduced localization form size
2013-03-20 18:10:53 +01:00
login
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
logs
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
maintenance
// Welcome 2013
2013-01-04 11:19:03 +01:00
manufacturers
no message
2013-07-25 19:18:54 +02:00
marketing/helpers/view
[+] BO : added new marketing tab
2013-02-13 09:57:30 +01:00
meta
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
modules
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
modules_positions
// update order tab
2013-07-23 17:54:47 +02:00
not_found
[-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable
2013-05-15 11:31:55 +02:00
order_preferences
// Welcome 2013
2013-01-04 11:19:03 +01:00
orders
// update order tab
2013-07-25 16:53:18 +02:00
outstanding
// Welcome 2013
2013-01-04 11:19:03 +01:00
payment
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
performance
[+] BO: Form components
2013-06-18 21:03:43 +02:00
preferences
// Welcome 2013
2013-01-04 11:19:03 +01:00
products
[-] BO : BugFix Cancel modification button error
2013-07-25 18:15:41 +02:00
referrers
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
request_sql
//replaced all js='1' with js=1 so that the translation regexes don't fail
2013-07-22 09:34:18 +00:00
return
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
scenes
// Welcome 2013
2013-01-04 11:19:03 +01:00
search
// Welcome 2013
2013-01-04 11:19:03 +01:00
shipping
[-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js
2013-02-11 10:30:32 +01:00
shop
//replaced all js='1' with js=1 so that the translation regexes don't fail
2013-07-22 09:34:18 +00:00
shop_group
// Welcome 2013
2013-01-04 11:19:03 +01:00
shop_url
// Welcome 2013
2013-01-04 11:19:03 +01:00
slip
// Welcome 2013
2013-01-04 11:19:03 +01:00
specific_price_rule
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
states
// Welcome 2013
2013-01-04 11:19:03 +01:00
stats
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +02:00
statuses
[+] BO: Form components
2013-06-18 21:03:43 +02:00
stock_cover
// Welcome 2013
2013-01-04 11:19:03 +01:00
stock_instant_state
// Welcome 2013
2013-01-04 11:19:03 +01:00
stock_mvt
// Welcome 2013
2013-01-04 11:19:03 +01:00
stores
[-] BO : Fix bug witth shop address and no state in country
2013-04-25 10:12:23 +02:00
suppliers
// BO: Improve product display on supplier page
2013-04-30 11:09:08 +02:00
supply_orders
//replaced all js='1' with js=1 so that the translation regexes don't fail
2013-07-22 09:34:18 +00:00
supply_orders_change_state
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
supply_orders_receipt_history
// Welcome 2013
2013-01-04 11:19:03 +01:00
tags
[+] BO: Form components
2013-06-18 21:03:43 +02:00
tax_rules
[+] BO: Form components
2013-06-18 21:03:43 +02:00
tax_rules_group
// Welcome 2013
2013-01-04 11:19:03 +01:00
themes
// Welcome 2013
2013-01-04 11:19:03 +01:00
tracking
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
translations
[+] BO: Form components
2013-06-18 21:03:43 +02:00
warehouses
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
webservice
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00