3784 Commits

Author SHA1 Message Date
gRoussac
89874a063d // blockcontact switch phone 2013-12-11 21:28:33 +01:00
Jérôme Nadaud
4895c95a19 Merge pull request #1128 from kpodemski/patch-2
[-] CORE : After adding cart rule redirect improvements
2013-12-11 12:03:52 -08:00
Krystian Podemski
edb72662bf [-] CORE : After adding cart rule redirect improvements
This allows us display success message after adding CartRule or create other actions
2013-12-11 21:00:36 +01:00
Jerome Nadaud
1d5cf86d19 [-] MO : Blocktopmenu - Fix missing categories and cms categories options 2013-12-11 19:26:12 +01:00
Kevin Granger
1284317326 // vip homepage ( markup + css ) 2013-12-11 19:05:01 +01:00
Kevin Granger
e2f60aa6f6 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 17:46:43 +01:00
Kevin Granger
569c75f111 // add upload and download process icons 2013-12-11 17:46:29 +01:00
sLorenzini
78c49c0da1 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 17:34:28 +01:00
sLorenzini
b66d47083e // update schema.org on product-list 2013-12-11 17:34:17 +01:00
Jerome Nadaud
fce4e79b4d [-] MO : BlockLayered - FixBug #PNM-1331 Categories now filtered by groups 2013-12-11 17:31:55 +01:00
Kevin Granger
bbf2899311 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 17:18:35 +01:00
Kevin Granger
e607abf2a6 // fix compilation for some scss (to be continued) 2013-12-11 17:18:20 +01:00
Kevin Granger
b93a9cb7a3 // fix typo in filename 2013-12-11 17:00:32 +01:00
gRoussac
debff833cd // missing mod 2013-12-11 16:58:38 +01:00
Kevin Granger
b9db5d5023 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 16:56:12 +01:00
Kevin Granger
36968d76b6 // header markup retake 2013-12-11 16:55:53 +01:00
gRoussac
3249a6bd99 // duplicate hooking on install 2013-12-11 16:31:37 +01:00
gRoussac
c574b04a63 [*] FO : Move header modules to new hook, last part 2/2 2013-12-11 16:22:33 +01:00
Jerome Nadaud
472742a42d // Small smarty escape fix 2013-12-11 16:22:06 +01:00
Jerome Nadaud
1056f295a3 [-] MO : BlockLayered - FixBug #PNM-468 Correct sprintf format 2013-12-11 15:08:01 +01:00
Jerome Nadaud
00253ab8b5 [-] MO : BlockLayered - FixBug #PNM-468 Wrong filter unit 2013-12-11 15:03:11 +01:00
Jerome Nadaud
a2340079c1 [-] BO : FixBug #PSCSX-84 Fix image mapping position 2013-12-11 12:58:08 +01:00
Jerome Nadaud
807183b1c5 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 12:34:12 +01:00
Jerome Nadaud
a918c468ec [-] BO : FixBug #PSCSX-122 Live module favorite 2013-12-11 12:33:33 +01:00
Kevin Granger
f8b7e02396 // shouldn’t change .container behavior 2013-12-11 12:25:28 +01:00
Kevin Granger
8f71f36be9 // css fixs 2013-12-11 12:18:18 +01:00
Jérôme Nadaud
0af76e01fb Merge pull request #1124 from PhpMadman/1.6-HistoryColorFix
[*] FO : Fixed issue with custom statues does not have any color, ...
2013-12-11 03:10:38 -08:00
PhpMadman
b40c642737 [*] FO : Fixed issue with custom statues does not have any color, and text was not visible 2013-12-11 11:56:13 +01:00
Jérôme Nadaud
850350c2a6 Merge pull request #1123 from PhpMadman/patch-2
Update CONTRIBUTING.md
2013-12-11 02:46:12 -08:00
Jerome Nadaud
347c0176a5 [-] CORE : FixBug #PSCSX-89 - Up configuration name size to 255 2013-12-11 11:44:34 +01:00
PhpMadman
260d31cae0 Update CONTRIBUTING.md 2013-12-11 11:27:40 +01:00
Jerome Nadaud
3792fab83a // Fix missing save button on list display 2013-12-11 11:00:50 +01:00
Jerome Nadaud
9badb78f5b [-] BO : FixBug #PSCSX-115 Friendly URL generated 2013-12-11 10:39:25 +01:00
Jerome Nadaud
551358f88b [-] BO : FixBug #PSCSX-116 Wrong friendly url hint description 2013-12-11 09:59:00 +01:00
Jerome Nadaud
fe8d9923f6 // Add new root category button to page header toolbar 2013-12-11 09:39:47 +01:00
Jerome Nadaud
63a04fd2dd // Fix remove filename from file input when logo removed 2013-12-11 09:39:01 +01:00
Jerome Nadaud
c869a63f35 // Fix missing Carrier wizard cancel button 2013-12-11 09:38:31 +01:00
Jérôme Nadaud
3389143d91 Merge pull request #1120 from aino/1.6
[-] BO : Set correct table alias name in updatePosition
2013-12-10 22:09:26 -08:00
Mikko Hellsing
addb65eb5f [-] BO : Set correct table alias name in updatePosition 2013-12-11 02:09:45 +01:00
gRoussac
1dcc5e288c [*] FO : Move header modules to new hook, first part 1/2 2013-12-10 20:52:22 +01:00
Kevin Granger
78df7f52f4 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 19:08:58 +01:00
Kevin Granger
7e7e2986b2 // start css refactor + optimisation 2013-12-10 19:08:42 +01:00
rGaillard
f34975f3fc Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 18:49:58 +01:00
rGaillard
85f1de2e8f // move RMA form on order-detail 2013-12-10 18:49:29 +01:00
Jerome Nadaud
e92d0bb0eb // Missing space 2013-12-10 17:38:09 +01:00
gRoussac
5977cb0fbc Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 17:17:02 +01:00
gRoussac
66f3e70d8b // Homefeatured js not used > bootstrap 2013-12-10 17:16:33 +01:00
Jerome Nadaud
05f3c259e0 [-] BO : FixBug #PSCSX-37 - Double upload in carrier wizard 2013-12-10 16:59:51 +01:00
sLorenzini
2cd22bbf98 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 16:37:50 +01:00
sLorenzini
c781d8ef2d // update tpl for w3c validator and code indent 2013-12-10 16:37:25 +01:00
Jerome Nadaud
46d230ed9c Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 16:19:06 +01:00
Jerome Nadaud
5e31511117 // BlockLayered hook template backward compatibility 2013-12-10 16:18:59 +01:00
gRoussac
c9409e8441 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 16:18:44 +01:00
Kevin Granger
ffc7c2f19d Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 15:28:30 +01:00
Kevin Granger
4a22abc2d1 // fix dual pagination id duplicate 2013-12-10 15:28:17 +01:00
Jerome Nadaud
98950b733a [-] MO : blockcms - Clean cache when "display on footer" parameter is updated 2013-12-10 15:16:08 +01:00
Kevin Granger
1d808f89b5 // fix functionnal-buttons 2013-12-10 15:06:51 +01:00
Kevin Granger
167a5c7921 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 14:25:18 +01:00
Kevin Granger
cfa606b12c // convert global to sass - 100% (can be compiled) 2013-12-10 14:25:06 +01:00
Jerome Nadaud
992dddcbb4 // Virtual Product bootsraping 2013-12-10 13:51:34 +01:00
Jerome Nadaud
d511828a91 // BlockLayered removing missing template var 2013-12-10 11:49:55 +01:00
gRoussac
a45e816e98 // ids instead of class on home tab toogle 2013-12-10 11:45:22 +01:00
rGaillard
70628845b7 [-] BO: call actionProductUpdate hook on status change 2013-12-10 11:41:02 +01:00
Kevin Granger
a94666c4fb // convert global to sass - WIP 75% 2013-12-10 10:40:14 +01:00
Jerome Nadaud
8929bb5f21 [-] BO : FixBug #PSCSX-86 Missing color selector 2013-12-10 10:30:46 +01:00
Jerome Nadaud
7816664911 [-] BO : FixBug #PSCSX-91 Wrong texture display in products attributes colors 2013-12-10 10:14:15 +01:00
Jerome Nadaud
4a013cf537 [-] BO : FixBug #PSCSX-100 wrong checkbox integration 2013-12-10 09:43:03 +01:00
Jerome Nadaud
5429fd67ff // Fix small warning in dashgoals 2013-12-10 09:32:13 +01:00
Jerome Nadaud
808347cb2f [-] MO : Newsletter - FixBug #PSCSX-113 - Missing id in field desc 2013-12-10 09:17:27 +01:00
Kevin Granger
6d669cb5f1 // global rewrited in sass - WIP 50% (won’t compile yet) 2013-12-09 19:16:27 +01:00
Jerome Nadaud
d4de6342b4 [-] MO : BlockLayered - Fix missing attribute anchor separator 2013-12-09 18:37:55 +01:00
Jerome Nadaud
fcf568b9ea // BlockLayered 1.5 backward compatibility 2013-12-09 18:21:31 +01:00
Jerome Nadaud
cf77deeba2 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-09 17:26:05 +01:00
Jerome Nadaud
ed92603472 // Small Fix in modules upload 2013-12-09 17:25:41 +01:00
Gregory Roussac
dc7bf76b24 Merge pull request #1114 from glafarge/patch-1
[-] FO : Fix versatile jQuery selector
2013-12-09 08:24:02 -08:00
Guillaume Lafarge
e7ef71f32e [-] FO : Fix versatile jQuery selector
`:hidden` selects form elements with `type="hidden"` but also : elements with `display:none`, elements with their width/height equal to zero and which the ancestor element is hidden.
`input[type=hidden]` is more appropriate for those reasons.
2013-12-09 17:17:48 +01:00
Kevin Granger
24cd0bbdb0 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-09 16:48:55 +01:00
Kevin Granger
79652b1704 // removed « add to compare» from the homepage 2013-12-09 16:48:37 +01:00
rGaillard
ee9239b404 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-09 16:40:00 +01:00
rGaillard
0e3545186d // change behavior of displaywarning on backoffice 2013-12-09 16:39:43 +01:00
Kevin Granger
8700f15c61 // closed an attribute left behind 2013-12-09 16:39:33 +01:00
Kevin Granger
91c3bf48b1 // w3C product 2013-12-09 14:26:17 +01:00
Gregory Roussac
27e8beb6a9 Merge pull request #1111 from Gamesh/patch-1
[*] FO: now you can download files >1G without running into max executio...
2013-12-09 05:17:14 -08:00
Gamesh
5c496f45a1 [*] FO: now you can download files >1G without running into max execution limitation
Added @ to suppress warning i safe mode.
2013-12-09 15:04:16 +02:00
Jerome Nadaud
b0c9e73e30 [+] BO : Add error control to modules uploading 2013-12-09 11:30:42 +01:00
Kevin Granger
ea450edc4c // more W3C 2013-12-09 10:15:53 +01:00
Rémi Gaillard
b2199a2f12 Merge pull request #1112 from djfm/1.6
// take force_compile setting into account in Back-Office
2013-12-09 01:04:20 -08:00
djfm
40edeff122 // take force_compile setting into account in Back-Office 2013-12-09 08:59:49 +00:00
Jerome Nadaud
e448ac8de5 // Blocklayered message small fix 2013-12-09 09:09:38 +01:00
Gamesh
9713d38078 [*] FO: now you can download files >1G without running into max execution limitation
when reading large files ( >1G ), you often get max execution timeout error, this fix will prevent this.
2013-12-09 08:53:11 +02:00
Gregory Roussac
1876d4834c Merge pull request #1109 from jeanbe/patch-1
[*] FO : Set zoom on stores
2013-12-08 08:52:30 -08:00
gRoussac
d4b39184a0 // AdminCarts order way DESC 2013-12-08 16:39:41 +01:00
jeanbe
f055e86cc7 Met automatiquement la carte sur l'ensemble des magasins
Met automatiquement la carte a l'ouverture sur l'ensemble des magasins plutot que sur un point fixe au US.
2013-12-07 17:47:45 +01:00
Kevin Granger
c46159ccce Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 19:09:48 +01:00
Kevin Granger
5fb2081054 // order-carrier preparation to be W3C validated! 2013-12-06 19:09:36 +01:00
rGaillard
ae98bcd86b // php warning 2013-12-06 18:40:44 +01:00
rGaillard
746c74dfac // id of root category could be different of 1 2013-12-06 18:34:50 +01:00
Jerome Nadaud
c5ff838fca // Blocklayered starting code refacto 2013-12-06 18:12:04 +01:00
Jerome Nadaud
a569ab7e33 // Fix tree shop missing attributes 2013-12-06 18:11:06 +01:00
rGaillard
adf158a0c3 // small fix 2013-12-06 17:31:09 +01:00
Kevin Granger
95d5e9d819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:25:23 +01:00
Kevin Granger
71ac20c819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Conflicts:
	themes/default-bootstrap/js/products-comparison.js
2013-12-06 17:24:00 +01:00
sLorenzini
cfee36f609 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:19:59 +01:00
sLorenzini
31c5f204b1 // update pages for w3c 2013-12-06 17:19:49 +01:00
Kevin Granger
db37e42b21 // checkout W3C valid - wip 2013-12-06 17:19:47 +01:00
Kevin Granger
ed5496479d // removed console.log() 2013-12-06 17:18:20 +01:00
gRoussac
03e0cb7515 // break line 2013-12-06 17:09:14 +01:00
gRoussac
b2204aac6e Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:06:46 +01:00
gRoussac
99fe216413 [*] FO : Move both sliders module on new hook 2013-12-06 17:05:39 +01:00
Jérôme Nadaud
aecbc18779 Merge pull request #1107 from djfm/import
// fixed bug with ordering of JS files in AdminImport
2013-12-06 07:54:27 -08:00
djfm
6419f6a7ad // fixed bug with ordering of JS files in AdminImport 2013-12-06 15:47:29 +00:00
sLorenzini
97937a8aa1 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 15:57:50 +01:00
sLorenzini
ff08c1311b // update my account page for w3c 2013-12-06 15:57:38 +01:00
gRoussac
74b16defa8 // themeconfigurator install failed 2013-12-06 15:53:33 +01:00
Kevin Granger
9f106d06ef // valid W3C checkout - WIP 2013-12-06 15:43:12 +01:00
rGaillard
0d374e5501 // new hook 2013-12-06 14:54:45 +01:00
gRoussac
0af0601cc7 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 12:18:59 +01:00
gRoussac
33e9c2c132 [-] FO : Remove bad links on home tabs 2013-12-06 12:12:54 +01:00
Kevin Granger
d4f73213cb // checkout - shopping cart W3C valid 2013-12-06 12:12:21 +01:00
gRoussac
da3ca98dfd // remove default theme 2013-12-06 12:00:34 +01:00
gRoussac
946d5520f8 // nomrs 2013-12-06 11:42:28 +01:00
Vincent Augagneur
669a49be59 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 10:17:12 +01:00
Vincent Augagneur
c2e0edcc7a [-] BO : carrier wizard no fees display 2013-12-06 10:17:07 +01:00
rGaillard
5e18a94d2a // employee avatar on the logs listing 2013-12-05 19:16:43 +01:00
Kevin Granger
0067eff263 // working on W3C validation 2013-12-05 18:50:50 +01:00
Jerome Nadaud
ddcade285f [-] CORE : Ensure correct parent category for home categories 2013-12-05 18:37:49 +01:00
sLorenzini
df2e2280ea Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-05 17:59:25 +01:00
sLorenzini
1f1b3974cf // update itemprop on product page + w3c bug on address.tpl 2013-12-05 17:59:13 +01:00
rGaillard
d50999fde0 [-] Core: Fix #PSCFV-11165 numerical configuration values should not be overridden if the value is the same between shop and global context 2013-12-05 17:17:35 +01:00
gRoussac
3975599023 [- ] CORE : Fix bug #PSCFV-10627, bad default shoip currency && Shop::getEntityIds returning deleted currency 2013-12-05 16:47:05 +01:00
Kevin Granger
9dd82367f3 // Product compare almost W3C valid -> #availability_value must be change with a class 2013-12-05 16:27:10 +01:00
rGaillard
f128dac9c4 // small fix 2013-12-05 15:59:14 +01:00
Kevin Granger
02b6e24ca4 // category page almost W3C valid 2013-12-05 15:27:40 +01:00
Kevin Granger
c0e8794947 // make product.tpl human readable ;) 2013-12-05 14:42:22 +01:00
Gregory Roussac
0261096f4d Merge pull request #1105 from PhpMadman/1.6-CSVAvancedFixes
[-] BO : Fixes for Advanced Stock Management Import
2013-12-05 04:28:31 -08:00
PhpMadman
9df713e6ec [-] BO : Fixes for Advanced Stock Management Import
[*] BO : Combinations import supports Advanced Stock Management
[*] BO : Advanced Stock Management import now supports stock increase
[*] BO : Advanced Stock Management stock unit price uses wholesale_price (Product Cost) or 0.00001 if not set
[*] BO : Added Advanced Stock Management to csv import docs
2013-12-05 12:30:17 +01:00
gRoussac
185d02b290 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-05 11:27:20 +01:00
gRoussac
3889f6d61f // follow up 7140a63272 (commitcomment-4775950) 2013-12-05 11:27:07 +01:00
rGaillard
e52652f96f Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-05 11:26:39 +01:00
rGaillard
acd0bbc366 // php warning 2013-12-05 11:26:26 +01:00
Jerome Nadaud
9850eeb3e5 // Fix category delete cancel button 2013-12-05 11:00:58 +01:00
Jérôme Nadaud
a82919b023 Merge pull request #1100 from djfm/1.6
// more descriptive labels in dashactivity
2013-12-05 01:47:05 -08:00
Kevin Granger
5e9db96f61 // home is valid W3C! 2013-12-05 10:38:59 +01:00
Vincent Augagneur
7117a6f4fd [-] BO : fixed bug #PSCSX-76 - carrier wizard fees not display after reload carrier 2013-12-05 10:35:51 +01:00
Kevin Granger
04d2ff59ee // fix product list + facebook block HTML5 version WIP 2013-12-04 19:31:02 +01:00
gRoussac
ec8ca92e67 // norms 2013-12-04 18:49:34 +01:00
gRoussac
7140a63272 Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced 2013-12-04 18:39:33 +01:00
Vincent Augagneur
36a70d83d5 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 18:31:19 +01:00
Vincent Augagneur
b1304f0379 //carrier wizard range table auto size 2013-12-04 18:27:08 +01:00
gRoussac
72be705759 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 17:53:01 +01:00
Gregory Roussac
d81426bab2 Merge pull request #1102 from glafarge/patch-1
[-] FO : Fix newline trim
2013-12-04 08:52:02 -08:00
Gregory Roussac
8f34b61eec Merge pull request #1101 from kpodemski/patch-1
[*] CORE: original search_query assign to .tpl
2013-12-04 08:48:23 -08:00
Guillaume Lafarge
39ded96964 Fix newline trim
When using with <br /> format it now allows for 'b' and 'r' chars at the end of last line.
I think rtrim is not suitable when used with a word rather than a charlist.
2013-12-04 17:42:32 +01:00
gRoussac
96fd3f3d32 [+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570 2013-12-04 17:41:10 +01:00
sLorenzini
d1959f87d4 // fixed bug url "add to cart" in product-list 2013-12-04 17:35:16 +01:00
sLorenzini
2db8c21376 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 17:29:46 +01:00
sLorenzini
4285882949 // update indent code 2013-12-04 17:29:35 +01:00
Krystian Podemski
665c5d155d [*] CORE: original search_query assign to .tpl
Avoid problems with special characters for eg. in polish language like ąźćłó etc.
2013-12-04 17:24:30 +01:00
djfm
e90dafe7b1 // more descriptive labels in dashactivity 2013-12-04 16:18:22 +00:00
Damien Metzger
ab71b813be [-] BO : fixed top right link with the "open in a new tab" button 2013-12-04 17:00:59 +01:00
sLorenzini
e702aca520 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 16:59:14 +01:00
sLorenzini
ad1c7b3962 // update product-list itemproperty 2013-12-04 16:59:00 +01:00
Kevin Granger
33b5327b4d // data-id-product instead of using rel tag 2013-12-04 16:58:34 +01:00
Gregory Roussac
08cb7ee566 Merge pull request #1099 from djfm/blocktopmenu
// fixed undefined variable in blocktopmenu
2013-12-04 07:11:51 -08:00
Damien Metzger
fa804b9bf8 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 16:06:55 +01:00
Damien Metzger
2f088c4ac3 [*] BO : changed dashgoals system 2013-12-04 16:06:42 +01:00
djfm
a8e6dfe7f5 // fixed undefined variable in blocktopmenu 2013-12-04 15:03:04 +00:00
Kevin Granger
b450a9fa80 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Conflicts:
	themes/default-bootstrap/products-comparison.tpl
2013-12-04 15:48:16 +01:00
Kevin Granger
ad6ed3dcf1 // data-id-product instead of using rel tag 2013-12-04 15:46:42 +01:00
Rémi Gaillard
79198487ac Merge pull request #1098 from djfm/1.6
// typo in default theme blockcart.tpl
2013-12-04 06:19:39 -08:00
sLorenzini
32237777e3 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 15:18:13 +01:00
sLorenzini
c127f9765a // update code on footer and header 2013-12-04 15:17:35 +01:00
djfm
cb9dd448e1 // another typo in default theme blockcart.tpl 2013-12-04 14:14:01 +00:00
djfm
73e3e447f6 // typo in default theme blockcart.tpl 2013-12-04 14:12:16 +00:00
rGaillard
90f5560cb3 // add new hook on product comparator 2013-12-04 14:43:09 +01:00
Rémi Gaillard
a7f20fd986 Merge pull request #1097 from TMMeilleur/1.6
// added social's buttons on product's comparisions page
2013-12-04 05:34:09 -08:00
TMMeilleur
4ba424a72f adedd social's buttons on products compare page 2013-12-04 14:12:36 +02:00
gRoussac
f6fed64472 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636 2013-12-04 12:14:51 +01:00
rGaillard
be91ec02f2 // fix modules filter after category change 2013-12-04 12:03:12 +01:00
gRoussac
e505588688 [-] IN : Merge of https://github.com/PrestaShop/PrestaShop/pull/1095 2013-12-04 11:47:14 +01:00
Kevin Granger
68edf085d4 // fix «enter» on retrieve password panel 2013-12-04 11:29:21 +01:00
Kevin Granger
97dabf5b74 // upadate banner 2013-12-04 10:00:40 +01:00
Rémi Gaillard
360d68c5f7 Merge pull request #1091 from TMMeilleur/1.6
// small fixes
2013-12-04 00:45:33 -08:00
TMMeilleur
689fcb005d small fixes 2013-12-04 10:08:35 +02:00
Jérôme Nadaud
f274103b0e Merge pull request #1086 from rhyslk/1.6
[*] LO : Corrected units for weight/volume/distance
2013-12-03 22:25:17 -08:00
Gregory Roussac
9eea7203fe Merge pull request #1084 from PhpMadman/1.6-ShipMaxInput
[*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length
2013-12-03 11:43:32 -08:00
Rhys
6640e47781 [*] LO : Corrected units for weight/volume/distance
UK uses Metric for weight, volume and short distances but uses Imperial  for long distances (i.e. Miles). Yes, it's a silly system here in the UK!
// I will add counties (states) with correct ISO codes when I get chance.
2013-12-03 19:12:27 +00:00
PhpMadman
8949382e00 [-] BO : Better maxlength on shippinh input fields 2013-12-03 19:38:28 +01:00
gRoussac
81481d6105 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48 2013-12-03 19:24:31 +01:00
Jérôme Nadaud
03239a32ea Merge pull request #1082 from xBorderie/patch-1
Added an "About this repository" section.
2013-12-03 09:50:32 -08:00
Xavier
3115008443 Added an "About this repository" section. 2013-12-03 18:49:14 +01:00
Damien Metzger
b657115552 // Fixed bad entities in KPI 2013-12-03 18:12:02 +01:00
Kevin Granger
5a5c754dab // clean css 2013-12-03 17:43:49 +01:00
Kevin Granger
3f2ce54efd // gamification + multishop wip 2013-12-03 15:21:13 +01:00
Lucas CERDAN
da2d48890f Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl
[*] BO : Option to always rewrite friendly url of product
2013-12-03 06:15:28 -08:00
Gregory Roussac
22c09ac367 Merge pull request #1073 from studiokiwik/sk-ps15x-012
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 05:51:27 -08:00
Mikael Blotin
d81e81e4f3 [-] BO : Fix timeout handling on product images regeneration 2013-12-03 14:42:14 +01:00
Vincent Augagneur
98d02d94b9 [-] BO : carrier wizard range tab now overflow scroll 2013-12-03 14:15:24 +01:00
Vincent Augagneur
a9f2bd053a [-] BO : carrier wizard fixed when select zone and set no shipping fees 2013-12-03 11:45:43 +01:00
Damien Metzger
de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) 2013-12-03 11:44:51 +01:00
rGaillard
8a72e4d810 // small fix 2013-12-03 11:18:58 +01:00
PhpMadman
0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product 2013-12-03 10:57:25 +01:00
Vincent Augagneur
0a2ba0015b [-] BO : carrier wizard, remove fees when desabled zone 2013-12-03 10:34:53 +01:00
rGaillard
08ef0667ca Revert "// update some css&tpl bugs"
This reverts commit 01d5087067.
2013-12-02 19:25:21 +01:00
Damien Metzger
2931ebeeae [-] FO : fixed product comparator when there are no products anymore 2013-12-02 19:21:54 +01:00
Damien Metzger
e8088892b5 [-] FO : Added condition to display the phone number only if it is set up in the admin 2013-12-02 19:12:49 +01:00
Jerome Nadaud
8bf49049eb // Prevent click event in tree toolbar buttons 2013-12-02 19:07:28 +01:00
Damien Metzger
2316bb50ba // Fixed import button in AdminImport 2013-12-02 18:53:51 +01:00
Jerome Nadaud
804fe56ba0 // Change order button language 2013-12-02 18:20:42 +01:00
Jerome Nadaud
6edf14ed71 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 18:20:03 +01:00
rGaillard
102b99eb1c // small fix 2013-12-02 18:15:37 +01:00
Damien Metzger
703d790910 // Changed hook in update 2013-12-02 17:40:01 +01:00
sLorenzini
01d5087067 // update some css&tpl bugs 2013-12-02 16:40:43 +01:00
Kevin Granger
a88b2b6ab5 // fix footer actions 2013-12-02 16:27:24 +01:00
rGaillard
9078290c01 // small fix 2013-12-02 16:18:59 +01:00
rGaillard
78a6821b2f // handle img extensions in the end of query string in the dispatcher 2013-12-02 16:14:27 +01:00
Jerome Nadaud
970449148c // Add footer toolbar to products panel 2013-12-02 16:08:44 +01:00
gRoussac
aea8f0285e [-] FO : Fix bug #PSCFV-11190 double escaping on customization 2013-12-02 15:51:29 +01:00
Rémi Gaillard
6d473d5374 Merge pull request #1071 from TMMeilleur/bootstrap
//updated jqzoom and products compare page is responsive now
2013-12-02 06:49:24 -08:00
TMMeilleur
f99140113b updated jqzoom and products compare page is responsive now 2013-12-02 16:41:13 +02:00
Damien Metzger
c8ca67eef5 // Fixed upgrade to 1.6.0.1 2013-12-02 15:28:02 +01:00
Kevin Granger
0d7a48095c // tweak product tabs 2013-12-02 15:27:21 +01:00
Jerome Nadaud
0448ee697f // Merging PR 1070 from DevNet 2013-12-02 15:23:29 +01:00
rGaillard
3cfafbfe10 // typo 2013-12-02 15:20:12 +01:00
rGaillard
89329dc865 // small fix 2013-12-02 15:15:17 +01:00
Kevin Granger
bf3c27e864 // fix dropdown menu 2013-12-02 14:13:41 +01:00
Kevin Granger
2ef8333e6a // tweak import 2013-12-02 14:12:02 +01:00
Kevin Granger
79b1b07cce // tweak on login form : it’s a trap! 2013-12-02 11:35:21 +01:00
Kevin Granger
909983bcbf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 11:11:29 +01:00
Kevin Granger
bca9048a6b // fix filter by category 2013-12-02 11:11:16 +01:00
Jérôme Nadaud
2bdca4668e Merge pull request #1063 from Shoprunners/patch-1
MO:blocklayered
2013-12-02 02:06:03 -08:00
Jerome Nadaud
5381e6007f // fix Tab selection in modules favorites view 2013-12-02 10:47:15 +01:00
Jerome Nadaud
c83761b420 // Module configuration bar fix 2013-12-02 10:25:18 +01:00
PhpMadman
6ef0910bfb [*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length 2013-12-02 10:17:26 +01:00
Damien Metzger
62a7a6a94f [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 2013-12-02 10:06:44 +01:00
Francois Gaillard
3386ad6517 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 09:26:24 +01:00
Francois Gaillard
34d56ead85 [-] Controller : ParentOrderController - Missing parenthesis 2013-12-02 09:26:04 +01:00
Damien Metzger
6230c6249e [-] FO : fixed potential error when you delete a best seller #PSCFV-11167 2013-12-02 09:25:41 +01:00
Jerome Nadaud
d887dfc2f1 // Update cart rules fancybox 2013-12-02 09:13:20 +01:00
Jérôme Nadaud
cd2246a9c3 Merge pull request #1068 from Dh42/bootstrap
[*] MO : blockcontact added title tag to link
2013-12-01 23:58:38 -08:00
Jérôme Nadaud
6fcafbe4f2 Merge pull request #1067 from PrestaEdit/patch-61
//use Tools methods instead of $_GET/$_POST
2013-12-01 22:06:30 -08:00
lesley paone
f22fd92a95 [*] MO : blockviewed added title tag to image 2013-12-01 23:22:01 -06:00
lesley paone
8de9a0ecda [*] MO: blockcontact Adds title tag on link 2013-12-01 21:43:40 -06:00
PrestaEdit
06b68e3757 //use Tools methods instead of $_GET/$_POST 2013-12-01 23:39:27 +01:00
lesley paone
c813cc5176 [*] MO : Blockrss added title tag to links 2013-11-30 20:03:29 -06:00
Peter Schaeffer
7ea1d73d67 MO:blocklayered
Added an extra typecheck to fix a bug http://forge.prestashop.com/browse/PNM-1573
2013-11-30 19:54:42 +01:00
Damien Metzger
7cd38d4461 // Changed base64 to urlencode in import (and fixed filename issue) 2013-11-29 19:24:04 +01:00
Jerome Nadaud
8decc89750 // Fix color form item 2013-11-29 18:39:26 +01:00
Jerome Nadaud
53b327ec46 // small fix 2013-11-29 18:32:05 +01:00
gRoussac
f39b621251 [-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier 2013-11-29 18:29:50 +01:00
Damien Metzger
782975c708 [-] BO : better error display for forgotten password #PSCSX-58 2013-11-29 18:18:55 +01:00
rGaillard
0b147f626f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 18:18:29 +01:00
rGaillard
e0fd879037 [-] BO: Add some useful hooks to modify the listings/options/forms 2013-11-29 18:18:17 +01:00
Jerome Nadaud
0a2a36f49b // Add text-success class to upload button 2013-11-29 18:15:55 +01:00
Jerome Nadaud
8dae23891a // Remove add category on edit 2013-11-29 18:08:01 +01:00
Jerome Nadaud
fbf2c26093 // Fix when file is missing 2013-11-29 18:07:50 +01:00
Jerome Nadaud
a597881da7 // Fix simple uploader view 2013-11-29 18:07:27 +01:00
gRoussac
3871ea32a4 // missing parenthesis 2013-11-29 17:48:52 +01:00
Jerome Nadaud
f8a94b1be9 // Catalog price rules bootstraping 2013-11-29 17:31:28 +01:00
Kevin Granger
c8f130670f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 17:19:04 +01:00
Kevin Granger
6a84f586af // add compass config.rb for theme default-bootstrap 2013-11-29 17:18:50 +01:00
Damien Metzger
4c2190ddc5 [-] Core : integrated modified pull request 40abb0aa72 2013-11-29 17:18:18 +01:00
Jerome Nadaud
b432fd5641 // Bootstraping cart rules 2013-11-29 17:13:09 +01:00
Damien Metzger
e0b28dd57b // AdminOutstanding is now bootstraped 2013-11-29 17:10:22 +01:00
gRoussac
68ed6fac82 [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582 2013-11-29 17:06:59 +01:00
Jerome Nadaud
cbc79c6cf2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 16:54:47 +01:00
Jerome Nadaud
6da40e7159 // fix new tax rule button 2013-11-29 16:54:33 +01:00
Damien Metzger
90e1a39025 // Rollback previous pull request merge (with a truncate) 2013-11-29 16:49:28 +01:00
rGaillard
8ee61f8709 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 16:40:14 +01:00
rGaillard
8ba251c996 // small clean 2013-11-29 16:40:00 +01:00
Damien Metzger
af3f7be5ac Merge pull request #1058 from Dh42/patch-20
[*] MO: blockbanner added title and alt tag to image
2013-11-29 07:36:34 -08:00
Damien Metzger
b23acae33e Merge pull request #1057 from Dh42/patch-19
// Blockcategories changed title to use name
2013-11-29 07:36:07 -08:00
Rémi Gaillard
6a5cebaff4 Merge pull request #1061 from TMMeilleur/bootstrap
// fixes 29.11.2013
2013-11-29 07:19:48 -08:00
TMMeilleur
b122291080 fixes 29.11.2013 2013-11-29 17:13:27 +02:00
Jerome Nadaud
8ad3166226 // Add save button to Localization tax rules 2013-11-29 15:30:57 +01:00
Jerome Nadaud
4c2500fb35 // Remove unnecessary code 2013-11-29 14:35:06 +01:00
Damien Metzger
9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools 2013-11-29 14:21:22 +01:00
rGaillard
5c3f43141b // small fix 2013-11-29 14:20:06 +01:00
Jerome Nadaud
badfef481c // Small fix 2013-11-29 12:20:10 +01:00
Jerome Nadaud
e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
Kevin Granger
85f445b7cc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 11:53:52 +01:00
Kevin Granger
cc80e82431 // import (todo: add the link delete/view on items loaded with js) 2013-11-29 11:53:43 +01:00
Dh42
77e02f054f [*]MO: blockbanner added title and alt tag to image 2013-11-28 22:39:25 -06:00
Dh42
9cf3fa2e8a [*]MO: Blockcategories changed title to use name
Changed the title tag to use the name of the link not the description. Using the description will get sites with a lot of content keyword stuffing penalties. See screenshot http://screencast.com/t/SXY93Ax7Sm
2013-11-28 22:17:40 -06:00
Gregory Roussac
7fa882efca Merge pull request #1056 from Dh42/patch-18
[*] MO : Blocktopmenu add titles to links
2013-11-28 10:26:36 -08:00
Kevin Granger
1d2f6c9b9d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-28 19:22:03 +01:00
Kevin Granger
0f74646524 // import 2013-11-28 19:21:55 +01:00
Dh42
fae538c4e4 [MO]Blocktopmenu
Adds title tags to links created by module
2013-11-28 12:10:12 -06:00
Jerome Nadaud
9e6868ba97 // Change product attachment upload system 2013-11-28 19:09:24 +01:00
gRoussac
dbd1d17b93 // typo sorry 2013-11-28 18:39:52 +01:00
gRoussac
c254fd6366 // added addons module 2013-11-28 18:33:18 +01:00
Gregory Roussac
0b653fd20a Merge pull request #1055 from Dh42/patch-17
[-] FO : Prevents crawlers from creating carts
2013-11-28 08:55:52 -08:00
Gregory Roussac
f8fc02ac4b Merge pull request #1054 from Dh42/patch-16
[-] FO : nofollow on TOS
2013-11-28 08:54:22 -08:00
Dh42
5591f5c399 Prevents crawlers from creating carts
Is valid method of using multiple values, http://www.w3.org/TR/html401/struct/links.html#adef-rel
2013-11-28 10:46:33 -06:00
Dh42
b6023cc9f7 Needs to be a non followed url
Is an ajax type link, needs to be no followed for duplicate content reasons.
2013-11-28 10:39:29 -06:00
Vincent Augagneur
66947b5354 //multiple small fix on carrier wizard 2013-11-28 17:38:05 +01:00
gRoussac
d46feffcf1 [*] CORE : Throw Exception when no theme selected only in front office 2013-11-28 16:14:30 +01:00
Jerome Nadaud
7261490381 // Fix Categories image problem 2013-11-28 15:35:17 +01:00
gRoussac
336e784ca5 [*] CORE : Throw Exception when no theme selected 2013-11-28 15:32:19 +01:00
Damien Metzger
e722a5c817 // Dashgoals tooltip improved 2013-11-28 15:03:41 +01:00
Jerome Nadaud
b66f8ea75a // Allow list disabled categories 2013-11-28 14:49:41 +01:00
Damien Metzger
a0a3e95e1c // Remove stacked option to dashgoals 2013-11-28 14:43:04 +01:00
Kevin Granger
18059a24a3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-28 14:35:41 +01:00
Damien Metzger
51bd377a67 // Dashgoals improvements 2013-11-28 14:29:40 +01:00
Damien Metzger
35fc864e0b // Fixed potential warning 2013-11-28 14:29:40 +01:00
Kevin Granger
8848ff08d8 // test git
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	controllers/admin/AdminImportController.php
2013-11-28 14:29:34 +01:00
gRoussac
cb9d00352f [-] BO : Adminimport reset selected csv if not exists 2013-11-28 14:19:23 +01:00
Jérôme Nadaud
8f5bac0e90 Merge pull request #1042 from Dh42/patch-14
Adds currency to rich snippets
2013-11-28 03:30:03 -08:00
Kevin Granger
6729d97534 // import WIP 2013-11-28 12:22:39 +01:00
gRoussac
8e71c90b4a [*] BO : AdminImport, check choosen csv exists 2013-11-28 12:12:08 +01:00
gRoussac
88d46bd0b9 [*] BO : AdminImport, check choosen scv exists 2013-11-28 12:00:41 +01:00
Jerome Nadaud
37afb369c3 // Fix already defined Core class 2013-11-28 11:46:32 +01:00
Jerome Nadaud
9b241d5e1d // Add interface restriction in Autoload 2013-11-28 11:46:03 +01:00
Vincent Augagneur
dde8540a86 //carrier wizard logo location fixed 2013-11-28 11:27:34 +01:00
gRoussac
8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
Vincent Augagneur
ddf00b3e98 //small fix #PSCSX-50 2013-11-28 11:06:46 +01:00
Vincent Augagneur
484501169a //added move up/down on selected item on blocktopmenu 2013-11-28 10:52:17 +01:00
Vincent Augagneur
56afe10128 //added gapi logo in dashactivity 2013-11-28 10:18:54 +01:00
Jerome Nadaud
510b71054a // Add Drag and Drop to uploader helper 2013-11-28 09:55:22 +01:00
gRoussac
82022c337a [-] FO : CCC do not withdraw \t+ and \s+ 2013-11-27 19:49:07 +01:00
Kevin Granger
cc3a1379d1 // Import WIP (still broken for first upload) 2013-11-27 19:33:36 +01:00
gRoussac
65106c6a24 [*] MO : Merge of https://github.com/PrestaShop/PrestaShop/pull/721 2013-11-27 19:21:57 +01:00
Jerome Nadaud
76f115ac22 // Small Fix in Import controller 2013-11-27 18:12:45 +01:00
Jerome Nadaud
17294618e1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 17:57:31 +01:00
Jerome Nadaud
724d52e019 // Adding timestamp filename to csv import 2013-11-27 17:57:19 +01:00
Damien Metzger
8dc4eb5c03 [-] BO : Category code cleaning, fixing, moving and multistore-ing 2013-11-27 17:40:35 +01:00
Damien Metzger
8c4e2a9a93 // Removed useless lines 2013-11-27 17:40:35 +01:00
rGaillard
621ad532d7 // typo 2013-11-27 17:00:13 +01:00
Jerome Nadaud
b58e8b6bb7 // One step csv uploader 2013-11-27 16:35:58 +01:00
gRoussac
5e718394e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 16:27:04 +01:00
gRoussac
068b7100c4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 again 2013-11-27 16:26:22 +01:00
Francois Gaillard
0eeb353742 // Natives modules moved 2013-11-27 16:23:48 +01:00
gRoussac
2b210e0732 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 2013-11-27 16:20:20 +01:00
Jerome Nadaud
cc8f4696b1 // Small Fix in product image upload 2013-11-27 15:56:15 +01:00
gRoussac
dd99d13dc4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766 2013-11-27 15:42:11 +01:00
Kevin Granger
8f51fee67a // load jquery-timeago.js 2013-11-27 15:15:30 +01:00
Kevin Granger
6d9f71a8db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 14:39:41 +01:00
Kevin Granger
e1ae484c10 // add jquery.timeago.js + jquery. validatio,.js 2013-11-27 14:39:09 +01:00
Kevin Granger
66f8b55fc2 // import WIP (broken for now) 2013-11-27 14:35:47 +01:00
Rémi Gaillard
9bc020ce9e Merge pull request #1051 from TMMeilleur/bootstrap
// fixes 27.11.2013
2013-11-27 05:13:46 -08:00
TMMeilleur
44549d650f fixes 27.11.2013 2013-11-27 14:02:26 +02:00
gRoussac
ef6dd3bfed [-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller 2013-11-27 12:32:01 +01:00
Kevin Granger
dd36a9e8b7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 11:35:41 +01:00
gRoussac
6959e71bec [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/729 2013-11-27 00:09:41 +01:00
gRoussac
10dac5a45b [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816 2013-11-27 00:06:44 +01:00
gRoussac
5f5b9bd1de [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/718 2013-11-26 23:43:49 +01:00
gRoussac
5d511c1ac7 // remove notice in ModuleGraph.php 2013-11-26 23:39:28 +01:00
gRoussac
ef466ac47c [+] CORE : Merg of https://github.com/PrestaShop/PrestaShop/pull/775 2013-11-26 23:33:24 +01:00
gRoussac
1855ffa584 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/813 2013-11-26 23:18:00 +01:00
gRoussac
8d15f5d3e6 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/814 2013-11-26 23:08:03 +01:00
gRoussac
5485433df6 [-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819 2013-11-26 22:57:57 +01:00
gRoussac
9ccd4504f4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/820 + 5e407db21e 2013-11-26 22:49:10 +01:00
gRoussac
b8012952f7 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852 2013-11-26 22:32:57 +01:00
gRoussac
4c92e8f4c5 [*] PDF : Merge of https://github.com/PrestaShop/PrestaShop/pull/873 2013-11-26 19:06:50 +01:00
Kevin Granger
37d4d4bd5f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 19:03:27 +01:00
Kevin Granger
32af46e42c // Import WIP 2013-11-26 19:03:15 +01:00
gRoussac
13b5762367 [-] FO : trailing \t in minified html 2013-11-26 18:41:02 +01:00
gRoussac
c5b6ec5c3c [+] FO : Missing old default templates 2013-11-26 18:09:05 +01:00
rGaillard
58eb63e99e // small fix 2013-11-26 17:02:13 +01:00
gRoussac
7f304fc768 [-] FO : Merge of d3bf4d2330 2013-11-26 16:26:35 +01:00
Rémi Gaillard
a71bfa8d4e Merge pull request #1046 from PhpMadman/patch-1
// "show all messages" link linked to tab instead of controller
2013-11-26 07:10:28 -08:00
PhpMadman
0a5216e35b show all messages link linked to tab 2013-11-26 15:56:21 +01:00
Jerome Nadaud
dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
gRoussac
69c99f49c9 [-] BO : Merge of b7b79ff461 2013-11-26 15:27:59 +01:00
Gregory Roussac
841f6ec65d Merge pull request #1011 from indesign47/patch-10
[+] BO : AdminSearchConf add import alias
2013-11-26 02:35:30 -08:00
Gregory Roussac
5153b49eae Merge pull request #1013 from indesign47/patch-12
[-] FO : Contact-form add translation for fields
2013-11-26 02:35:07 -08:00
Gregory Roussac
24dc07ef85 Merge pull request #1022 from indesign47/patch-18
[-] BO : AdminImport add image manufacturers
2013-11-26 02:34:31 -08:00
Gregory Roussac
b6a41fca69 Merge pull request #1015 from indesign47/patch-14
[-] BO : AdminImages manufacturers/suppliers/stores image
2013-11-26 02:34:25 -08:00
gRoussac
6de541ea1d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 11:27:41 +01:00
gRoussac
53b91fc0b7 attribute_anchor_separator 2013-11-26 11:27:25 +01:00
Vincent Augagneur
33b7c554f7 //small fix #PSCSX-39 2013-11-26 10:59:03 +01:00
Kevin Granger
926286eaf9 // fix switch 2013-11-26 10:33:35 +01:00
Damien Metzger
9ad56871de Merge pull request #1004 from djfm/bootstrap
// when adding a translation pack, do not install translations for modules that are not on the disk
2013-11-26 01:31:24 -08:00
Vincent Augagneur
e3f3f8a58f //oups 2013-11-26 10:25:03 +01:00
Vincent Augagneur
690b6b160a //small js fix 2013-11-26 10:24:19 +01:00
Dh42
3c1f2f045c Adds currency to rich snippets
The offer will not be displayed without the iso currency. There will be collisions in currencies such as AUD CAD and USD, without the sign.
2013-11-26 01:37:55 -06:00
gRoussac
8a7d39d800 [-] BO : Undefined on image upload, revert of 48b7a49b1a 2013-11-25 22:58:22 +01:00
Jerome Nadaud
47b7bf5458 // Adding some style to tinymce 2013-11-25 19:05:58 +01:00
gRoussac
695aaa73fb [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/696 2013-11-25 19:03:15 +01:00
Jerome Nadaud
5eae3acee3 // Add new value button at attribute controller start 2013-11-25 18:29:06 +01:00
Jerome Nadaud
0d6bc850de // Update datepicker button with period buttons select 2013-11-25 18:24:06 +01:00
Jerome Nadaud
a81ee41374 // Fix missing saving button in products 2013-11-25 18:01:01 +01:00
Kevin Granger
d9e53486a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:56:11 +01:00
Kevin Granger
4c8c48f441 // admin import 2013-11-25 17:55:59 +01:00
gRoussac
9e7a275d8d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:39:59 +01:00
gRoussac
a0373eed7a [-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date 2013-11-25 17:39:46 +01:00
Jerome Nadaud
48be09d82d // Missing Base uri in uploader helper 2013-11-25 17:37:26 +01:00
Kevin Granger
0e3504f3b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:17:15 +01:00
Kevin Granger
fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Jerome Nadaud
2b0224efe1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:09:20 +01:00
Jerome Nadaud
89f794ae5e // Missing Typo 2013-11-25 17:09:08 +01:00
Damien Metzger
553568a72d // Change message for permissions in the installer 2013-11-25 17:06:25 +01:00
Jerome Nadaud
12c89c1e2d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 16:45:40 +01:00
Jerome Nadaud
a98002083f // Now you can click on folder icon to expand or collapse 2013-11-25 16:45:26 +01:00
rGaillard
375981378f // typo 2013-11-25 16:44:08 +01:00
Damien Metzger
acdb7b0c13 // Fixed invisible chars in CSV examples 2013-11-25 16:13:46 +01:00
Jerome Nadaud
0061801bed Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 16:05:31 +01:00
Jerome Nadaud
b2cee0426a // Default category was not selected 2013-11-25 16:05:18 +01:00
gRoussac
620441997c [-] CORE : No Exception when CONTENT_LENGTH is no set 2013-11-25 16:05:07 +01:00
Jerome Nadaud
d30e376354 // Remove "no name" error on new product 2013-11-25 14:42:21 +01:00
Damien Metzger
93cbad2a05 [*] BO : replaced age by total spent in the customer list 2013-11-25 14:30:04 +01:00
Jérôme Nadaud
00e5bfe26e // Updating current branch 2013-11-25 14:22:59 +01:00
ccauw
eb312455e5 [-] BO : Double separator in function createTemplate()
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
2013-11-25 14:19:21 +01:00
Jérôme Nadaud
77f691b6ee Merge pull request #1028 from wfpaisa/patch-5
[-] FO, Bug fix, css and js files contain a double /
2013-11-25 04:32:19 -08:00
Felipe Uribe
b2e685e126 [-] FO, Bug fix double/
files containing a double /, example:
{$css_dir}/b... = cssdir//bootstrap_lib/bootstrap.css
to
{$css_dir}b... = = cssdir/bootstrap_lib/bootstrap.css
2013-11-25 07:19:37 -05:00
Damien Metzger
b8c77d90b4 [*] BO : Added countries to order list (idea from PhpMadman https://github.com/PrestaShop/PrestaShop/pull/909) 2013-11-25 12:17:40 +01:00
Francois Gaillard
f68c31e989 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 12:13:10 +01:00
Francois Gaillard
90d3dff381 [-] MO : Bug fix - Blockwishlist, Product image link in BO 2013-11-25 12:12:57 +01:00
Jerome Nadaud
611cfd90a0 [-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category 2013-11-25 12:08:34 +01:00
Gregory Roussac
c613ca5a7d Merge pull request #1009 from indesign47/patch-6
[+] BO : AdminProducts add import products
2013-11-25 03:00:08 -08:00
gRoussac
c5184a6e0f [-] BO : AdminImport new supplier csv 2013-11-25 11:55:14 +01:00
Gregory Roussac
b0436adb46 Merge pull request #1023 from indesign47/patch-19
[-] BO : AdminImport add image suppliers
2013-11-25 02:45:01 -08:00
Damien Metzger
dec1555b32 // Fixed dashboard simulation mode switch 2013-11-25 11:30:30 +01:00
Jerome Nadaud
5afde2163b [+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb 2013-11-25 11:10:42 +01:00
Jerome Nadaud
d1c9ec8e09 // Changing Typo preserving backward compatibility 2013-11-25 11:02:40 +01:00
Gregory Roussac
f588a2c0c3 Merge pull request #1024 from indesign47/patch-20
[-] BO : AdminImport products add missing fields
2013-11-25 01:54:34 -08:00
Gregory Roussac
c6e1fbbae9 Merge pull request #1010 from indesign47/patch-8
[+] BO : AdminAttributes add import combinations
2013-11-25 01:41:12 -08:00
Jerome Nadaud
bc083ece83 // Manual merge from development branch 2013-11-25 10:25:32 +01:00
Jérôme Nadaud
652c370a1d Merge pull request #1025 from wfpaisa/patch-3
double ../../
2013-11-25 00:04:09 -08:00
Jérôme Nadaud
9f5f8561f7 Merge pull request #1027 from wfpaisa/patch-4
double ../
2013-11-25 00:02:56 -08:00
Felipe Uribe
f7b1fa88fa double ../
header.tpl=
{$css_dir}/jquery/uniform.default.css |
..homedir//jquery/uniform.default.css

ok=
{$css_dir}jquery/uniform.default.css |=
homedir/jquery/uniform.default.css
2013-11-24 19:42:14 -05:00
Felipe Uribe
064b9f5ce5 double ../../
correct ../
2013-11-24 17:29:15 -05:00
indesign47
6ef28542c9 [-] BO : AdminImport products add missing fields
Add to file header : Width, Height, Depth, Minimal quantity, Visibility, Additional shipping cost, Unity, Unit price ratio
2013-11-24 23:10:10 +01:00
indesign47
d6d2ef6906 [-] BO : AdminImport add image suppliers 2013-11-24 22:48:27 +01:00
indesign47
f3f580cb08 [-] BO : AdminImport add image manufacturers 2013-11-24 22:42:27 +01:00
Kevin Granger
4044ba853e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 18:57:15 +01:00
Kevin Granger
0572fc09e8 // tweaks list + customers 2013-11-22 18:56:52 +01:00
Jérôme Nadaud
1337407131 Merge pull request #1019 from djfm/translations
Translations
2013-11-22 09:12:55 -08:00
Jérôme Nadaud
0716ae1afc Merge pull request #1018 from indesign47/patch-15
[-] MO : bankwire add translation for fields
2013-11-22 09:10:35 -08:00
Jérôme Nadaud
d4dc67bc61 Merge pull request #1021 from indesign47/patch-17
[-] MO : cheque add translation for fields
2013-11-22 09:09:52 -08:00
Jérôme Nadaud
7f3305d5fc Merge pull request #1020 from indesign47/patch-16
[-] MO : bankwire add translation for fields
2013-11-22 09:08:36 -08:00
indesign47
283fd2a9f3 [-] MO : cheque add translation for fields 2013-11-22 18:05:40 +01:00
indesign47
94242412f2 [-] MO : cheque add translation for fields 2013-11-22 18:02:48 +01:00
rGaillard
b29a30f033 // small fix 2013-11-22 17:59:32 +01:00
indesign47
e068f7202a [-] MO : bankwire add translation for fields 2013-11-22 17:34:03 +01:00
djfm
01d6d7c279 // clearer message 2013-11-22 16:32:54 +00:00
indesign47
dabc3d359a [-] MO : bankwire add translation for fields 2013-11-22 17:30:37 +01:00
djfm
1c6a58c902 // English 2013-11-22 16:16:59 +00:00
djfm
a385e1af42 // remove mod= parameters for translations in the Front-Office 2013-11-22 16:11:37 +00:00
djfm
a147806382 // Improved texts and UI in AdminImport 2013-11-22 15:44:49 +00:00
Jerome Nadaud
a620c5044f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 16:42:09 +01:00
Jerome Nadaud
3fe6608a62 // Include datetime picker for all admin controllers 2013-11-22 16:41:52 +01:00
rGaillard
88ad2010d6 // add padding and margin to automplete width #PSCFV-5876 2013-11-22 16:41:25 +01:00
Damien Metzger
361450aab9 // Fixed entities on KPIs 2013-11-22 16:15:48 +01:00
Damien Metzger
db1c3c22fd [-] BO : Cart rules optimization / Attempt to fix #PSCFV-8895 (need to be double-checked) 2013-11-22 15:59:52 +01:00
djfm
af4b258201 // js=1, not '1' 2013-11-22 14:22:26 +00:00
Rémi Gaillard
45525dac71 Merge pull request #1017 from TMMeilleur/bootstrap
// fixes for cross-browser compability
2013-11-22 05:50:37 -08:00
Damien Metzger
40d15416c5 [-] FO : exclude external css from CCC #PSCFV-10839 2013-11-22 14:37:27 +01:00
TMMeilleur
2376dd404f fixes for cross-browser compability 2013-11-22 14:55:48 +02:00
Jérôme Nadaud
0a7ea9b124 Merge pull request #1016 from wfpaisa/patch-1
Update AdminPPreferencesController.php
2013-11-22 04:28:59 -08:00
Felipe Uribe
5113125a0d Update AdminPPreferencesController.php
Falta coma:

),
					'PS_DISPLAY_DISCOUNT_PRICE' => array(
2013-11-22 07:23:09 -05:00
indesign47
79791d0159 [-] BO : AdminImages manufacturers/suppliers/stores image
• Missing logo Fashion_Manufacturer.jpg (small/medium/large)
install-dev/fixtures/fashion/img/m
• Missing logo Fashion_Supplier.jpg (small/medium/large)
install-dev/fixtures/fashion/img/su
2013-11-22 12:22:41 +01:00
Rémi Gaillard
70180f10d4 Merge pull request #1014 from indesign47/patch-13
[-] FO : header add translation for fields
2013-11-22 03:08:04 -08:00
gRoussac
dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible 2013-11-22 11:40:47 +01:00
indesign47
6164a0d42c [-] FO : header add translation for fields 2013-11-22 11:37:30 +01:00
gRoussac
f7d4dc979f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 11:33:00 +01:00
indesign47
799b31d1ac [-] FO : Contact-form add translation for fields 2013-11-22 10:55:56 +01:00
indesign47
20cc8c3f42 [+] BO : AdminSearchConf add import alias 2013-11-22 09:54:53 +01:00
indesign47
a76578b094 [+] BO : AdminAttributes add import combinations 2013-11-22 09:51:20 +01:00
Damien Metzger
a3e84a33f7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 09:50:05 +01:00
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
indesign47
569c81c0de [+] BO : AdminProducts add import products 2013-11-22 09:45:15 +01:00
gRoussac
ee98947e6b // manual merg of 0bc1d21432 and 2013-11-21 18:59:28 +01:00
Damien Metzger
47531534fc // Updated Addons API call in the search 2013-11-21 18:34:42 +01:00
Kevin Granger
f7ad627b4d // fix pagination Tax Rules Group 2013-11-21 18:28:25 +01:00
Damien Metzger
d89db6de45 // Fixed warning 2013-11-21 17:46:29 +01:00
Damien Metzger
3a02d6f281 [-] BO : Fixed potential errors with untranslated admin tabs #PSCFV-8104 2013-11-21 17:46:28 +01:00
Kevin Granger
5976a471a7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 17:43:59 +01:00
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
2013-11-21 17:43:51 +01:00
Damien Metzger
8bdc6c9a51 [*] FO : Added getCategory getter in ProductController #PSCFV-8408 2013-11-21 16:01:50 +01:00
Kevin Granger
6431f559d7 // tree header improvement WIP 2013-11-21 15:01:54 +01:00
Damien Metzger
9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) 2013-11-21 14:57:55 +01:00
Damien Metzger
26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] 2013-11-21 14:44:00 +01:00
gRoussac
d6e52bdecb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-21 14:20:00 +01:00
gRoussac
3ab28374e6 [-] BO : Remove warning with open_basdir on module list 2013-11-21 14:17:55 +01:00
Damien Metzger
9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
Jerome Nadaud
794f729c5d // Show more info content if <= 4 2013-11-21 12:23:54 +01:00
Kevin Granger
b10d50ef09 // fixs on horizontal nav + add icon on footer links 2013-11-21 12:15:21 +01:00
Fabio Chelly
5f47526ed2 [-] FO : Fixed bug #PSCFV-11076 2013-11-21 12:13:30 +01:00
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
Jerome Nadaud
fbe7f236cb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 11:06:21 +01:00
Jerome Nadaud
d49f29f79d // Remove subtitle from orders view 2013-11-21 11:06:08 +01:00
Kevin Granger
a6e1309a33 Merge pull request #1008 from djfm/cleanup
// removed superfluous mail files
2013-11-21 01:41:15 -08:00
fram
931f309b45 // removed superfluous mail files 2013-11-21 10:26:02 +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
Vincent Augagneur
d2c600a5e3 //updated .gitignore 2013-11-21 09:51:22 +01:00
Jerome Nadaud
0b47dbca21 // Adding footer to customer requiered fields 2013-11-21 09:46:27 +01:00
Jerome Nadaud
2df142eb89 // Align actions button in customner view 2013-11-21 09:35:44 +01:00
Jérôme Nadaud
033bf745cd Merge pull request #1000 from studiokiwik/sk-ps15x-011
"---<br />" string is now removed correctly from the end of customization data text
2013-11-21 00:14:28 -08:00
Kevin Granger
d4afcec83f Merge pull request #1005 from djfm/css
// adjust markup in AdminTranslationsController
2013-11-20 12:10:22 -08:00
Kevin Granger
104ae93936 // tweak nav sidebar 2013-11-20 19:25:11 +01:00
Jerome Nadaud
a536833f52 // Some bootstrap changes in controllers 2013-11-20 18:44:20 +01:00
Rémi Gaillard
c2e3e1295c Merge pull request #1006 from TMMeilleur/bootstrap
// Added all themes for themeconfigurator and fixed Rich Snipet (availability)
2013-11-20 09:37:56 -08:00
TMMeilleur
f58018b6e4 fixes for compatibility 2013-11-20 19:31:17 +02:00
TMMeilleur
01428f9a31 added all themes for themeconfigurator 2013-11-20 19:25:12 +02:00
Jerome Nadaud
a5cc9efa76 // Languages boostraping 2013-11-20 18:20:19 +01:00
fram
5bd2439e43 // css in AdminTranslationsController 2013-11-20 18:07:51 +01:00
Vincent Augagneur
a3282025cf //referralprogram retro compat 1.5 when using helper form in module configuration 2013-11-20 18:05:56 +01:00
Vincent Augagneur
6ec8e4e70e mailalerts retro compat 1.5 when using helper form in module configuration 2013-11-20 17:57:58 +01:00
Vincent Augagneur
64cfe559f1 //loyalty retro compat 1.5 when using helper form in module configuration 2013-11-20 17:56:11 +01:00
Jerome Nadaud
fc5b3b1d29 // Localization bootstraping 2013-11-20 17:52:05 +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
5b6cfa3cdb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 17:29:46 +01:00
Jerome Nadaud
12f3a150a7 // bootraping of import csv view 2013-11-20 17:29:35 +01:00
Kevin Granger
9e2dac8ece //fix css login 2013-11-20 17:24:52 +01:00
Damien Metzger
63f2082da3 [-] FO : fixed tax rules cache 2013-11-20 16:49:48 +01:00
Damien Metzger
4cc99ed9b6 // more image fixes 2013-11-20 16:33:34 +01:00
Damien Metzger
2d60a95fc3 // Fixed slider image 2013-11-20 16:32:14 +01:00
Damien Metzger
8d0b1e9602 [*] BO : Added combination ean13 in the backend search #PSCFV-10436 2013-11-20 16:30:25 +01:00
Gregory Roussac
6d0de6e29e Merge pull request #1003 from priyank/patch-1
[-] FO : Homefeatured adding a position order by clause.
2013-11-20 07:29:19 -08:00
Rémi Gaillard
df4cc9d876 Merge pull request #1002 from TMMeilleur/bootstrap
//fixed banners style
2013-11-20 07:28:51 -08:00
Priyank Bolia
0ff7163cba Adding a position order by clause.
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
2013-11-20 20:56:35 +05:30
Kevin Granger
8eb5f76df9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 16:24:15 +01:00
Kevin Granger
dc29fae59d // reorganize some css and stuff on backward compatibility 2013-11-20 16:24:01 +01:00
Damien Metzger
a10c8a3874 [-] FO : Fixed meta title entities #PSCFV-10312 2013-11-20 16:21:37 +01:00
Kevin Granger
c61d1bc309 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 16:20:56 +01:00
Jerome Nadaud
e5d03f4e7c // Csv import fix hide checkbox 2013-11-20 16:11:37 +01:00
Jerome Nadaud
0b3c08acbe // Add language iso code to language select 2013-11-20 15:37:25 +01:00
gRoussac
914f613e7b [-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false 2013-11-20 15:32:33 +01:00
TMMeilleur
db081111a6 fixed banners style 2013-11-20 16:24:05 +02:00
Vincent Augagneur
8148d5696d [-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos 2013-11-20 15:20:44 +01:00
Jerome Nadaud
e2aa776a64 // update cms controller title 2013-11-20 15:19:07 +01:00
Vincent Augagneur
0299f3f0cd [-] BO : fixed bug #PSCSX-32 class-danger on mail send error 2013-11-20 14:56:31 +01:00
Jerome Nadaud
62a149ebe6 [-] BO : FixBug #PSCSX-33 Misplaced save button 2013-11-20 14:50:31 +01:00
gRoussac
5ef392aaeb [-] FO : Fix #PSCFV-11069 remove unused file 2013-11-20 14:44:56 +01:00
Quentin Montant
0410378bd3 "---<br />" string is now removed correctly from the end of customization data text 2013-11-20 13:30:47 +01:00
Jerome Nadaud
dbf98d3722 // Put suffix after input field 2013-11-20 12:02:15 +01:00
Kevin Granger
896d8ce494 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 11:57:44 +01:00
Quentin Montant
1508a8a5d7 "---<br />" string is now removed correctly from the end of customization data text 2013-11-20 11:31:02 +01:00
Jerome Nadaud
7ab256d28f // Small fix in customer order private note 2013-11-20 11:04:39 +01:00
Damien Metzger
61b1dd338e // Update blockbestsellers 2013-11-20 10:28:39 +01:00
Damien Metzger
33b8703d24 // Changelog 1.5.6.1 2013-11-20 09:43:06 +01:00
Jérôme Nadaud
29e7169a92 // Change logo size 2013-11-19 08:43:17 +01:00
Damien Metzger
3f5963885e // Install multilang 2013-11-19 00:56:53 +01:00
Damien Metzger
54786a6f75 // Install 2013-11-19 00:10:46 +01:00
Damien Metzger
359f408bd1 // Install 2013-11-19 00:05:51 +01:00
Jerome Nadaud
60be5a7989 // themeconfigurator fix 2013-11-18 23:56:19 +01:00
Damien Metzger
89e09c32e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:55:39 +01:00
Damien Metzger
e2c930a165 // Install 2013-11-18 23:55:29 +01:00
Jerome Nadaud
1b96c590bb // fix stock available on install 2013-11-18 23:53:47 +01:00
Kevin Granger
3580dc016a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:46:48 +01:00
Damien Metzger
dec5ef7469 // Install 2013-11-18 23:26:41 +01:00
Lucas CERDAN
e99332c012 // Pics 2013-11-18 22:55:17 +01:00
Jerome Nadaud
b2c656e51a // small font fix 2013-11-18 22:32:33 +01:00
Lucas CERDAN
4001a99414 Fixtures product 2013-11-18 22:21:10 +01:00
Jerome Nadaud
2c687ba090 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 22:16:38 +01:00
Jerome Nadaud
639a56421a // Themeconfigurator 2013-11-18 22:16:26 +01:00
Damien Metzger
51e5163761 // Moulinette for installer attributes 2013-11-18 22:10:22 +01:00
Jérôme Nadaud
fb0118e456 Merge pull request #996 from TMMeilleur/bootstrap
replace new css files location to modules/themeconfigurator/css
2013-11-18 11:53:22 -08:00
Jerome Nadaud
f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Lucas CERDAN
c451ee1bd8 // Fixtures 2013-11-18 20:46:22 +01:00
Damien Metzger
f4560d0899 // Install 2013-11-18 20:35:42 +01:00
Lucas CERDAN
bde8d02c81 Fixtures: category_product 2013-11-18 20:27:01 +01:00
Damien Metzger
e4fcb31836 // Install 2013-11-18 20:02:14 +01:00
Jerome Nadaud
3dd7a17f6f // Some fixtures 2013-11-18 19:53:44 +01:00
Lucas CERDAN
fac6a5f8b2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 19:31:56 +01:00
Lucas CERDAN
0824a61551 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 19:29:32 +01:00
Damien Metzger
a2e1d5ad90 // Fix blockcategory install with new fixtures 2013-11-18 19:29:13 +01:00
Lucas CERDAN
72b6b3d482 Fixtures (en) 2013-11-18 19:27:10 +01:00
Jerome Nadaud
4f2ef4a638 // Update fixture in blockcms 2013-11-18 19:26:30 +01:00
Damien Metzger
a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Lucas CERDAN
770d48cf3c Fixtures (en) : category_product 2013-11-18 19:15:10 +01:00
Alexander Grosul
b6c5cd7c63 replace new css files location to modules/themeconfigurator/css 2013-11-18 20:07:24 +02:00
Damien Metzger
36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Jerome Nadaud
e02b5d5c11 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
	admin-dev/themes/default/template/helpers/list/list_header.tpl
2013-11-18 18:39:25 +01:00
Lucas CERDAN
c78252f64b Fixtures images 2013-11-18 18:38:24 +01:00
Jerome Nadaud
6be883217e [-] BO : FixBug #PNM-1594 - Double selected option value 2013-11-18 18:36:30 +01:00
Lucas CERDAN
5ca7f683ac // Fixture (en): add description to categories 2013-11-18 18:09:40 +01:00
rGaillard
7755cd8d3e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:20 +01:00
rGaillard
5c1f8871fc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:05 +01:00
Jerome Nadaud
57b329ca74 // Remove other fonts 2013-11-18 17:46:05 +01:00
rGaillard
9197498c3c // delete useless module 2013-11-18 17:45:53 +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
Lucas CERDAN
09a558485a New fixtures (en)
(my first commit, yay! :) )
2013-11-18 17:24:06 +01:00
Jerome Nadaud
c14b9e619d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 17:21:41 +01:00
Jerome Nadaud
938ef4fe39 // small fix 2013-11-18 17:12:35 +01:00
Damien Metzger
43a54b10bf // Reverted revert 2013-11-18 17:00:23 +01:00
rGaillard
5d0b188eed // small fix 2013-11-18 16:19:02 +01:00
Rémi Gaillard
10e0205cb8 Merge pull request #992 from djfm/development
// fixed typo in Russian installer
2013-11-18 06:40:31 -08:00
Rémi Gaillard
a1d34e4ad2 Merge pull request #993 from djfm/bootstrap
// fixed typo in Russian installer
2013-11-18 06:40:02 -08:00
Damien Metzger
1f71090b86 // Timeout increased for translation download #PSCFV-11046 2013-11-18 15:37:34 +01:00
Jerome Nadaud
522e95223f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:35:17 +01:00
Jerome Nadaud
89c9f182b3 // Small fix in live configurator toolbox 2013-11-18 15:35:03 +01:00
fram
1dd0064cb2 // fixed typo in Russian installer 2013-11-18 15:34:46 +01:00
Rémi Gaillard
4cba2623e5 Merge pull request #926 from djfm/loc_ui
//Localization
2013-11-18 06:32:34 -08:00
Rémi Gaillard
618aa24f74 Merge pull request #945 from Javsmile/patch-2
// Update productcomments.php
2013-11-18 06:30:59 -08:00
fram
0889ab4eec // fixed typo in Russian installer 2013-11-18 15:30:05 +01:00
Rémi Gaillard
f4194bedd9 Merge pull request #978 from StanProg/bootstrap
// FO : Removed unused local variable, tabs added, phpdoc tags
2013-11-18 06:27:46 -08:00
Rémi Gaillard
4c51570b34 Merge pull request #991 from TMMeilleur/bootstrap
// fixed add to wishlist/compare buttons and added product review
2013-11-18 06:22:43 -08:00
Kevin Granger
4f7f8535b5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:13:11 +01:00
Kevin Granger
369ac0f664 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
gRoussac
6633efd27d [-] BO : Fix bug #PNM-1594, selected value error in helper list 2013-11-18 15:11:49 +01:00
Jerome Nadaud
c4dab5f5a6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:04:44 +01:00
Jerome Nadaud
40204ba458 // Live configurator toolbox part 2 2013-11-18 15:04:10 +01:00
gRoussac
8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured 2013-11-18 14:58:17 +01:00
Damien Metzger
adcc4f2c74 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 14:54:47 +01:00
Damien Metzger
b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
TMMeilleur
95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02: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
Jerome Nadaud
867eef79cc // Add live configurator toolbox - Part 1 2013-11-18 14:39:46 +01:00
gRoussac
dbc08d779c // typo, sorry about this 2013-11-18 14:35:39 +01:00
Jerome Nadaud
239604b70c // Missing isset on cols and rows 2013-11-18 14:35:15 +01:00
gRoussac
22a9548f83 [-] FO : Fix bug #PSCFV-11043, bad cache id from module template 2013-11-18 14:32:34 +01:00
Jerome Nadaud
ebad56a800 // Fix small error 2013-11-18 14:29:32 +01:00
gRoussac
4771746959 [-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url 2013-11-18 12:26:08 +01:00
Damien Metzger
89c65536d7 // Added missing configuration vars in the installer 2013-11-18 12:23:50 +01:00
Damien Metzger
5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
rGaillard
bd241a9c48 [-] BO: product price was changed on changing to advanced stock management #PSCFV-10996 2013-11-18 12:04:09 +01:00
Kevin Granger
73ec191fb0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 10:23:23 +01:00
Jérôme Nadaud
8166bb662c Merge pull request #984 from soware/development
Update form.tpl
2013-11-18 01:01:00 -08:00
Jerome Nadaud
113f8d4efb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-18 09:55:37 +01:00
Jerome Nadaud
11296fe464 // Small Fix in truncateString function 2013-11-18 09:55:21 +01:00
Gregory Roussac
017ef4860e Merge pull request #987 from davyrolink/fixed_toolbar_tpl
[*] BO : multiple toolbars save button
2013-11-18 00:54:48 -08:00
Gregory Roussac
21319ca32c Merge pull request #988 from dlage/fix_jquery_ui_autocomplete
[-] Project : missing ui.menu in jquery_ui_dependencies.
2013-11-17 14:44:47 -08:00
gRoussac
cef406aef2 [*] FO : DNI can be not required 2013-11-17 23:35:56 +01:00
gRoussac
7e841c4448 [-] FO : Missing sup for DNI field 2013-11-17 22:36:51 +01:00
gRoussac
1cbc765a8f [-] IN : Bad flag in add_module_to_hook 2013-11-17 20:42:29 +01:00
rGaillard
68c8e9da57 // move to themeconfigurator 2013-11-16 19:24:03 +01:00
692643d7d6 [-] Project : missing ui.menu in jquery_ui_dependencies. 2013-11-16 17:42:54 +00:00
Davy Rolink
cd58c0968b Fixed admin toolbar save button javascript actions, problem occurred when there were multiple toolbars on one page 2013-11-16 14:59:37 +01:00
Jérôme Nadaud
de9e6d72c8 // Typo 2013-11-16 08:04:59 +01:00
Jérôme Nadaud
3a58cb2a91 Merge pull request #983 from PrestaEdit/patch-60
//typo
2013-11-15 22:13:22 -08:00
soware
e5f0bcb916 Update form.tpl
I removed the line 109 because the price tab problem and because this line is redundant. The first show (line 95) always is executed.
If the price is saved twice, the second the div #product-tab-content-wait never is hided and show the loading forever.
It is because the line 109 show this tab again, in the sequence: show (line 95), hide (line 213), show (line 109).
This happening just for price tab.
2013-11-16 00:37:47 -02:00
PrestaEdit
9b787c454f //typo 2013-11-16 01:21:56 +01:00
rGaillard
8c3eb9b9a4 // typo 2013-11-15 21:03:17 +01:00
gRoussac
7f02c8ca58 [-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality 2013-11-15 18:50:28 +01:00
Damien Metzger
b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Rémi Gaillard
4bd7164507 Merge pull request #982 from TMMeilleur/bootstrap
// added responsive rich menu and small fix in blockbanner
2013-11-15 08:47:58 -08:00
TMMeilleur
a5d9daff13 added responsive rich menu and small fix in blockbanner 2013-11-15 18:40:17 +02:00
Jerome Nadaud
5106a5f1e3 // Fix products controller title 2013-11-15 17:25:12 +01:00
Jerome Nadaud
96def5033f // typo 2013-11-15 17:19:12 +01:00
Jerome Nadaud
8cd1d623e5 // Fix error if default blockbanner image is missing 2013-11-15 17:13:50 +01:00
Jerome Nadaud
19cfa443d2 // fix dashgoals configuration fields size 2013-11-15 17:04:55 +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
Jerome Nadaud
8d90578cf7 // Add anchor to list 2013-11-15 16:04:27 +01:00
gRoussac
2962141d51 [-] BO : Fix warning when no memcached servers 2013-11-15 15:39:00 +01:00
Jerome Nadaud
ece4331622 //Fix addsharethis error 2013-11-15 15:38:51 +01:00
Jerome Nadaud
3af7a59caa // Add version number to addsharethis 2013-11-15 15:32:52 +01:00
Jerome Nadaud
b5d84a72e0 // AddShareThis fix 2013-11-15 15:31:01 +01:00
gRoussac
73bf2a7db1 [-] BO : Fix #PSCFV-11016 typo 2013-11-15 15:16:02 +01:00
gRoussac
9aa656c9d7 // typo 2013-11-15 15:10:12 +01:00
gRoussac
1140b5e8b5 [*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl 2013-11-15 15:06:30 +01:00
Jerome Nadaud
44f89053e4 // Invoice search fix 2013-11-15 15:00:56 +01:00
gRoussac
6a690b255b [-] BO : Model return html error messagae instead of json while image uploading 2013-11-15 12:20:10 +01:00
Jerome Nadaud
9fa2299c6b // Open prestashop.com link in new window 2013-11-15 11:56:23 +01:00
Jerome Nadaud
d7de507f42 // Product comments 2013-11-15 11:49:40 +01:00
gRoussac
152960639f [-] BO : Product final price can not be hidden on loading tab, report of 6c6c3b240e 2013-11-15 11:36:07 +01:00
Gregory Roussac
448a4c9994 Merge pull request #980 from djfm/development
// no line breaks in $this->l()
2013-11-15 02:23:39 -08:00
gRoussac
7526fe4766 // missing trailing semi-column 2013-11-15 11:16:48 +01:00
Jerome Nadaud
50eee795ed // Add truncate category description preserving html tags 2013-11-15 11:03:06 +01:00
gRoussac
97be96ede8 [-] MO : Missinag closing href 2013-11-15 10:54:50 +01:00
gRoussac
0b47ef1b3b [-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506 2013-11-15 10:51:46 +01:00
fram
ba15d975bc // no line breaks in $this->l() 2013-11-15 10:44:01 +01:00
Jerome Nadaud
a66d2e1ab6 // Fix form name 2013-11-15 09:18:41 +01:00
Jerome Nadaud
c2d956ec7d // Modif after specs change 2013-11-15 08:58:30 +01:00
Jerome Nadaud
29f65da5ca // Add wish list button to blockwishlist module 2013-11-14 19:54:28 +01:00
Rémi Gaillard
7fcbf8aa7c Merge pull request #977 from TMMeilleur/bootstrap
//updates and fixes 14.11.2013
2013-11-14 10:28:06 -08:00
Jerome Nadaud
80957666cf // Hide collapse and expand button when not necessary 2013-11-14 19:21:31 +01:00
gRoussac
47d58ff930 [*] FO : set at least a class to body 2013-11-14 19:03:12 +01:00
Stanislav Yordanov
c5b1834870 [*] FO : Removed unused local variable, phpdoc return tag added 2013-11-14 19:22:39 +02:00
TMMeilleur
0d1c113be1 updates and fixes 14.11.2013 2013-11-14 18:08:05 +02:00
gRoussac
d06bf10bbb [-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight 2013-11-14 16:35:11 +01:00
Jerome Nadaud
051ed32133 // Add toggle to datepicker button 2013-11-14 16:05:58 +01:00
Jerome Nadaud
4a46960112 // Small bootstrap fix 2013-11-14 16:00:22 +01:00
gRoussac
d0d234f555 // typo, sorry about this 2013-11-14 15:58:42 +01:00
Jerome Nadaud
18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Stanislav Yordanov
e7e514dc77 Removed unused local variable, tab added, phpdoc tags fixed 2013-11-14 16:41:08 +02:00
Jerome Nadaud
8f81af0463 // fix on blockcategories 2013-11-14 15:12:08 +01:00
gRoussac
19d975a0b4 // typo 2013-11-14 14:48:14 +01:00
Jerome Nadaud
67eeae0fa2 // Set visibility on help button 2013-11-14 14:42:35 +01:00
Jerome Nadaud
299a8e9e9f // Update attributes group title 2013-11-14 14:13:28 +01:00
Jerome Nadaud
09b908204b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-14 11:52:34 +01:00
Jerome Nadaud
87faae9717 // Add top menu to blockcategories 2013-11-14 11:52:24 +01:00
gRoussac
6393746f04 [-] BO : 406 when mod_security follow up 034e6a7e7f 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
Jerome Nadaud
63ef0b82e6 // Categories thumbnail images for blocktopmenu 2013-11-14 10:37:07 +01:00
Jerome Nadaud
232309996b // Fix blocklayered bootstrap 2013-11-14 10:35:02 +01:00
Jerome Nadaud
27731f3bb2 // Bootstraping blocklayered backoffice and ajax fix 2013-11-13 20:13:42 +01:00
Kevin Granger
a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +01:00
Jerome Nadaud
afaeb15b7d // Define default template dir on tree class 2013-11-13 20:10:13 +01:00
gRoussac
db99f188a2 [-] BO : AdminImport, execption when creating groups 2013-11-13 18:23:41 +01:00
Gregory Roussac
fe8e349931 Merge pull request #975 from ldecoker/patch-10
[-] FO : _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
2013-11-13 09:14:49 -08:00
ldecoker
3f8b76f78c [-][FO] _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
When there is no mobile theme provided with the current theme, the variable _PS_THEME_MOBILE_OVERRIDE_DIR_ is not defined. We so get the following error in apache logs:

"PHP Notice:  Use of undefined constant _PS_THEME_MOBILE_OVERRIDE_DIR_ - assumed '_PS_THEME_MOBILE_OVERRIDE_DIR_' in FrontController.php"
2013-11-13 18:12:59 +01:00
Francois Gaillard
c9a2410c57 [-] Classes : AdminController - Changed admin-theme.css position 2013-11-13 17:48:21 +01:00
Rémi Gaillard
3b1168a032 Merge pull request #974 from TMMeilleur/bootstrap
// added transforming for mobile view and other small fixes
2013-11-13 08:43:43 -08:00
Alexander Grosul
ae596ebcd4 added transforming for mobile view and other small fixes 2013-11-13 18:34:34 +02:00
gRoussac
947f9bb21c // small isset in productcomments 2013-11-13 16:39:33 +01:00
Rémi Gaillard
fa3aa8c9d7 // strict standard 2013-11-13 15:46:06 +01:00
Rémi Gaillard
83400c691c Merge pull request #973 from djfm/development
//translations
2013-11-13 06:34:38 -08:00
Rémi Gaillard
f4601d9680 // default form language 2013-11-13 15:37:58 +01:00
Jerome Nadaud
aa81e2607f // First boostraping pass on blocklayered module 2013-11-13 15:31:30 +01:00
Rémi Gaillard
899dea47a1 // oups 2013-11-13 15:32:56 +01:00
Rémi Gaillard
2fe12b965b [-] Core: add possibility to choose the position of your css files 2013-11-13 15:31:29 +01:00
fram
28e1a94bb6 // instead instead of insted 2013-11-13 15:10:06 +01:00
fram
ad6367f2bf // updated native translations 2013-11-13 15:06:47 +01:00
gRoussac
5a8c335d78 [-] FO : Bad value for back when controller name is sent 2013-11-13 12:30:39 +01:00
Rémi Gaillard
f7e1229e16 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 11:58:24 +01:00
Rémi Gaillard
24a4694000 // small clean 2013-11-13 11:58:11 +01:00
gRoussac
4479db88a0 [-) PDF : nowrap on several product prices 2013-11-13 11:52:10 +01:00
Vincent Augagneur
5963871a01 //small fix 2013-11-13 11:40:13 +01:00
Francois Gaillard
339c954cb3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 11:24:51 +01:00
Jerome Nadaud
c4837e65ec [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination 2013-11-13 11:24:25 +01:00
Rémi Gaillard
4a9383bbcf // small fix 2013-11-13 11:15:48 +01:00
Jerome Nadaud
2117c89352 [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination 2013-11-13 11:04:13 +01:00
Jerome Nadaud
9f10a851e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:58:01 +01:00
Gregory Roussac
66a9ee03fc Merge pull request #971 from studiokiwik/sk-ps15x-008
[-] FO : fix contact-form id_order input when customer is not logged
2013-11-13 01:42:00 -08:00
Rémi Gaillard
115c368a89 Merge pull request #970 from alexey-svistunov/bootstrap
//Frontend updates.
2013-11-13 01:29:22 -08:00
gRoussac
c69688cc11 [-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy 2013-11-13 10:14:21 +01:00
Mikael Blotin
26d1ad0668 [-] FO : fix contact-form id_order input when customer is not logged 2013-11-13 10:12:31 +01:00
Vincent Augagneur
746d8de9c7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 10:09:07 +01:00
Vincent Augagneur
5d0117c5ed //added configuration in sql request in dashactivity 2013-11-13 10:08:57 +01:00
Jerome Nadaud
6a99b84452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:02:28 +01:00
Jerome Nadaud
2cbf8af2b2 // Cms title 2013-11-13 09:36:58 +01:00
Vincent Augagneur
582ad68875 added default configuration value for dashproducts 2013-11-13 09:27:48 +01:00
Vincent Augagneur
55fa826525 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 09:07:54 +01:00
Vincent Augagneur
e7869f6b19 //added default configuration value for dashactivity 2013-11-13 09:07:44 +01:00
alexey-svistunov
a7aea1d018 Updating styles 2013-11-13 10:01:04 +02:00
alexey-svistunov
e7abdee44a Merge remote-tracking branch 'upstream/bootstrap' into bootstrap 2013-11-13 09:59:11 +02:00
gRoussac
6ddf220aee [-] Fo : Call Gmaps on https if required 2013-11-12 21:16:09 +01:00
gRoussac
9328a3c473 // forgot to commit 036e2362c9 2013-11-12 19:17:54 +01:00
gRoussac
c8dfe1c174 [-] FO : Wordwrap on prices in history 2013-11-12 19:17:12 +01:00
Rémi Gaillard
75df12dd94 [-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop 2013-11-12 18:49:52 +01:00
Gregory Roussac
6d7e2055ce Merge pull request #968 from ccauw/patch-12
[*] BO : add class on TD in standard List
2013-11-12 09:38:03 -08:00
gRoussac
4d327a537f [*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571 2013-11-12 18:28:42 +01:00
Kevin Granger
4fbc8deaa8 // fix products 2013-11-12 18:21:36 +01:00
ccauw
747926039a [*] BO : add class on TD in standard List
Back office :
Add a class on TD in list created by getList()
In fields_list array of AdminController, we can add a new parameter('class')

example :
		'name' => array(
			'title' => $this->l('Name'),
			'width' => 150,
			'class' => 'ma_classe',
			'filter_key' => 'b!name'
		),
This parameter can be used for javascript effect, ...

Thanks.
2013-11-12 18:01:27 +01:00
gRoussac
5e4382eb08 [-] BO : Fix bug #PSCFV-10982 reduction group truncated 2013-11-12 17:55:07 +01:00
Vincent Augagneur
52abf62ae1 //dashactivity config 2013-11-12 17:33:54 +01:00
gRoussac
036e2362c9 [+] CORE : Fixed cache_id 2013-11-12 17:09:38 +01:00
Fabio Chelly
fc193d5c8b Merge remote-tracking branch 'origin/development' into development 2013-11-12 16:36:19 +01:00
Rémi Gaillard
75e6a03591 // small fix 2013-11-12 16:38:34 +01:00
Fabio Chelly
dd05692400 [-] FO : Fixed errors when calculating most selled products from footer link 2013-11-12 16:36:07 +01:00
Rémi Gaillard
b5eb7c5c28 // typo 2013-11-12 16:25:13 +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
Rémi Gaillard
175da3ecf6 Merge pull request #965 from djfm/IETF
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
2013-11-12 06:05:10 -08:00
fram
743c4f4607 [*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc. 2013-11-12 14:59:36 +01:00
Kevin Granger
4e06b1fdd5 // update Bootstrap 3.0.2 + fix tree header 2013-11-12 14:50:19 +01:00
Vincent Augagneur
c6e34ee229 //dashproducts added section in tpl 2013-11-12 14:43:08 +01:00
Vincent Augagneur
249bd5437d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 14:41:11 +01:00
Vincent Augagneur
cf9da09f98 //remove unused smarty variable 2013-11-12 14:40:58 +01:00
gRoussac
40abef8aac Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-12 12:32:37 +01:00
Rémi Gaillard
8be339463d // small fix 2013-11-12 12:36:51 +01:00
gRoussac
f0f630fb50 [-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address 2013-11-12 12:32:21 +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
0430d09753 // Better php def for Page header title edit and view 2013-11-12 11:36:26 +01:00
Jerome Nadaud
fe387fa8ed // Set Identifier name for search engine 2013-11-12 11:30:26 +01:00
Jerome Nadaud
ec37efdf8b // Add identifier name 2013-11-12 11:30:01 +01:00
Jerome Nadaud
94817a9371 // ooops 2013-11-12 11:16:31 +01:00
Jerome Nadaud
db0e1e41a9 // Small Fix 2013-11-12 11:10:55 +01:00
Kevin Granger
3f83edc7e1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 11:07:44 +01:00
Kevin Granger
4a6346b295 // adjustment on switch 2013-11-12 11:07:30 +01:00
Jerome Nadaud
41196f3c5f // General modification for view and edit title 2013-11-12 11:06:20 +01:00
Gregory Roussac
0e1898be09 Merge pull request #963 from djfm/sprintf
// do not use sprintf in installer when it is useless
2013-11-12 01:45:39 -08:00
Jerome Nadaud
44d1ed0982 // Add category name to page header title 2013-11-12 10:45:17 +01:00
Kevin Granger
2a982e96f1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 10:44:08 +01:00
Kevin Granger
5ca23d44a6 // label with tooltip 2013-11-12 10:43:52 +01:00
gRoussac
c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 2013-11-12 10:41:19 +01:00
Jerome Nadaud
3931914203 // Add Modernizr and Modernizr-loads check and loading for unsuported browsers 2013-11-12 09:54:20 +01:00
Gregory Roussac
cd83ec93c7 Merge pull request #961 from joseantgv/patch-4
[-] MO : Whishlist, innerhtml in html jquery
2013-11-12 00:42:04 -08:00
fram
ab730dc3da // do not use sprintf when it is useless 2013-11-12 09:21:05 +01:00
joseantgv
7523828a7a Update ajax-wishlist.js
innerHtml can not execute javascript from "data". If someone modify php files returned from jquery function and includes a script, it's not executed.
2013-11-11 16:58:52 +01:00
gRoussac
e2d8a33a81 [*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960 2013-11-11 14:02:11 +01:00
gRoussac
a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01:00
Alexey Svistunov
97d14e5b08 Added changes from commit 88aa49e TMMeilleur 2013-11-11 11:30:24 +02:00
gRoussac
de404706d9 [*] CORE : Profiling hide non doubles 2013-11-11 02:09:50 +01:00
gRoussac
3f9338e13d [*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop 2013-11-11 01:59:10 +01:00
gRoussac
38da826671 [-] FO : getTaxCalculator bad cache key again // sorry about that 2013-11-11 01:37:20 +01:00
gRoussac
fee461fdf1 [*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct 2013-11-11 01:00:55 +01:00
gRoussac
8dd951c2df [*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory 2013-11-11 00:36:17 +01:00
gRoussac
7e93b2cffd [-] FO : getTaxCalculator bad cache key 2013-11-11 00:13:35 +01:00
gRoussac
19da345531 [-] BO : Could not check all modules after ajax call 2013-11-10 21:51:14 +01:00
Rémi Gaillard
d7dd85d7d0 Merge pull request #955 from alexey-svistunov/bootstrap
Added changes from eb94b51 TMMeilleur/PrestaShop
2013-11-08 11:25:25 -08:00
alexey-svistunov
6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop 2013-11-08 21:00:00 +02:00
Kevin Granger
d3100acef2 // fixs on mobile nav 2013-11-08 18:31:07 +01:00
Fabio Chelly
bd8eebdc33 Merge remote-tracking branch 'origin/development' into development 2013-11-08 18:12:23 +01:00
Fabio Chelly
4312d241f3 [-] MO :Fixed #PNM-1654 (Loyalty module) by using most expensive attribute instead of default one 2013-11-08 18:12:11 +01:00
Jerome Nadaud
c5b3d20b96 // Fix empty file list on add 2013-11-08 18:05:56 +01:00
Jerome Nadaud
bdc996d13b // Wrong col size 2013-11-08 17:58:09 +01:00
Jerome Nadaud
a3082be2db // Remove unnecessary function 2013-11-08 17:53:26 +01:00
Jerome Nadaud
217a79eeae // Unify thumb param in files options 2013-11-08 17:49:56 +01:00
Jerome Nadaud
ef469d7782 // Move spin and ladda js to products controller 2013-11-08 17:47:09 +01:00
Jerome Nadaud
9065a73998 // Remove flags 2013-11-08 17:21:36 +01:00
Kevin Granger
00a72a5f68 // skin uploader button 2013-11-08 16:56:12 +01:00
Jerome Nadaud
5afe733e13 // Small fix on HelperUploader 2013-11-08 16:53:32 +01:00
Jerome Nadaud
bf67bd56a3 // Add uploader to products controller 2013-11-08 16:29:07 +01:00
Kevin Granger
034565bc6a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-08 16:18:38 +01:00
Kevin Granger
b214ea68ff // mobile nav 2013-11-08 16:18:28 +01:00
gRoussac
7eb70486e0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-08 15:54:28 +01:00
gRoussac
ebc3dfee62 [-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index 2013-11-08 15:54:13 +01:00
Gregory Roussac
ee487fde59 Merge pull request #953 from Shagshag/patch-4
[*] BO: kb was not translatable
2013-11-08 06:37:26 -08:00
Shagshag
c7f1fcb49a kb was not translatable 2013-11-08 15:33:49 +01:00
gRoussac
530b6dc501 // Productscomments remove warnings 2013-11-08 15:00:56 +01:00
gRoussac
5364be686e // More simple names for csv import files 2013-11-08 14:59:43 +01:00
Jérôme Nadaud
aaaf8588c1 Merge pull request #931 from PhpMadman/patch-2
[-] MO : Mailalert was not using order reference
2013-11-08 04:01:39 -08:00
PhpMadman
6ee2852fa5 [-] MO : Mailalert was not using order reference 2013-11-08 12:48:49 +01:00
Jérôme Nadaud
64c166c311 Merge pull request #947 from PhpMadman/Boot-UpTo
// made a working You Save column for Volume Discounts
2013-11-08 02:57:23 -08:00
Jérôme Nadaud
02acd47c9e Merge pull request #950 from pelTek/patch-2
Added states to Greek localization pack
2013-11-08 02:46:55 -08:00
Jérôme Nadaud
6f70c77d41 Merge pull request #949 from djfm/bootstrap
// sprintf & English
2013-11-08 02:45:04 -08:00
Chris
32e92762f5 Added states to Greek localization pack
Added states to Greek localization pack
2013-11-08 12:44:42 +02:00
fram
be38a438e2 // sprintf & English 2013-11-08 11:39:59 +01:00
Francois Gaillard
3b7387ffe8 [-] Classes : Hook - Installer & context shop id 2013-11-08 11:00:14 +01:00
PhpMadman
1782bc082f // made a working You Save column for Volume Discounts 2013-11-08 10:27:36 +01:00
Kevin Granger
42af175d22 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 21:49:11 +01:00
Kevin Granger
9c4ee27f20 // mobile nav WIP 2013-11-07 21:48:55 +01:00
Kevin Granger
402221ad0f // load enquire.js 2013-11-07 21:48:17 +01:00
Rémi Gaillard
2d2445efd4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 18:34:09 +01:00
Rémi Gaillard
855c8a8de4 // add 2 useful hooks 2013-11-07 18:33:49 +01:00
gRoussac
472dc8c27d [-] MO : Blocklayered follow up a6e67b078e (commitcomment-4538556) 2013-11-07 17:59:04 +01:00
Jerome Nadaud
4d1a4393a9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 17:58:32 +01:00
Jerome Nadaud
8a4c036655 // Fix cache problem 2013-11-07 17:58:17 +01:00
Javsmile
99ad6481e6 Update productcomments.php
This little addition fix the problem for enlight the stars in the hookproductTab whe you disable or make an exception of the hookproductOutOfStock with the product file.
2013-11-07 17:53:47 +01:00
Rémi Gaillard
f5c133f6e0 // small fix 2013-11-07 17:50:28 +01:00
Rémi Gaillard
2d609ec93c // merge fixes 2013-11-07 17:43:26 +01:00
Kevin Granger
51e962195c // This Controller needs a toolbar and a title 2013-11-07 17:15:40 +01:00
Rémi Gaillard
e3cfacb90e // link to employee default tab and not index 2013-11-07 17:00:55 +01:00
Jerome Nadaud
01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Fabio Chelly
92cf31e5c3 [-] MO : Fixed #PNM-1600 by modifying getPageLink() 2013-11-07 16:46:30 +01:00
Jerome Nadaud
b51b388eaa // Blockcategories thumnail uploader fix 2013-11-07 16:44:55 +01:00
Jerome Nadaud
18718792be // Uploader helper part 3 2013-11-07 16:42:00 +01:00
Fabio Chelly
fa7d44d67f Merge remote-tracking branch 'origin/development' into development 2013-11-07 16:39:26 +01:00
Fabio Chelly
b9c4b5d2a7 [-] FO : Prevents warning in safePostVars when $_POST has been unset 2013-11-07 16:38:53 +01:00
Gregory Roussac
fbd28f3e49 Merge pull request #942 from Jacky75/20131107_payment_and_groups
[-] FO : in multistore payment module restrictions by customer group was...
2013-11-07 06:39:57 -08:00
Daniele Giachino
8c8340db4e [-] FO : in multistore payment module restrictions by customer group was not applied to specific shop 2013-11-07 15:18:59 +01:00
gRoussac
7cc351e83d [-] BO : Fix bug #PSCFV-10932, ranges input disabled on load 2013-11-07 15:11:30 +01:00
Jérôme Nadaud
75171c77dd Merge pull request #940 from PhpMadman/bootstrap
// Fixes "Notice: Undefined index: nb_results in" when searching
2013-11-07 05:59:36 -08:00
PhpMadman
c6676197e5 // better syntax 2013-11-07 14:57:13 +01:00
PhpMadman
0a31ab8202 added check for empty value 2013-11-07 14:51:05 +01:00
Kevin Granger
3eb9a7e772 // update bootstrap + add enquire.js 2013-11-07 14:19:23 +01:00
Kevin Granger
63e31a4585 Merge pull request #939 from djfm/bootstrap
Translations (EN) / Mails / Fix Column
2013-11-07 05:08:16 -08:00
djfm
1bb550cf63 // allow hook exceptions on product comparison page 2013-11-07 13:01:54 +00:00
djfm
30624fabd2 Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap 2013-11-07 12:27:58 +00:00
djfm
598034efb4 // English 2013-11-07 12:27:48 +00:00
djfm
8cb761078b // English 2013-11-07 12:26:55 +00:00
gRoussac
91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
djfm
f83c50b264 // one is one 2013-11-07 11:08:15 +00:00
Vincent Augagneur
9e76f82fb5 //merge 2013-11-07 12:06:58 +01:00
Vincent Augagneur
3c31f1a07f //dashconfig errors return 2013-11-07 12:05:03 +01:00
gRoussac
e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +01:00
djfm
3af230118b // English 2013-11-07 10:27:50 +00:00
gRoussac
fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
Jerome Nadaud
c7249bcc84 // Done in 1.5.6.1 2013-11-07 11:05:39 +01:00
djfm
8ef9064355 Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap 2013-11-07 10:02:24 +00:00
djfm
3d22303b90 // sprintf 2013-11-07 10:01:10 +00:00
Jerome Nadaud
f3147b4e57 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-07 09:47:47 +01:00
PhpMadman
2f1a82628c // Fixes "Notice: Undefined index: nb_results in" 2013-11-07 09:00:00 +01:00
Kevin Granger
866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
gRoussac
514c087962 [*] BO : New import csv files 2013-11-06 18:38:32 +01:00
gRoussac
00887942d3 // preg_last_error not available on every stacks 2013-11-06 18:32:39 +01:00
gRoussac
afe6c9bc6f // missing dir sep on is_dir (open_basedir) 2013-11-06 18:23:01 +01:00
Kevin Granger
93717e910b // Repairs sake of performance on tables with many lines. 2013-11-06 18:15:17 +01:00
gRoussac
fc6041fa33 [-] IN : bad path in create multistore 2013-11-06 18:06:19 +01:00
gRoussac
76b03856e2 // missing trailing dir sep 2013-11-06 17:33:18 +01:00
djfm
1aadb10fb2 // English emails 2013-11-06 16:20:19 +00:00
Rémi Gaillard
ef5779f63f // d321b9a5bc 2013-11-06 17:11:31 +01:00
Jérôme Nadaud
d0522417eb Merge pull request #937 from PhpMadman/DiscountPrice
[*] FO : Added possibility to display new price instead of quantity discount
2013-11-06 08:06:16 -08:00
Rémi Gaillard
50c95f568c Merge pull request #935 from jeckyl/patch-4
Update cart-summary.js
2013-11-06 07:01:02 -08:00
Kevin Granger
df865eb827 Merge pull request #936 from TMMeilleur/bootstrap
// improved  scss variables
2013-11-06 07:00:31 -08:00
Jerome Nadaud
616cc91eb2 // Fix bug JQuery on handler 2013-11-06 15:49:44 +01:00
Jerome Nadaud
56230a1f53 // Live is deprecated in jquery 1.9 2013-11-06 15:34:46 +01:00
Jerome Nadaud
7895f8643e // Fix missing page header in combinations generator 2013-11-06 14:42:56 +01:00
jeckyl
d321b9a5bc Update cart-summary.js
Just add this space to separate this classes. It's to display or not carrier option when we select one or another carrier during order finalisation.
2013-11-06 14:42:00 +01:00
PhpMadman
d95885caae [*] FO : Added posibilty to display new price instead of quantity discount 2013-11-06 14:41:42 +01:00
TMMeilleur
211c36c7a3 improved scss variables 2013-11-06 15:41:00 +02:00
Jerome Nadaud
fcb225ac5a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 12:19:15 +01:00
Jerome Nadaud
0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Kevin Granger
05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
fchellypresta
71139df65f Merge pull request #796 from PhpMadman/patch-1
[*] BO: #PNM-1472 Changed label and transparency range check to 1
2013-11-06 03:06:47 -08:00
gRoussac
1fb8ef823d [-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl 2013-11-06 11:50:52 +01:00
Jérôme Nadaud
29001b3392 Merge pull request #930 from PhpMadman/patch-3
[-] BO : Cart was not using order reference
2013-11-06 02:30:57 -08:00
PhpMadman
eac7fbb694 [-] BO : Cart was not using order reference, corrected syntax 2013-11-06 11:06:46 +01:00
Vincent Augagneur
a890410a64 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 10:57:02 +01:00
Vincent Augagneur
c16c239953 //typo 2013-11-06 10:56:56 +01:00
Rémi Gaillard
9fa4296a06 Merge pull request #929 from djfm/bootstrap
// updated English emails: now responsive
2013-11-06 01:38:44 -08:00
Jérôme Nadaud
54db0b705c Merge pull request #923 from PrestaEdit/1.6.x-fancybox
//remove unnecessary addCSS (fancybox)
2013-11-06 00:31:57 -08:00
Jérôme Nadaud
fa4b5e0b7d Merge pull request #927 from djfm/loc
[*] LO : Added states to Spanish localization pack
2013-11-06 00:31:46 -08:00
Jérôme Nadaud
d30830f6fe Merge pull request #932 from prestalab/patch-1
// FIX: tags with UTF-8 chars
2013-11-05 23:49:43 -08:00
PrestaLab
b2e5c6090d Fixed tags with UTF-8 chars
Fixed error Tag->Name is not valid if tag in non latin chars
2013-11-05 23:33:44 -08:00
PhpMadman
2556a7bb68 [-] MO : Mailalert was not using order reference 2013-11-05 20:46:10 +01:00
PhpMadman
7226f33f90 [-] BO : Cart was not using order reference 2013-11-05 20:42:57 +01:00
Rémi Gaillard
1dd919addf // no need mobile version with responsive :) 2013-11-05 19:15:24 +01:00
djfm
f742e817da // updated English emails: now responsive 2013-11-05 18:10:31 +00:00
Rémi Gaillard
3edaee1313 // themeconfigurator 2013-11-05 19:07:42 +01:00
Rémi Gaillard
65a41a9f7a // theme configurator 2013-11-05 18:49:21 +01:00
Kevin Granger
5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Vincent Augagneur
37e0556c36 //fixed carrier logo upload 2013-11-05 18:12:53 +01:00
Vincent Augagneur
871ebe77b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 18:08:22 +01:00
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Damien Metzger
a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Kevin Granger
b68d8c5d4a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 17:15:51 +01:00
Kevin Granger
332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Vincent Augagneur
657c8f415a //small css fix 2013-11-05 17:01:38 +01:00
Vincent Augagneur
3f3a4ef342 //revert 2013-11-05 16:58:26 +01:00
Vincent Augagneur
217a9124d4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:56:08 +01:00
Vincent Augagneur
1dccee0036 //remove back button in header toolbar on carrier wizard 2013-11-05 16:56:03 +01:00
Damien Metzger
ad7dfca9e1 // RSS date on the dashboard 2013-11-05 16:55:55 +01:00
Kevin Granger
2581acd505 // fix tooltip carrier wizard 2013-11-05 16:52:41 +01:00
Kevin Granger
eb02711042 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:42:24 +01:00
Kevin Granger
e702af6a67 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-11-05 16:42:09 +01:00
Damien Metzger
9f1911eeca // Fixed shopping cart line reduction 2013-11-05 16:41:50 +01:00
Kevin Granger
533ebc0f6d // backward CSS 2013-11-05 16:40:21 +01:00
Jerome Nadaud
3f3dc0feb9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-05 16:39:12 +01:00
Rémi Gaillard
4a6cb5075e Merge pull request #924 from TMMeilleur/bootstrap
// Update default theme
2013-11-05 07:36:14 -08:00
Damien Metzger
ec528fff93 // one more groups improvement 2013-11-05 16:34:03 +01:00
Vincent Augagneur
f0e1b9b2b8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:32:12 +01:00
Vincent Augagneur
7e872aa581 //small fix 2013-11-05 16:32:05 +01:00
Damien Metzger
161c701ecf // Groups review 2013-11-05 16:30:34 +01:00
TMMeilleur
0ffa6ab059 update 5.11.13 2013-11-05 17:27:57 +02:00
TMMeilleur
21209d799f update 5.11.13 2013-11-05 17:17:26 +02:00
Damien Metzger
0bd6b940d2 // Fixed logoq 2013-11-05 16:17:14 +01:00
Damien Metzger
0e4a900d3d // Fixed group display 2013-11-05 16:13:52 +01:00
Damien Metzger
e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +01:00
Rémi Gaillard
161145fb34 // small fix 2013-11-05 15:35:14 +01:00
Rémi Gaillard
d4253b9849 // small fix 2013-11-05 15:33:21 +01:00
Damien Metzger
9bc5a52925 Merge pull request #916 from PrestaEdit/patch-58
[-] FO: use 4 images in thumbnails, not 3
2013-11-05 06:20:59 -08:00
Damien Metzger
b0ae53f823 // Changed cursor in the module position tab (for drag n drop) 2013-11-05 15:14:58 +01:00
Rémi Gaillard
b96da7e5ee Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 15:14:13 +01:00
Rémi Gaillard
a5bb0486e6 // fix email validator && allow to convert unicode without classes 2013-11-05 15:06:22 +01:00
Damien Metzger
9a86f2c32b // And now it works! 2013-11-05 15:02:36 +01:00
Damien Metzger
a5552f3f85 // Improved dashgoals configuration (tmp) 2013-11-05 14:44:42 +01:00
Kevin Granger
eb383e580e // Organize css/sass + backward compatibility WIP 2013-11-05 12:32:41 +01:00
fram
4b0b5cf4da // added an option not to override the local localization pack when installing a localization pack 2013-11-05 12:08:14 +01:00
fram
2b8d069cf9 [*] LO : Added states to Spanish localization pack 2013-11-05 12:06:31 +01:00
Rémi Gaillard
9817ef6840 // small fix on profiling 2013-11-05 11:54:22 +01:00
gRoussac
581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
gRoussac
87be153e42 [-] MO : Blockcategories last_visited_category must not be cached 2013-11-05 11:16:52 +01:00
Gregory Roussac
f85c6b59c8 Merge pull request #921 from Jacky75/20131105-layered-feature-sorted
[*] MO : Blocklayered filter feature blocks sorted
2013-11-05 01:50:48 -08:00
Daniele Giachino
99e98a5164 In multistore, layered filters about categories are not loading the category name from the proper shop 2013-11-05 10:45:23 +01:00
TMMeilleur
55cd7c4c34 update 05.11.13 2013-11-05 11:35:24 +02:00
Vincent Augagneur
1a7aa020f6 //added new configuration on dashproduct 2013-11-05 10:23:26 +01:00
Damien Metzger
4c1ad83b18 // "Fixed" strict standard 2013-11-05 10:22:39 +01:00
Vincent Augagneur
e710942833 //small fix on dashboard config save 2013-11-05 10:22:22 +01:00
Vincent Augagneur
9af3b30135 //smal fix on hookDashboardData params 2013-11-05 10:21:34 +01:00
gRoussac
26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +01:00
Jonathan Danse
9f396ada83 //remove unnecessary addCSS (fancybox) 2013-11-05 10:13:13 +01:00
Gregory Roussac
c69429c126 Merge pull request #922 from Jacky75/20131105-layered-categories-shop
[-] MO : Missing context shop for categories
2013-11-05 01:10:39 -08:00
Daniele Giachino
02c04a9884 In multistore, layered filters about categories are not loading the category name from the proper shop 2013-11-05 09:40:53 +01:00
Daniele Giachino
cf65877f3f layered filters involving features are now natural sorted 2013-11-05 09:32:36 +01:00
Daniele Giachino
f0abdca08f layered filters involving features are now natural sorted 2013-11-05 09:30:13 +01:00
Jerome Nadaud
de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Jerome Nadaud
cf44f8d0b4 // Uploader helper small fix 2013-11-04 19:50:04 +01:00
Kevin Granger
fbc93e5632 // moved admin css and backward compatibility css to admin theme css directory 2013-11-04 19:48:53 +01:00
Rémi Gaillard
569455a7ff // fix on front validators 2013-11-04 19:26:51 +01:00
Damien Metzger
8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Jerome Nadaud
fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 18:34:51 +01:00
Jerome Nadaud
bf2d54e286 // Add new uploader helper to blockcategories 2013-11-04 18:32:59 +01:00
Kevin Granger
8aedd4eb04 // Cleaned CSS files 2013-11-04 18:31:59 +01:00
Jerome Nadaud
d78a268730 // Uploader helper part 2 2013-11-04 18:31:43 +01:00
gRoussac
0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 18:27:39 +01:00
Jerome Nadaud
12276f41fb // Update image when updated 2013-11-04 18:26:24 +01:00
gRoussac
be13f82b30 [*] FO: Follow up e86c56172d 2013-11-04 18:20:01 +01:00
Rémi Gaillard
f5cc6862cb // don't die on autoload 2013-11-04 18:08:24 +01:00
Damien Metzger
2a9ebaa6ed Merge pull request #920 from djfm/bootstrap
// English emails
2013-11-04 09:07:41 -08:00
djfm
71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm
5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Jerome Nadaud
b650c349d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 17:47:46 +01:00
Jerome Nadaud
5af2ef38a1 // Fix Tagify javascript error 2013-11-04 17:47:27 +01:00
Kevin Granger
9611c17980 // removed install.css http://www.youtube.com/watch?v=Y9mq7Qc4oSM 2013-11-04 17:28:50 +01:00
Rémi Gaillard
2c3a5c553d // small fix 2013-11-04 17:23:04 +01:00
Rémi Gaillard
0a65de5e5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 17:22:21 +01:00
Rémi Gaillard
f4740088c1 // small fix 2013-11-04 17:22:08 +01:00
Kevin Granger
ddd722dc14 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 17:08:43 +01:00
Kevin Granger
667848d1df // removed csshover.htc 2013-11-04 17:08:32 +01:00
Damien Metzger
ac1f142f23 // Moved default_language 2013-11-04 17:08:17 +01:00
Damien Metzger
e8c0195ee9 // small fix merge 2013-11-04 17:04:09 +01:00
gRoussac
c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +01:00
Kevin Granger
f3fa65f9be // removed admin-ie.css 2013-11-04 16:58:27 +01:00
Kevin Granger
68cda947ed // removed login.css 2013-11-04 16:53:43 +01:00
Damien Metzger
0009556ed5 // Fixed no bootstrap for modules 2013-11-04 16:51:30 +01:00
Damien Metzger
695326bc4e // Filter search BO 2013-11-04 16:51:30 +01:00
Damien Metzger
0ddc0d9f9a Merge pull request #919 from djfm/bootstrap
// installer typography
2013-11-04 07:23:25 -08:00
fram
5f1efc6b63 // installer typography 2013-11-04 16:20:10 +01:00
Damien Metzger
d4a6148b64 // Anything but a 404 image 2013-11-04 16:09:55 +01:00
Kevin Granger
48025838df // fixs referrers 2013-11-04 16:08:38 +01:00
Kevin Granger
d0c6d86eb9 // fixs for merge 2013-11-04 15:56:24 +01:00
gRoussac
c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests 2013-11-04 15:47:29 +01:00
Francois Gaillard
a81cde11d6 [-] Classes : ProductSale - Merge fix 2013-11-04 15:35:59 +01:00
Damien Metzger
f7d346ba99 // Added more results link at the end of the BO search 2013-11-04 15:03:48 +01:00
Damien Metzger
2e80ed8de5 // Cleaned conflict 2013-11-04 14:58:17 +01:00
Vincent Augagneur
5386a4547b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:57:50 +01:00
Damien Metzger
27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +01:00
Damien Metzger
e7e4376307 // Changed "gender image" to social title in the customer (BO) 2013-11-04 14:45:36 +01:00
Kevin Granger
92bd59fbea Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:43:10 +01:00
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
Damien Metzger
f8256bc15d // Fixed module KPI 2013-11-04 14:39:53 +01:00
gRoussac
3f817e8729 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 14:31:29 +01:00
gRoussac
66f314bbb2 // missing trailing bracket in modules/productcomments/config.xml 2013-11-04 14:31:15 +01:00
Damien Metzger
d93ea846a9 // Code cleaning and small fixes 2013-11-04 14:29:31 +01:00
Rémi Gaillard
bf8cd29868 // validator on message field 2013-11-04 14:21:42 +01:00
Damien Metzger
178cd7362d // admin search code cleaning 2013-11-04 13:57:27 +01:00
Damien Metzger
0451ca5c73 // Added Addons search 2013-11-04 12:24:55 +01:00
gRoussac
b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
gRoussac
9ea79f8cb5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 11:48:25 +01:00
Rémi Gaillard
b3c54a59dd // typo 2013-11-04 11:48:30 +01:00
Rémi Gaillard
06d73554be // preg instead strpos 2013-11-04 11:39:48 +01:00
gRoussac
96a6a24a14 // move to 1.5.6.1 Installer 2013-11-04 11:11:21 +01:00
gRoussac
ad555f1d30 [-] IN : Follow up #PSCFV-10671 update messages in base and b16e4b5a8e 2013-11-04 11:10:40 +01:00
Vincent Augagneur
d571920806 //small fix 2013-11-04 11:09:53 +01:00
Gregory Roussac
4b6ee72072 Merge pull request #894 from codeurWeb/patch-6
[-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php
2013-11-04 02:02:10 -08:00
Damien Metzger
cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Rémi Gaillard
e000f8c627 // something is missing in the last commit 2013-11-04 11:00:21 +01:00
Vincent Augagneur
02367e5396 //missing file for blockwishlist module 2013-11-04 10:42:37 +01:00
Rémi Gaillard
6ef7f258ea // small fix 2013-11-04 10:34:58 +01:00
Jerome Nadaud
2be72f50d1 [-] FO : FixBug Categories description 2013-11-04 10:29:44 +01:00
Vincent Augagneur
3de663f9a1 //missing files for module followup 2013-11-04 10:20:17 +01:00
Vincent Augagneur
e03a86ad05 //homeslider new use bootstrap design 2013-11-04 10:01:29 +01:00
Rémi Gaillard
d49c4cf62e [-] BO: Fix from name when replying to customer threads 2013-11-04 09:38:12 +01:00
gRoussac
c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
gRoussac
2a3192d98c [-] IN : Refacto for update_customer_default_group bad logical 2013-11-03 14:55:25 +01:00
gRoussac
b16e4b5a8e [-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop 2013-11-03 01:49:16 +01:00
gRoussac
8f72282594 [-] IN : update_customer_default_group returning false 2013-11-02 21:51:13 +01:00
gRoussac
a5bb4f0323 [-] IN: Fix [insert order detail 1] error while upgrading 2013-11-02 20:39:53 +01:00
Rémi Gaillard
c4d18e5e9f avatar on customer threads 2013-11-02 16:01:06 +01:00
Rémi Gaillard
95b5036782 // addsharethis cache 2013-11-02 15:41:40 +01:00
Rémi Gaillard
930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard
5db9c5cdd5 // small fix 2013-11-02 09:54:37 +01:00
Kevin Granger
84be298dc5 // some W3C fixs 2013-11-01 17:25:18 +01:00
Kevin Granger
1bcb8d5c82 // sass-bootstrap 3.0.1 update 2013-11-01 16:44:55 +01:00
Kevin Granger
9c499dc8a4 // Placeholder instead of label for list filter date 2013-11-01 16:28:21 +01:00
Kevin Granger
bf781ed267 // horizontal nav 2013-11-01 15:50:33 +01:00
PrestaEdit
d4075f1267 [-] FO: use 4 images in thumbnails, not 3 2013-10-31 23:06:19 +01:00
gRoussac
062fb90c2e [-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade 2013-10-31 19:24:41 +01:00
Kevin Granger
87eb9bba26 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 19:13:53 +01:00
Kevin Granger
64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
Jerome Nadaud
9193a29a44 [+] MO : Blockcart - Add error handler on ajax function 2013-10-31 19:02:43 +01:00
Jerome Nadaud
671062af07 // Add Disable overrides to debug mode 2013-10-31 18:41:56 +01:00
Rémi Gaillard
a1696efe63 // small fix 2013-10-31 18:40:29 +01:00
Rémi Gaillard
74e92e364c // php warning 2013-10-31 18:26:09 +01:00
Damien Metzger
3669948547 // Revert to the previous lib with a trick 2013-10-31 17:53:34 +01:00
Damien Metzger
1ecc6e32ba // Try out new PEAR JSON encode 2013-10-31 17:45:02 +01:00
Damien Metzger
8670db2316 // Image sizes 2013-10-31 17:41:02 +01:00
Damien Metzger
343c9578da // Better 2013-10-31 17:15:30 +01:00
Damien Metzger
23e4e1badb // I forgot the link 2013-10-31 17:10:15 +01:00
Damien Metzger
fe78dceede // Fixed image sizes 2013-10-31 17:08:22 +01:00
Rémi Gaillard
c091729fd7 // missing directory 2013-10-31 17:03:41 +01:00
Rémi Gaillard
dc90450365 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 16:39:21 +01:00
Rémi Gaillard
a7ed5ee869 // cleaning 2013-10-31 16:39:01 +01:00
gRoussac
80c60be952 [-] BO : Do not enable rewrite url for index 2013-10-31 16:20:55 +01:00
Damien Metzger
3c1cdf4ef2 // Fixed new arrivals issue 2013-10-31 16:09:10 +01:00
Kevin Granger
ba28c5f527 // UI fixs 2013-10-31 15:49:57 +01:00
Damien Metzger
549fa9003c // Small fix with URL rewrite 2013-10-31 15:41:41 +01:00
Damien Metzger
6c8e70f780 [*] FO : added "back to search results" the the product page 2013-10-31 15:32:52 +01:00
Rémi Gaillard
1b019dffc5 // Fix lang detection on dispatcher 2013-10-31 15:28:19 +01:00
Damien Metzger
f565b273d8 // Reverting the revert 2013-10-31 15:13:46 +01:00
Damien Metzger
9a1b45a8e6 // Fixed warning and prepared next commit 2013-10-31 15:09:14 +01:00
Damien Metzger
a97e3927df Merge pull request #915 from TMMeilleur/bootstrap
// Theme update
2013-10-31 07:06:40 -07:00
TMMeilleur
68a98b29a6 tm theme 2013-10-31 15:51:25 +02:00
gRoussac
f9dc0b0252 [-] MO : Could not translate in transit mail, revert from 3213b5dffb 2013-10-31 14:20:21 +01:00
Damien Metzger
ff2954b1d2 [*] FO : Changed category block behavior inside categories 2013-10-31 12:20:59 +01:00
Kevin Granger
534421fb6b // UI fixs 2013-10-31 12:20:29 +01:00
Kevin Granger
03564fe0e5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 11:34:58 +01:00
Kevin Granger
4334364b36 // cart rules > conditions > product rules 2013-10-31 11:34:47 +01:00
Rémi Gaillard
9611ea1f70 [-] BO: Fix empty group list on changing opt or newsletter on customers listing 2013-10-31 11:22:40 +01:00
Rémi Gaillard
8a7f869515 // small graphical bug 2013-10-31 10:41:15 +01:00
Rémi Gaillard
d17515a728 // don't format currency on input 2013-10-31 10:22:38 +01:00
gRoussac
036fa7cba6 [-] FO : Fix bug #PSCFV-10889 wrong color when oos product 2013-10-31 10:18:28 +01:00
Damien Metzger
9c57c71deb Merge pull request #913 from djfm/development
// Installer Translations
2013-10-31 01:48:56 -07:00
djfm
7812731095 // removed hard-coded space before ellipsis (...) in English installer steps 2013-10-31 08:29:05 +00:00
djfm
a8a204edf3 // small correction in English installer text 2013-10-31 08:25:57 +00:00
djfm
11f60492be // removed unnecessary punctuation in English installer strings, both in source code and translations 2013-10-31 08:09:14 +00:00
gRoussac
f919cc899d [-] IN : Set conversion rate to 1 if equal 0 in base 2013-10-30 20:06:47 +01:00
Kevin Granger
09dcff959e // cart rules > conditions > product rules WIP 2013-10-30 19:25:58 +01:00
gRoussac
fbdddba753 [-] IN : Set default conversion rate to 1 not 0 2013-10-30 19:03:36 +01:00
gRoussac
cbfa8dfc30 // forgot to commit in f78cde96d6 2013-10-30 19:02:24 +01:00
gRoussac
8547f663d1 [-] BO : AdminImport withdraw separator changed in js 2013-10-30 18:46:02 +01:00
gRoussac
372130f7d7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-30 18:37:46 +01:00
gRoussac
f78cde96d6 [-] BO : AdminImport wrong group by default 2013-10-30 18:37:26 +01:00
Rémi Gaillard
ecf45d0475 // small fix 2013-10-30 18:28:55 +01:00
Jerome Nadaud
48f00b2367 [-] BO : FixBug #PSCFV-10882 - Add json encode and decode smarty modifier via tools class 2013-10-30 18:28:17 +01:00
djfm
c958436a76 // Dutch installer translations 2013-10-30 17:26:22 +00:00
Jerome Nadaud
9f2424db41 // Fix Module exception in transplant 2013-10-30 18:11:33 +01:00
djfm
a56fb7c639 // Polish installer translations 2013-10-30 17:06:52 +00:00
Rémi Gaillard
8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
djfm
16efe89bed // improved installer translations: no colons in translations and filled some missing fields 2013-10-30 16:57:30 +00:00
gRoussac
56799f53c8 [-] Bo : AdminImport customer group default 2013-10-30 17:12:20 +01:00
Jerome Nadaud
da43700361 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-30 16:48:26 +01:00
Jerome Nadaud
d7b46e80af [+] BO : Add debug mode system 2013-10-30 16:48:16 +01:00
gRoussac
b311a0c719 [-] BO : Fix bug #PSCFV-10872 AdminImport could not import supllier orders 2013-10-30 16:06:38 +01:00
Vincent Augagneur
6a3e711cff //small fix 2013-10-30 15:43:31 +01:00
Rémi Gaillard
a0f4eab4c1 // typo 2013-10-30 15:40:40 +01:00
gRoussac
9ef10ee806 [-] IN : Handle RC PHP_VERSION 2013-10-30 15:03:07 +01:00
Rémi Gaillard
b9ad576fb0 // -> mailsrc branch 2013-10-30 15:02:06 +01:00
Rémi Gaillard
f9b1545037 // missing file 2013-10-30 14:59:08 +01:00
Rémi Gaillard
c56e8471c2 [-] BO: fix the checkbox of shop activation on modules configuration 2013-10-30 14:57:15 +01:00
gRoussac
8953c55b7f [-] BO : Adminimport default customers group 2013-10-30 12:30:22 +01:00
Vincent Augagneur
ad68105467 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-30 10:52:04 +01:00
Vincent Augagneur
0020412aea //added Preactivation request on dashboard 2013-10-30 10:51:58 +01:00
Rémi Gaillard
190c14ed9d // delete src mails -> go mailsrc branch 2013-10-30 10:25:51 +01:00
Jérôme Nadaud
653c38e01a Merge pull request #911 from madef/development
[-] BO : tagify call twice if field is not translatable
2013-10-30 00:55:53 -07:00
Madef
78af47e2d3 [-] BO : tagify call twice if field is not translatable 2013-10-29 23:18:34 +01:00
gRoussac
26b4fbf883 [*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2 2013-10-29 19:07:31 +01:00
gRoussac
c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski 2013-10-29 19:05:21 +01:00
Kevin Granger
df80e6ec8b // btn-group-action adjustments 2013-10-29 18:55:33 +01:00
Kevin Granger
0b564c0107 // oups 2013-10-29 18:15:17 +01:00
Kevin Granger
aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Rémi Gaillard
6d5ca9969e // js error 2013-10-29 17:56:29 +01:00
Kevin Granger
5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
Damien Metzger
c7fe91a0a9 // Fixed traffic sources chart on dashboard 2013-10-29 16:38:40 +01:00
Gregory Roussac
90bef56c84 Merge pull request #907 from djfm/development
// Frenglish
2013-10-29 08:24:45 -07:00
Damien Metzger
34aaeee0b5 // Fixed product images on the dashboard 2013-10-29 16:17:40 +01:00
gRoussac
75cde08776 // update conf message in AdminImport 2013-10-29 16:16:55 +01:00
gRoussac
c6319a754e [-] BO : Stats are empty when no conversion rate 2013-10-29 16:04:15 +01:00
djfm
9d18ef8186 // Frenglish 2013-10-29 14:44:51 +00:00
Gregory Roussac
f58526c701 Merge pull request #905 from PhpMadman/RMARef
[-] BO : Order-follow displayed order id instead of order reference
2013-10-29 07:44:26 -07:00
Damien Metzger
d5eedd5eaa Merge pull request #906 from djfm/development
// Small fix
2013-10-29 07:42:07 -07:00
gRoussac
a43851469e [-] CORE : Currency conversion rate can not be 0 2013-10-29 15:39:17 +01:00
djfm
0288696c90 // English 2013-10-29 14:37:55 +00:00
Rémi Gaillard
64706075d5 // Fix default language on BO forms 2013-10-29 15:32:31 +01:00
Damien Metzger
4fe4d71361 // Stats cleaning 2013-10-29 15:29:55 +01:00
PhpMadman
7c1623c7fa [-] BO : Order-follow displayed order id instead of order reference 2013-10-29 14:53:50 +01:00
Damien Metzger
f06eb84d9f // Stats cleaning 2013-10-29 14:36:27 +01:00
Jérôme Nadaud
ed2fbba996 Merge pull request #903 from PhpMadman/patch-2
[-] BO : hide stmp options when selecting never send emails
2013-10-29 05:31:02 -07:00
PhpMadman
87bb957431 fixed missing comma 2013-10-29 13:28:00 +01:00
PhpMadman
7b029457e4 [-] BO : hide stmp options when selecting never send emails 2013-10-29 12:41:24 +01:00
Jerome Nadaud
b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
Jerome Nadaud
580e201c48 [-] BO : FixBug #PSCFV-9319 - display only valid order id 2013-10-29 11:38:48 +01:00
gRoussac
d409614222 [-] FO : CustomerMessage ip_address to string 2013-10-29 11:18:53 +01:00
Damien Metzger
dabb23ac8d // Added KPIs to the category page and fixed dashboard data 2013-10-29 11:03:09 +01:00
djfm
e1c7541a38 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-29 10:01:00 +00:00
gRoussac
1bee84d26c [-] BO : Do not delete other default jpg when _deleteOldImages and type defined 2013-10-29 10:57:33 +01:00
gRoussac
af61191a7e // rename field Action when out of stock 2013-10-29 10:55:46 +01:00
Rémi Gaillard
07222be5dd // demo mode on ajaxfilemanager 2013-10-29 10:53:00 +01:00
Kevin Granger
b3d7b8754b // fixs date range picker Wip 2013-10-29 10:40:33 +01:00
Jerome Nadaud
9f2580f3bd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-29 10:31:12 +01:00
Jerome Nadaud
d2e475dd3a // Removed line from merge 2013-10-29 10:30:59 +01:00
Rémi Gaillard
2b67d7072c // type of logger field 2013-10-29 10:18:29 +01:00
Gregory Roussac
b885c63564 Merge pull request #900 from kpodemski/patch-10
[*] MO: productcomments optimization
2013-10-29 02:06:56 -07:00
Gregory Roussac
d74291e5b5 Merge pull request #901 from kpodemski/patch-11
[*] MO: blocksharefb optimization
2013-10-29 02:06:25 -07:00
Jerome Nadaud
1d90218e0d // Update mailalert module version 2013-10-29 10:00:57 +01:00
Jerome Nadaud
9660cef0aa [-] MO : mailalert - Fix deprecated warning on displayDate 2013-10-29 09:58:42 +01:00
Jérôme Nadaud
4b1f198cc4 Merge pull request #899 from cedricfontaine/patch-3
Update stores.js
2013-10-29 01:43:03 -07:00
gRoussac
0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Krystian Podemski
526f32b6a0 [*] MO: blocksharefb optimization 2013-10-28 23:24:32 +01:00
Krystian Podemski
faa4a18a82 [*] MO: productcomments optimization 2013-10-28 23:21:35 +01:00
gRoussac
79cba4b655 [-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart 2013-10-28 19:00:00 +01:00
cedricfontaine
0ba8fbc39a Update stores.js
Phone number is already in the address field
2013-10-28 13:46:42 -04:00
Rémi Gaillard
edf54eb2ca // re-generate class_index on the first step of install 2013-10-28 18:43:02 +01:00
Jerome Nadaud
dd10301413 // Fix tagify key events 2013-10-28 17:46:00 +01:00
gRoussac
e86c56172d [*] FO: Can not establish purchase total when tax incl. 2013-10-28 17:42:23 +01:00
Jerome Nadaud
38f034f4e0 // Remove header and footer display when ajax 2013-10-28 17:10:53 +01:00
Jerome Nadaud
a466c6f5f7 // Add tagify system to product information 2013-10-28 16:32:17 +01:00
Kevin Granger
3798adff2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 16:19:02 +01:00
Kevin Granger
d523d739e7 // dashboard date range picker wip 2013-10-28 16:18:43 +01:00
Jerome Nadaud
5760718b85 // Add Save button to page header toolbar 2013-10-28 15:55:58 +01:00
Rémi Gaillard
1454a0d26a // search type in BO 2013-10-28 15:32:26 +01:00
Jerome Nadaud
48b7a49b1a // Product image upload failed with bad content-type header 2013-10-28 14:58:19 +01:00
Gregory Roussac
12a257db7a Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri
[-] MO : homeslider stores slider about multistore with virtual uri
2013-10-28 06:53:41 -07:00
Sarah Lorenzini
63141a9c4d [-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden. 2013-10-28 14:48:48 +01:00
Daniele Giachino
c84689ec71 homeslider stores slider about multistore with virtual uri 2013-10-28 14:09:35 +01:00
Damien Metzger
0aea146a4c // Code cleaning stats modules 2013-10-28 13:39:39 +01:00
Damien Metzger
9c54dcce66 // Fixed default stats graph engine 2013-10-28 12:15:35 +01:00
Damien Metzger
08732eda50 // Fixed default selection in the stats submenu 2013-10-28 12:08:46 +01:00
Damien Metzger
b6799d4f2f [*] BO : download attachments directly from the list 2013-10-28 11:57:40 +01:00
gRoussac
4103339f53 [-] BO : AdminImport, fix bug from 84454bbc1c (commitcomment-4418502) 2013-10-28 11:21:25 +01:00
Gregory Roussac
9a879bc133 Merge pull request #897 from freedayko/development
[*] BO : improved unicode characters replacement in URLs
2013-10-28 03:09:16 -07:00
Damien Metzger
79b7521cac Merge pull request #892 from djfm/bootstrap
// small fixes in English Email php templates
2013-10-28 02:21:50 -07:00
Kevin Granger
7126397bfe // fix scroll vertical nav 2013-10-28 10:13:35 +01:00
djfm
4f8d153469 // fixed links in new English mails 2013-10-28 08:57:59 +00:00
djfm
38f45e3b2c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 08:49:24 +00:00
Kevin Granger
8353bc5ac2 // fix attributes-color-container 2013-10-28 09:32:46 +01:00
gRoussac
e1d1479f22 [*] FO : Fix bug #PSCFV-10689 handle image legend 2013-10-27 23:31:36 +01:00
gRoussac
2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
gRoussac
9a3cfece69 //missing line feed after disable_modsec 2013-10-27 16:05:55 +01:00
Aleksander Palyan
ee06d3114d [*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added) 2013-10-27 15:05:49 +02:00
gRoussac
c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande 2013-10-27 13:28:34 +01:00
Julien
0bc1d21432 [-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php
These files not exists :
 - /js/jquery/jquery-ui-1.8.10.custom.min.js
 - /css/jquery-ui-1.8.10.custom.css
2013-10-26 15:08:07 +02:00
Damien Metzger
6f04df8409 // Fixed icon 2013-10-25 19:06:03 +02:00
Damien Metzger
39f6a2354a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
2013-10-25 18:58:07 +02:00
Damien Metzger
03857c0576 [*] BO : you can know download the previous file near the upload file input 2013-10-25 18:55:25 +02:00
Rémi Gaillard
8b1f9d0560 // small changes on admincms 2013-10-25 18:42:54 +02:00
Jerome Nadaud
8be88324f9 // Add internet explorer 9 Compat 2013-10-25 18:13:25 +02:00
Damien Metzger
e9a802cf23 [*] BO : Added the number of associated products in the product attachments list 2013-10-25 18:04:27 +02:00
gRoussac
4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
Jerome Nadaud
5ea880b793 // XHTML norm 2013-10-25 17:37:08 +02:00
gRoussac
025b62f995 // norms 2013-10-25 17:33:44 +02:00
Rémi Gaillard
c67e71ca59 // layout fix 2013-10-25 17:30:10 +02:00
Kevin Granger
50bc046671 // fix panel header tree actions (search + button) 2013-10-25 17:24:49 +02:00
Fabio Chelly
8f6a5bb3a1 Merge remote-tracking branch 'origin/development' into development 2013-10-25 17:01:51 +02:00
Fabio Chelly
a7d0794c43 [-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors 2013-10-25 17:01:28 +02:00
Gregory Roussac
6359c1ca33 Merge pull request #893 from neemzy/development
[*] FO : Turned "true" and "false" strings to proper booleans in address.tpl
2013-10-25 07:42:59 -07:00
Tom Panier
9a26cf02a8 Turned "true" and "false" strings to proper booleans
It's cleaner this way, and matches how it is done on similar templates.
2013-10-25 16:36:39 +02:00
Rémi Gaillard
180b180aee // small changes 2013-10-25 16:24:57 +02:00
Rémi Gaillard
5ac471deaf // product toolbar 2013-10-25 16:11:33 +02:00
Jerome Nadaud
f472f3e848 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 15:55:39 +02:00
Jerome Nadaud
f89c8ed008 // Fix HelperUploader images params 2013-10-25 15:54:53 +02:00
gRoussac
eb8ea1cba5 [-] CORE : SetEnv in if statement 2013-10-25 15:29:15 +02:00
Damien Metzger
aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-10-25 15:22:01 +02:00
gRoussac
4e6585a1b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-25 15:21:55 +02:00
gRoussac
a03efe152c [-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces 2013-10-25 15:21:40 +02:00
Damien Metzger
e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Sarah Lorenzini
a49cc68b72 // news design sendtoafriend mails template 2013-10-25 15:01:05 +02:00
Kevin Granger
cae4770e0f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 14:58:30 +02:00
Rémi Gaillard
7aeba25f99 // class_index 2013-10-25 14:58:11 +02:00
Kevin Granger
339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Sarah Lorenzini
f73716f902 // new design for referralprogram mails template 2013-10-25 14:56:34 +02:00
Rémi Gaillard
59a1105fce // small fix on multishop checkboxes 2013-10-25 14:55:27 +02:00
Jerome Nadaud
81482df1e5 // Fix merge 2013-10-25 14:33:29 +02:00
djfm
3a749823bb // small fixes in English Email php templates 2013-10-25 12:29:39 +00:00
Jerome Nadaud
08baa71a05 // Fix on color field in list 2013-10-25 14:29:30 +02:00
Jerome Nadaud
8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	controllers/admin/AdminCategoriesController.php
2013-10-25 14:29:02 +02:00
Jerome Nadaud
bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Jerome Nadaud
52795495bd //Starting Uploader helper 2013-10-25 14:19:51 +02:00
Rémi Gaillard
3997543e7f // notice 2013-10-25 11:35:01 +02:00
Damien Metzger
087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Damien Metzger
d59c83e64d Merge pull request #888 from djfm/bootstrap
[+] FO: New E-Mail templates!
2013-10-25 02:18:04 -07:00
djfm
dd009f133f // fixes in php mail templates 2013-10-25 09:13:24 +00:00
Kevin Granger
ddf65f3b97 // toolbar nav fixs 2013-10-25 10:33:45 +02:00
Damien Metzger
0ca5a24e84 // Added field (bootstrap) size in helper form 2013-10-25 10:16:39 +02:00
Jerome Nadaud
139ee8f62d // Move back button to left 2013-10-25 09:29:42 +02:00
Jerome Nadaud
3850cc94d5 // Align save button to right 2013-10-25 09:18:00 +02:00
gRoussac
942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array 2013-10-25 00:01:25 +02:00
gRoussac
1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
gRoussac
a9643c80c3 // bad commit sorry 2013-10-24 22:45:43 +02:00
gRoussac
438a3dda2b [-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update 2013-10-24 22:42:13 +02:00
gRoussac
4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 2013-10-24 21:59:32 +02:00
gRoussac
97ef888345 [-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled 2013-10-24 21:28:22 +02:00
Kevin Granger
acfc3bc266 // fixe buttons group wrap 2013-10-24 19:34:25 +02:00
Damien Metzger
cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Damien Metzger
4cb7bd9137 // Changed label 2013-10-24 19:19:20 +02:00
Damien Metzger
8748b0d240 // Small improvements 2013-10-24 19:12:50 +02:00
Jerome Nadaud
279cb99a4e // Add regenerate option to thumbnail creation 2013-10-24 18:52:10 +02:00
Gregory Roussac
4207bdff32 Merge pull request #890 from indesign47/patch-14
[-] BO : AdminImport change width height depth
2013-10-24 09:43:54 -07:00
Jerome Nadaud
6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
indesign47
8cb1806e49 // small fixes for Width Height Depth
change
0,1;0,2;0,3
to
1,2,3
2013-10-24 18:13:05 +02:00
Damien Metzger
f3d74c9461 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-10-24 18:13:04 +02:00
gRoussac
759fe2f671 // norms 2013-10-24 18:09:21 +02:00
Damien Metzger
5ff406cdb8 // css 2013-10-24 18:09:11 +02:00
Gregory Roussac
0416aca547 Merge pull request #889 from PhpMadman/PSCFV-10728
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 09:06:43 -07:00
Kevin Granger
5c3058d45b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-24 18:02:42 +02:00
Kevin Granger
e3dad946e3 // fixs 2013-10-24 18:02:13 +02:00
Rémi Gaillard
cc3363011e // rewrited urls for feeder module 2013-10-24 17:54:44 +02:00
Sarah Lorenzini
e6d0fe60c3 // new design for mailalerts mails template 2013-10-24 17:54:32 +02:00
Kevin Granger
a02c31f106 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-10-24 17:53:30 +02:00
Damien Metzger
f6dd4a9ee4 // Code review 2013-10-24 17:49:18 +02:00
Kevin Granger
32d146d880 // admin orders 2013-10-24 17:36:50 +02:00
Sarah Lorenzini
1a7f9e6c11 // new design for blockwishlist mails template 2013-10-24 17:35:37 +02:00
Sarah Lorenzini
005a57b077 // new design for blocknewsletter mails template 2013-10-24 17:28:37 +02:00
Vincent Augagneur
6a552be7dd //followup now use bootstrap design 2013-10-24 17:23:40 +02:00
PhpMadman
c516035e0e [-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO 2013-10-24 17:19:28 +02:00
Damien Metzger
b548f72ac5 // Attributes and values => Product Attributes 2013-10-24 17:18:45 +02:00
Jerome Nadaud
ea7b8b175e // Fix list title 2013-10-24 17:18:14 +02:00
Damien Metzger
c39a74e479 // Renamed Feature into Product Features 2013-10-24 17:07:47 +02:00
Damien Metzger
df639337af // Code cleaning and small fixes 2013-10-24 17:04:55 +02:00
Vincent Augagneur
f82322e426 //typo 2013-10-24 16:51:55 +02:00
Damien Metzger
d2ff076eb1 // Removed useless alert 2013-10-24 16:43:41 +02:00
Damien Metzger
2931c20914 // Fixed rounding 2013-10-24 16:38:48 +02:00
gRoussac
c5324a653b [-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x 2013-10-24 16:31:50 +02:00
Rémi Gaillard
3cd702da42 [-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793 2013-10-24 16:30:02 +02:00
djfm
c8e75eec03 // fixed indentation in e-mail html templates 2013-10-24 14:25:17 +00:00
Gregory Roussac
65401efcb6 Merge pull request #887 from indesign47/patch-13
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 07:22:57 -07:00
Sarah Lorenzini
a44cdf785e // new design for followup module mail 2013-10-24 16:18:52 +02:00
indesign47
84454bbc1c [*] BO : AdminImport add img manufacturers-suppliers 2013-10-24 16:16:29 +02:00
djfm
0603c54756 [*] LO : New English E-Mail templates by SuperSarah 2013-10-24 14:15:19 +00:00
Gregory Roussac
3f11dde2f6 Merge pull request #886 from djfm/bootstrap
//emails
2013-10-24 07:09:10 -07:00
djfm
572f7c725d // small html fix 2013-10-24 14:04:50 +00:00
djfm
3e8330dcb3 // small fixes on php email templates 2013-10-24 13:58:14 +00:00
indesign47
f0ed5a303c [*] BO : AdminImport add img suppliers 2013-10-24 15:49:56 +02:00
indesign47
4803530eed [*] BO : AdminImport add img manufacturers 2013-10-24 15:47:31 +02:00
indesign47
ea8a5277f2 [*] BO : AdminImport add img manufacturers-suppliers 2013-10-24 15:44:11 +02:00
Rémi Gaillard
667647f891 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-24 15:23:25 +02:00
Rémi Gaillard
691e45a168 // delete useless file 2013-10-24 15:23:03 +02:00
Damien Metzger
6a2e847970 // dashboard improvements 2013-10-24 15:04:06 +02:00
Damien Metzger
a9f75a02a7 // Added missing icons for modules 2013-10-24 14:15:44 +02:00
Damien Metzger
a1df97776a // Set default values 2013-10-24 13:54:55 +02:00
gRoussac
2ffc296279 FO : https://github.com/PrestaShop/PrestaShop/pull/878 2013-10-24 12:03:33 +02:00
Rémi Gaillard
971722a13f // note updated by ajax in admincustomers should be url encoded 2013-10-24 11:56:50 +02:00
Rémi Gaillard
4bfd8dee11 // note updated by ajax in admincustomers should be url encoded 2013-10-24 11:51:48 +02:00
Damien Metzger
dd6aa1a077 Merge pull request #881 from emilien-puget/bootstrap
// changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 02:49:34 -07:00
gRoussac
fc9b39968b // remove notice 2013-10-24 11:46:09 +02:00
emilien-puget
92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR 2013-10-24 11:44:52 +02:00
Damien Metzger
a34784a15d // Fixed chart for period before the store creation 2013-10-24 11:17:33 +02:00
Damien Metzger
d173b2d4cd Merge pull request #880 from djfm/bootstrap
// use automatic path for css in mail template header
2013-10-24 01:45:41 -07:00
djfm
baed28f1a7 // use automatic path for css in mail template header 2013-10-24 08:37:08 +00:00
Rémi Gaillard
9a7c3dd88f // small fix 2013-10-24 10:14:44 +02:00
gRoussac
81945cef71 [-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879 2013-10-24 10:00:19 +02:00
Gregory Roussac
1cc0134ec3 Merge pull request #879 from neemzy/development
[-] FO : OPC hide VAT fields fail if there are no company fields
2013-10-24 00:55:55 -07:00
Fabio Chelly
b9de912dd3 [-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign 2013-10-24 09:53:16 +02:00
Damien Metzger
e17dd1fdde // theme installation 2013-10-24 09:49:46 +02:00
Tom Panier
6d3640e895 Conditions to hide VAT fields fail if there are no company fields
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.

This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
2013-10-24 09:43:50 +02:00
Sarah Lorenzini
d9382a0a5b // update mail template 2013-10-24 09:28:04 +02:00
Damien Metzger
9e0125d0b6 // theme installation 2013-10-23 19:09:14 +02:00
gRoussac
56693da6e0 // remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702 2013-10-23 19:02:13 +02:00
Kevin Granger
7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
gRoussac
3e33a259ef [-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base 2013-10-23 18:33:37 +02:00
Rémi Gaillard
e1887425fa [*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import 2013-10-23 18:22:53 +02:00
gRoussac
8e506ddff2 [-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts 2013-10-23 18:16:45 +02:00
Vincent Augagneur
b38073ad72 //watermark now use bootstrap design 2013-10-23 18:01:23 +02:00
Sarah Lorenzini
7a23c169d6 // update css mail template 2013-10-23 17:58:28 +02:00
Sarah Lorenzini
45bd281504 // update mail templates 2013-10-23 17:53:54 +02:00
Gregory Roussac
c72c44f153 Merge pull request #877 from djfm/bootstrap
// English
2013-10-23 08:46:16 -07:00
djfm
52622e6be2 // English 2013-10-23 15:33:15 +00:00
Damien Metzger
758b5f7241 // Started to adapt the install to the new template 2013-10-23 17:29:59 +02:00
Damien Metzger
69d5cb4ccd [+] FO : New Responsive, Bootstrap template 2013-10-23 16:56:02 +02:00
Jerome Nadaud
16dfea95e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 16:49:05 +02:00
Jerome Nadaud
a27f8bc999 // Fix Stats datepicker 2013-10-23 16:48:55 +02:00
Damien Metzger
466699edcb // Add units to goals configuration 2013-10-23 16:36:04 +02:00
gRoussac
03ad842697 [-] BO : Fix bug #PSCFV-10790, Customer group names not exploded 2013-10-23 16:07:28 +02:00
Damien Metzger
9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Rémi Gaillard
554ab9414f [-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context 2013-10-23 15:08:02 +02:00
Jerome Nadaud
ff3455be78 // Products combinations form bootstraping 2013-10-23 15:03:28 +02:00
Rémi Gaillard
747ec9a2c4 // notice on carrierwizard when step back 2013-10-23 14:50:30 +02:00
Jerome Nadaud
c30d103410 // Check if exist children opt. in employees 2013-10-23 14:49:22 +02:00
Jerome Nadaud
fee2da6980 // Add sublime project file to gitignore 2013-10-23 14:35:24 +02:00
Rémi Gaillard
be1299d8d7 // small fix 2013-10-23 14:19:19 +02:00
Jerome Nadaud
4e1b4cdf90 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 12:11:10 +02:00
Jerome Nadaud
0bf6410773 //Fix save and stay combinations problem 2013-10-23 12:10:36 +02:00
Rémi Gaillard
2279b959fe // small changes on orders view 2013-10-23 12:10:02 +02:00
Gregory Roussac
2f5e15e2b1 Merge pull request #874 from PhpMadman/patch-5
[-] FO: Mobile theme removed width on message product select
2013-10-23 03:04:25 -07:00
Rémi Gaillard
8662ef12b4 // small changes on orders view 2013-10-23 11:59:28 +02:00
PhpMadman
373604fc97 [-] FO: removed width on message product select
Limiting select could make the user think the select is not working if they click to much to the left on bigger screens
2013-10-23 11:52:35 +02:00
gRoussac
101b37b40a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-23 11:45:26 +02:00
gRoussac
ad4ecefcf9 [-] FO : Prevent fatal error on getUniqReference when order not loaded 2013-10-23 11:44:12 +02:00
Kevin Granger
5ee716ff9e // fix admin edit countries 2013-10-23 11:18:31 +02:00
Fabio Chelly
3e999ab591 [-] MO blockcart
#PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js
2013-10-23 10:56:48 +02:00
Fabio Chelly
010ad76e6f Merge remote-tracking branch 'origin/development' into development 2013-10-23 10:55:35 +02:00
Fabio Chelly
5fd3ad5adf [*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop 2013-10-23 10:55:23 +02:00
Jerome Nadaud
45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Rémi Gaillard
6cddb57ce3 [-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724 2013-10-23 10:34:00 +02:00
Sarah Lorenzini
9a7af80943 // update mail templates 2013-10-23 10:13:57 +02:00
Vincent Augagneur
c61cec9f2a //display date on dashproducts && added param date_from & date_to on dashboard hooks 2013-10-23 09:59:16 +02:00
Vincent Augagneur
48a70cc8ac Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 09:57:47 +02:00
Vincent Augagneur
3ec3bf587e //small fix on cache_id in classe Hook 2013-10-23 09:38:22 +02:00
Damien Metzger
9d3f3d1876 // Fixed warning in admin customer tpl 2013-10-23 09:32:48 +02:00
gRoussac
ae63336a37 [-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category 2013-10-23 01:41:05 +02:00
gRoussac
feca06417f // definition on addFeatureValueImport 2013-10-23 01:23:35 +02:00
gRoussac
5d28d38a22 [-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features 2013-10-23 01:18:09 +02:00
Damien Metzger
a2be0364da // First draft goals 2013-10-22 19:59:18 +02:00
Gregory Roussac
398548fecf Merge pull request #864 from samy-r/features-duplication-escaping
[-] CORE : pSQL for feature values
2013-10-22 10:20:44 -07:00
Gregory Roussac
83d4d0d258 Merge pull request #872 from ldecoker/patch-11
[-] PDF : {else if} instead of {elseif} (B2B invoice template)
2013-10-22 10:19:31 -07:00
Gregory Roussac
c401e61b81 Merge pull request #871 from ldecoker/patch-10
[-] PDF  : {else if} instead of {elseif}
2013-10-22 10:18:57 -07:00
Gregory Roussac
5bb4d48ddd Merge pull request #870 from djfm/development
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
Gregory Roussac
e557db6429 Merge pull request #866 from studiokiwik/sk-ps15x-007
[-] MO : Loyalty if customer is logged do not recreate it
2013-10-22 10:15:55 -07:00
Jerome Nadaud
2c94e6c042 // Add level depth restriction on blockcategories 2013-10-22 19:13:10 +02:00
Jerome Nadaud
dfa59fa8f7 // Fix blockcategories 2013-10-22 19:04:11 +02:00
ldecoker
ce4170574c [PDF] [-] {else if} instead of {elseif} (B2B invoice template) 2013-10-22 18:57:12 +02:00
ldecoker
e6e2db8400 [PDF] [-] {else if} instead of {elseif} 2013-10-22 18:55:32 +02:00
Vincent Augagneur
537bfb0520 //dash configuration cancel button added 2013-10-22 18:04:08 +02:00
Jerome Nadaud
766d0e01f4 // Adding reset button to form template 2013-10-22 18:00:39 +02:00
Jerome Nadaud
67fc91e2c9 // Categories thumbnails 2013-10-22 17:43:10 +02:00
Damien Metzger
3539a779f8 // Oops 2013-10-22 17:32:02 +02:00
Damien Metzger
4e8ba711d9 // Oops 2013-10-22 17:15:08 +02:00
Gregory Roussac
70d2e6e10b Merge pull request #868 from ldecoker/patch-8
[-] BO : Notices onBO translation page
2013-10-22 08:03:06 -07:00
ldecoker
7cbaada844 [BO][-] Notice messages when accessing the BO translation page
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018

Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026

It's because the variable $this->theme_selected is not set for that case.
2013-10-22 17:00:56 +02:00
Gregory Roussac
bc7e8eb355 Merge pull request #867 from PhpMadman/patch-4
[-] FO: Removed missplaced </li> on mobile theme
2013-10-22 07:50:21 -07:00
Sarah Lorenzini
cc1dd2510a // mail template src 2013-10-22 16:24:16 +02:00
Jerome Nadaud
c458e059d5 // Fix hook list problem on multishop 2013-10-22 16:18:50 +02:00
Fabio Chelly
bc38b542fe Merge remote-tracking branch 'origin/development' into development 2013-10-22 15:53:43 +02:00
Fabio Chelly
2989538ce1 [*] BO Module mailalerts: send e-mail to merchand when product is out of stock 2013-10-22 15:53:20 +02:00
Sarah Lorenzini
32a85007df // update mail templates 2013-10-22 15:45:33 +02:00
Damien Metzger
04f0545254 // forgot to rename a field 2013-10-22 15:37:33 +02:00
Damien Metzger
1323befe2f // Add link to profitability conf 2013-10-22 15:36:46 +02:00
Damien Metzger
8ef9e71966 // Refine dashboard net profits 2013-10-22 15:16:22 +02:00
Vincent Augagneur
fea7cd5983 //helper list must be wrapped by a form even if it's a simple header 2013-10-22 14:48:44 +02:00
Damien Metzger
b4499937d8 // Comparison is optionnal 2013-10-22 14:15:10 +02:00
Damien Metzger
a4eeff4cd7 // Shortcuts for chart selection 2013-10-22 14:07:19 +02:00
Jerome Nadaud
a7c7bc68a3 // Fix products form content 2013-10-22 13:38:47 +02:00
PhpMadman
e857fb5978 [*] FO: Removed missplaced </li> on mobile theme 2013-10-22 13:34:52 +02:00
Jerome Nadaud
c307eb7ece // Date range picker fix 2013-10-22 12:29:17 +02:00
gRoussac
1ae587475b [-] MO : Fix bug #PSCFV-10787, cms associated to all shops 2013-10-22 12:19:58 +02:00
Jerome Nadaud
a8db1f3030 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-22 12:13:37 +02:00
Jerome Nadaud
b6d6336e26 // Add date subtitle 2013-10-22 12:12:41 +02:00
Damien Metzger
857c66454b // Typo 2013-10-22 11:47:47 +02:00
Damien Metzger
16cf10d586 // New profitability calculation 2013-10-22 11:39:57 +02:00
Jerome Nadaud
d8d9436f51 // add date change trigger 2013-10-22 11:35:24 +02:00
gRoussac
d20aea0563 [-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced 2013-10-22 11:27:45 +02:00
Jerome Nadaud
73e9d966a6 // list bulk actions fix 2013-10-22 11:24:50 +02:00
Rémi Gaillard
c6997bd525 // move clear cache of color list 2013-10-22 11:09:55 +02:00
Gaelle ITZKOVITZ
ce8d01ad4c [-] MO : if customer is logged we do not recreate it 2013-10-22 11:09:53 +02:00
Jerome Nadaud
96766a311e // Unify form fields for image preferences 2013-10-22 10:10:15 +02: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
gRoussac
2aa52356ad [-] BO : Fix bug #PSCFV-10607 one upload name 2013-10-22 09:39:59 +02:00
Jerome Nadaud
3ba337f19a // Image preference bootstraping 2013-10-22 09:25:05 +02:00
Vincent Augagneur
a62f9169d5 //missing file btn-primary => btn btn-default 2013-10-22 09:15:46 +02:00
Vincent Augagneur
8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00
Vincent Augagneur
6bc9b54306 //small fix - added new link on block top menu 2013-10-21 22:29:56 +02:00
Jerome Nadaud
fb167d94f9 // Remove duplicate class 2013-10-21 19:13:19 +02:00
Damien Metzger
e8f68441db // Assigned shop phone to frontend smarty 2013-10-21 19:02:25 +02:00
Kevin Granger
fadbc4c250 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 19:00:18 +02:00
Kevin Granger
c89f6c1adb // css fix 2013-10-21 18:58:23 +02:00
Jerome Nadaud
f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Jerome Nadaud
766e409476 // Wrong end block position 2013-10-21 18:34:03 +02:00
Damien Metzger
bf6c57063c // Fixed dashboard style 2013-10-21 18:18:48 +02:00
Damien Metzger
58aa64fab7 // Code cleaning 2013-10-21 18:18:48 +02:00
Kevin Granger
3ae1f68b3b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 18:03:15 +02:00
Kevin Granger
2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
Jerome Nadaud
d6ad300625 // List pagination improvements 2013-10-21 17:59:48 +02:00
gRoussac
c1ecf43be8 [-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE 2013-10-21 17:39:20 +02:00
Damien Metzger
e7b901ce34 // Smaller update notification 2013-10-21 17:24:34 +02:00
Jerome Nadaud
f0104dc726 // Wait 1s for ajax element close 2013-10-21 17:22:42 +02:00
Jerome Nadaud
5f75439a6b // Date range picker improvements 2013-10-21 17:07:57 +02:00
gRoussac
aefa821d7f [*] MO : TM - Blockcart added Layer 2013-10-21 16:55:47 +02:00
gRoussac
16ffbd8ee5 // norms 2013-10-21 16:46:22 +02:00
gRoussac
61884ec223 // norms 2013-10-21 16:31:56 +02:00
Damien Metzger
3cf5c9968b // Added images to blockmanufacturers 2013-10-21 15:39:14 +02:00
gRoussac
a05c748e81 // addJqueryPlugin receives array in first argument 2013-10-21 15:05:03 +02:00
Vincent Augagneur
10473e09ad Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 14:51:25 +02:00
Vincent Augagneur
150c6e0130 [+] CORE : helperList action can be rendered from module classe 2013-10-21 14:51:14 +02:00
gRoussac
a9e45fccf3 [-] MO : ScrollTo not loaded 2013-10-21 14:35:23 +02:00
gRoussac
d25b41ef97 [-] BO : wrong csv files name 2013-10-21 14:34:59 +02:00
Samy Rabih
5d8c0a0fc2 duplicateFeatures doesn't protect feature values
The features values are not protected using pSQL during the features
duplication
2013-10-21 14:08:30 +02:00
Jerome Nadaud
7fbf6c7de0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 13:45:50 +02:00
Jerome Nadaud
e53e63c257 // Add Back button to list footer 2013-10-21 13:45:39 +02:00
gRoussac
7c7fe5dc0b // small change 2013-10-21 12:39:48 +02:00
Jerome Nadaud
53a7b75d7a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 12:36:02 +02:00
Jerome Nadaud
101df4c0b9 // Add check list filters value 2013-10-21 12:35:57 +02:00
gRoussac
15cd0b9fbc [-] BO : Report of fd86a29c5c 2013-10-21 12:21:49 +02:00
Kevin Granger
957f9f0467 // categories group 2013-10-21 12:21:35 +02:00
Jerome Nadaud
b141975d57 // Fix fields_list check 2013-10-21 11:49:08 +02:00
Jerome Nadaud
9c4b975cfc //Module uploader bootstraping 2013-10-21 11:31:50 +02:00
Jerome Nadaud
693a2aa8ff Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 11:25:05 +02:00
Jerome Nadaud
81042db718 // CSV import uploader bootstraping 2013-10-21 11:24:56 +02:00
Vincent Augagneur
9cf2fe4214 //removed commented code 2013-10-21 10:24:20 +02:00
Gregory Roussac
3dea171047 Merge pull request #862 from PhpMadman/patch-3
[-] PDF : Removed unused code in FrontOffice PDF Invoice
2013-10-21 01:15:39 -07:00
PhpMadman
35df3f463c Removed unsed code
I looked through the code. And I can't see that that code is used. everything is handled in PDF class.
2013-10-21 10:10:28 +02:00
Vincent Augagneur
459d0232a4 //blockcms use boostrap design 2013-10-21 10:08:45 +02:00
Vincent Augagneur
e058224cf2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 09:58:18 +02:00
Vincent Augagneur
103582be33 //blocklink now use bootstrap design 2013-10-21 09:58:08 +02:00
Jerome Nadaud
6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +02:00
Kevin Granger
a5ca6f11a7 // css email 2013-10-21 09:51:46 +02:00
Vincent Augagneur
fd86a29c5c //small fix 2013-10-21 09:50:20 +02:00
Rémi Gaillard
198e75245d [-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273 2013-10-21 09:41:00 +02:00
Gregory Roussac
8ef22c3548 Merge pull request #823 from kpodemski/patch-8
[*] IN: Add phone_mobile to address format
2013-10-20 16:40:16 -07:00
gRoussac
9b8a7edad8 // small refacto 2013-10-21 01:05:18 +02:00
gRoussac
332c8ff49f [-] CORE : Fix bug #PSCFV-10687 again, #PSCFV-10752 replaceAccentedChars() // sorry for that 2013-10-21 00:28:41 +02:00
gRoussac
c9d20f35b3 // norms 2013-10-21 00:00:17 +02:00
gRoussac
f2d70076bd [-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration 2013-10-20 23:52:48 +02:00
PrestaEdit
6633f40a7a // .bak 2013-10-19 17:21:46 +02:00
J. Danse
02029b1006 //ignore .bak 2013-10-19 13:11:39 +02:00
Kevin Granger
1f02bcaa75 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 19:07:15 +02:00
Kevin Granger
067eecdc70 // small fix 2013-10-18 19:07:03 +02:00
Jerome Nadaud
cdab5ed6c9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
2013-10-18 18:47:42 +02:00
Jerome Nadaud
7e176b157b // Fix save and preview button 2013-10-18 18:44:13 +02:00
Gregory Roussac
c36625a136 Merge pull request #851 from PrestanceDesign/patch-1
[*] BO : Adding a title tag to display the module name on hover like PS ...
2013-10-18 09:42:57 -07:00
Kevin Granger
04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 18:38:17 +02:00
Kevin Granger
5f52a9e171 // fix products 2013-10-18 18:38:02 +02:00
gRoussac
5daa79c1e1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-18 18:36:51 +02:00
gRoussac
8ef1e043af [*] BO : chmod 664 to config.xml file 2013-10-18 18:36:30 +02:00
Damien Metzger
d1a2c33322 Merge pull request #849 from djfm/bootstrap
// Translations fix
2013-10-18 09:35:20 -07:00
Jerome Nadaud
6c37efdb6a // Categories image upload bootstraping 2013-10-18 18:33:32 +02:00
Jerome Nadaud
ff81667b5c // Image thumnail fix 2013-10-18 18:28:57 +02:00
Jerome Nadaud
667353d43f // Store contacts bootstraping 2013-10-18 18:24:21 +02:00
PrestanceDesign
6965bb29c1 [*] BO : Adding a title tag to display the module name on hover like PS 1.4 2013-10-18 18:20:15 +02:00
Jerome Nadaud
1c1fb5fb5c // Update image fix 2013-10-18 17:59:45 +02:00
Jerome Nadaud
ed2546d07c // Define language dir constant 2013-10-18 17:59:34 +02:00
Jerome Nadaud
1bee0087c0 // Update image fix 2013-10-18 17:50:36 +02:00
Fabio Chelly
72ccc90cc9 Merge remote-tracking branch 'origin/development' into development 2013-10-18 17:49:14 +02:00
Fabio Chelly
7133e74c17 [-] MO mailalerts: module mailalerts shows all messages regarding the order
PNM-1632 - MailAlert does not show Paypal error message if order has comments
2013-10-18 17:49:00 +02:00
Jerome Nadaud
964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud
0599d4f056 // Fix Localization page header title 2013-10-18 17:41:10 +02:00
Jerome Nadaud
785fe814bc // Define Order state dir constante 2013-10-18 17:40:49 +02:00
Jerome Nadaud
ac112c38df // File imput improvement 2013-10-18 17:32:29 +02:00
Damien Metzger
9dfecbb1b8 // Fixed addons url 2013-10-18 17:05:04 +02:00
djfm
5a3d487e9f // sprintf again 2013-10-18 14:31:48 +00:00
djfm
d097679ea0 // improvements to producttooltip texts 2013-10-18 14:16:17 +00:00
djfm
b5b18b9d2b // use sprintf 2013-10-18 13:55:30 +00:00
Rémi Gaillard
23abf712ec // missing files 2013-10-18 15:53:05 +02:00
Rémi Gaillard
d61d2b6627 // rm 1.4 controllers - RIP 2013-10-18 15:50:12 +02:00
gRoussac
2e2151a1bb [-] CORE : error_get_last > PHP 5.1 2013-10-18 15:29:12 +02:00
djfm
06b80701c0 // labels 2013-10-18 13:04:49 +00:00
djfm
f31eb37f37 // improved translations in carriercompare 2013-10-18 12:53:16 +00:00
djfm
3e687cd533 // improved some messages 2013-10-18 12:17:23 +00:00
Rémi Gaillard
8a682081de // typo 2013-10-18 12:17:51 +02:00
Damien Metzger
316f10a352 // Changed calibration of the dashboard chart 2013-10-18 12:15:37 +02:00
Damien Metzger
1cd9ceca35 // Compare data on the chart 2013-10-18 12:10:06 +02:00
Damien Metzger
d6235bdacc // Cannot use analytics real time at this time since it is in private beta 2013-10-18 10:54:03 +02:00
Rémi Gaillard
6747d3bbac [-] BO: Default country should be overriden in the context in multishop 2013-10-18 10:23:06 +02:00
djfm
901f5aeb08 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 08:20:32 +00:00
djfm
37656c2df9 // fixed improper English string for translation 2013-10-18 08:20:20 +00:00
Kevin Granger
e17c5f7c91 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 18:43:31 +02:00
Kevin Granger
9c07cb9302 // fix informations 2013-10-17 18:43:15 +02:00
Rémi Gaillard
b8273a13e6 // 2013-10-17 18:30:22 +02:00
Jerome Nadaud
fa22cff995 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 18:27:14 +02:00
Jerome Nadaud
088d23f8f9 // Add edit button to customer groups view list 2013-10-17 18:27:00 +02:00
Kevin Granger
d933466d04 // fixs add product informations 2013-10-17 18:11:47 +02:00
Kevin Granger
7189aa9de9 // fix yes/no, alert success, cache clear button 2013-10-17 17:33:55 +02:00
Damien Metzger
5a6fef2ee8 // Fixed typo 2013-10-17 17:13:30 +02:00
Jerome Nadaud
f77fa3d7c6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 16:00:10 +02:00
Jerome Nadaud
08525e5af4 // Fix missing commits !!!! 2013-10-17 15:59:46 +02:00
Kevin Granger
c43a7093ac // fix calendar 2013-10-17 15:57:23 +02:00
Jerome Nadaud
205e00d4a7 // small fix 2013-10-17 15:43:52 +02:00
Kevin Granger
7ae123227e // fix nav collapsed and clipping on page loading 2013-10-17 15:39:53 +02:00
Gregory Roussac
cbf2e6b65b Merge pull request #848 from djfm/bootstrap
// correct use of translation functions
2013-10-17 06:36:20 -07:00
Jerome Nadaud
0393e6bc6d // Date Range Picker improvement 2013-10-17 15:28:47 +02:00
djfm
fc896f6a48 // correct use of translation functions 2013-10-17 13:20:00 +00:00
Kevin Granger
1097bb56f9 // calendar 2013-10-17 14:35:51 +02:00
gRoussac
3a38af9982 [-] FO : Could not redirect back to url in adress.php 2013-10-17 14:16:54 +02:00
Jerome Nadaud
185c518d3d // Force cast on select filter 2013-10-17 14:06:48 +02:00
Kevin Granger
b391d833d3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 14:01:50 +02:00
Kevin Granger
9abb9a9b15 // removed version fix bootstrap, please report forms where margin could miss between fields (.row => .form-group) 2013-10-17 14:01:26 +02:00
Kevin Granger
dc43c0f7d3 // fix delete categories 2013-10-17 13:50:14 +02:00
Jerome Nadaud
99f66e26d0 // Change datepicker class 2013-10-17 13:24:46 +02:00
Jerome Nadaud
1f93d071c2 // Add transplant module button to page header toolbar 2013-10-17 13:24:01 +02:00
gRoussac
6b1d69dd7d [-] FO : $back value twice escaped 2013-10-17 12:18:23 +02:00
Jerome Nadaud
983b4dd617 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 11:41:10 +02:00
Jerome Nadaud
cee6c2b2d6 // Add class to calendar.tpl 2013-10-17 11:40:58 +02:00
Kevin Granger
193d3921fa // calendar date range picker compare 2013-10-17 11:40:02 +02:00
Jerome Nadaud
f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
gRoussac
b67a78f9dd [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC 2013-10-17 11:37:45 +02:00
Rémi Gaillard
eb14e25e2a // small fix for some order by on listing 2013-10-17 11:33:05 +02:00
Vincent Augagneur
d1ee6e6357 //small fix 2013-10-17 11:27:30 +02:00
Kevin Granger
ca1a03e81d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 11:22:17 +02:00
Kevin Granger
86ef9b5461 // calendar 2013-10-17 11:22:03 +02:00
gRoussac
f1ea9ba5b4 [-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it 2013-10-17 10:53:20 +02:00
Rémi Gaillard
e4faa2bb75 [-] Core: Out of stock status should be setted after the first order history 2013-10-17 10:28:14 +02:00
Jerome Nadaud
6ed7ffc647 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 09:37:37 +02:00
Jerome Nadaud
1f50e074f7 // New order button fix 2013-10-17 09:37:19 +02:00
Damien Metzger
fba95afdcc // Removed deprecated modules 2013-10-17 09:37:01 +02:00
Vincent Augagneur
2f34af4646 //remove debug 2013-10-17 09:26:47 +02:00
Kevin Granger
89d7b9ab96 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 09:24:59 +02:00
Kevin Granger
334d0a01bd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/helpers/calendar/calendar.tpl
2013-10-17 09:24:09 +02:00
Jerome Nadaud
a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Kevin Granger
561c036240 // calendar 2013-10-16 19:03:02 +02:00
Jerome Nadaud
6a7990869a // Range datepicker special compare actions 2013-10-16 18:26:00 +02:00
Jerome Nadaud
6ed8afd1be // Fix names 2013-10-16 16:36:05 +02:00
Jerome Nadaud
c7f8b30e88 // Add compare system to daterange picker 2013-10-16 16:30:41 +02:00
gRoussac
3ba5905042 [-] BO : Could not order by reserved words like 'key' 2013-10-16 16:25:40 +02:00
Vincent Augagneur
37712f0193 //when a module is disabled, first option is enable 2013-10-16 16:20:51 +02:00
Vincent Augagneur
22df963c72 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-16 16:09:51 +02:00
Vincent Augagneur
c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Rémi Gaillard
7c096d9769 // small fix 2013-10-16 15:48:52 +02:00
Damien Metzger
9492557284 // Removed administrator account from the installer, replaced by the superadministrator account 2013-10-16 15:40:30 +02:00
Damien Metzger
8cfdad9def // Removed currently unused table in the dashboard 2013-10-16 15:25:53 +02:00
Rémi Gaillard
e493305c47 // merge problem 2013-10-16 15:08:39 +02:00
Jerome Nadaud
dfd00bb064 // Add stats date in install 2013-10-16 14:44:49 +02:00
Kevin Granger
f225fb5f2c // replaced class .row with class .form-group inside forms 2013-10-16 14:19:26 +02:00
Vincent Augagneur
3e269f211c //blockadvertising now use boostrap design 2013-10-16 14:15:22 +02:00
Vincent Augagneur
d67be9431a //blocktopmenu now use bootstrap design 2013-10-16 13:55:58 +02:00
Kevin Granger
bc5b807a7b // graph update 2013-10-16 12:18:27 +02:00
Damien Metzger
f284777fc4 // Removed the trailing (Addons) after the name of the native modules 2013-10-16 11:59:36 +02:00
Damien Metzger
7c5ff8073f // Code cleaning 2013-10-16 11:47:59 +02:00
gRoussac
8f9fc10221 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-16 11:45:31 +02:00
gRoussac
62aaf16d60 [*] FO : New hooks for home tabs 2013-10-16 11:44:55 +02:00
Damien Metzger
a51f41ca09 // Fixed dashboard best sellers 2013-10-16 11:42:42 +02:00
Rémi Gaillard
2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Kevin Granger
486e6c1b66 // datepicker 2013-10-16 10:55:47 +02:00
Rémi Gaillard
22fd1b84c4 Merge pull request #847 from MustangZhong/patch-1
[-] WS: Missing field on Cart::getWsCartRows()
2013-10-16 00:58:16 -07:00
Damien Metzger
04999f7624 // Small fixes 2013-10-16 09:43:38 +02:00
Jerome Nadaud
476bf72bcc // Ooops 2013-10-16 09:21:49 +02:00
MustangZhong
ad27dbe8d1 Update Cart.php
The field "id_address_delivery" is missing in getWsCartRows.
Since id_address_delivery is required in the web service field definition.
2013-10-16 10:14:14 +08:00
Kevin Granger
be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Rémi Gaillard
6ee538c710 // fix on ps_cleaner 2013-10-15 19:53:59 +02:00
Jerome Nadaud
dcbe3cb8e8 // Small datapicker fix 2013-10-15 19:16:23 +02:00
Jerome Nadaud
3aa6976e31 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 19:14:51 +02:00
Jerome Nadaud
04e760512f // Fix month overlapping on datapicker 2013-10-15 19:14:45 +02:00
Rémi Gaillard
1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Kevin Granger
8dce01e633 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:20:40 +02:00
Jerome Nadaud
aefd5947d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:12:28 +02:00
Jerome Nadaud
ed2e9bee70 // Small datepicker fix 2013-10-15 18:12:01 +02:00
Kevin Granger
0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Damien Metzger
953f4c4686 // Fixed login social links 2013-10-15 18:08:57 +02:00
Jerome Nadaud
a85c1d7933 // Add index.php files to dashboard folder 2013-10-15 18:05:02 +02:00
Jerome Nadaud
2157311f11 // Some improvement for range datepicker 2013-10-15 18:04:28 +02:00
gRoussac
237b950eb6 [-] FO : #PSCFV-10640 again, bad assignement 2013-10-15 16:35:58 +02:00
Jerome Nadaud
6c6c3b240e // Fix bug display final price when country have no display tax 2013-10-15 15:06:38 +02:00
gRoussac
7ae9832992 // small cast 2013-10-15 14:56:25 +02:00
gRoussac
81497be5ab [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC 2013-10-15 14:53:44 +02:00
Jerome Nadaud
5fd6b9aac6 // Add overflow-y to module payments 2013-10-15 14:53:31 +02:00
Damien Metzger
eed6b65914 // Added Addons block in the dashboard 2013-10-15 14:18:50 +02:00
Damien Metzger
7759bfaa66 // Typo 2013-10-15 14:00:37 +02:00
Damien Metzger
7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Kevin Granger
d19b0ed8e0 // icon for error notice 2013-10-15 12:31:17 +02:00
Kevin Granger
d23714e9e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 12:11:15 +02:00
Kevin Granger
d1bc5eb6e0 // calendar WIP 2013-10-15 12:10:05 +02:00
Damien Metzger
55fad19954 // Updated dashactivity 2013-10-15 11:18:30 +02:00
Rémi Gaillard
837ca34e7e [-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0 2013-10-15 10:30:48 +02:00
gRoussac
9c861642a5 [-] BO : AdminImport, wrong default separators 2013-10-15 10:09:16 +02:00
Gregory Roussac
dec9ef40a8 Merge pull request #841 from indesign47/patch-10
[+] BO : AdminImport add entity Alias
2013-10-15 01:03:33 -07:00
Vincent Augagneur
bd95d03e37 //blockwishlist now use boostrap design 2013-10-15 09:30:26 +02:00
djfm
b4e18954f9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-15 07:22:03 +00:00
Francois Gaillard
fd2dc4ff64 [-] Classes : Modules listing and case insensitive 2013-10-15 09:14:49 +02:00
indesign47
f25a418785 Update Alias.php 2013-10-14 19:20:38 +02:00
Rémi Gaillard
6f4b85430c // Fix listings and sort 2013-10-14 18:52:48 +02:00
Jerome Nadaud
7d85b21e92 // Pagination fix 2013-10-14 18:22:55 +02:00
Kevin Granger
2bc927c810 // login css 2013-10-14 18:08:33 +02:00
Gregory Roussac
2a28e47650 Merge pull request #799 from Lupul/development
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
2013-10-14 08:37:28 -07:00
Jerome Nadaud
7e4329a4dc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 17:31:50 +02:00
Jerome Nadaud
7e9cdbb163 // Pagination fix 2013-10-14 17:30:56 +02:00
Jerome Nadaud
07073afa1f // Fix CMS filter, reset and sort 2013-10-14 17:28:21 +02:00
Gregory Roussac
f3755e2d0a Merge pull request #843 from ldecoker/patch-10
[-] BO : AdminMeta - make sure module and controller name are in lowercase
2013-10-14 07:46:56 -07:00
Gregory Roussac
bce6e8f09f Merge pull request #837 from axometeam/patch-21
[-] BO : bad query when filtering on status + sorting by quantity in the AdminProducts getList
2013-10-14 07:45:52 -07:00
Kevin Granger
3eeac7f2bb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 16:35:01 +02:00
Kevin Granger
3f22a6b6c9 // login flip 2013-10-14 16:34:02 +02:00
gRoussac
cc8ec4fd45 [-] CORE : Fix bug #PSCFV-10687 bad conversion for accentuated Y and W, thanks @mike15 2013-10-14 16:03:50 +02:00
Rémi Gaillard
7742020606 // small fix 2013-10-14 15:59:48 +02:00
Damien Metzger
fa6d09a756 // Fixed warning 2013-10-14 15:56:53 +02:00
Damien Metzger
8f10e42b60 // Small fixes 2013-10-14 15:49:57 +02:00
gRoussac
80f6f4e223 [-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier 2013-10-14 15:34:47 +02:00
Vincent Augagneur
4da04275fe //small fix related to 1316bd7e1f 2013-10-14 15:07:50 +02:00
Jerome Nadaud
f4118c4f9d // Fix some table header column title 2013-10-14 15:06:09 +02:00
Vincent Augagneur
b9c6b0e8af //dateofdelivery now use bootstrap design 2013-10-14 14:55:56 +02:00
gRoussac
50002ec714 [-] FO : Fix #PSCFV-10690 again, change just on directories 2013-10-14 14:23:26 +02:00
gRoussac
c6e3e28894 [-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt 2013-10-14 14:20:11 +02:00
Kevin Granger
6d3a15ef5b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
2013-10-14 14:18:06 +02:00
gRoussac
f8edca8ac8 [-] IN : Fix bug #PSCFV-10539 duplicate "address" url rewrite in meta.xml for Russian 2013-10-14 13:59:19 +02:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
2013-10-14 12:21:29 +02:00
gRoussac
2a54296b96 [-] BO : Fix bug #PSCFV-10692, AdminImport bad utf8 cars for subst 2013-10-14 12:11:47 +02:00
gRoussac
1adfa1584c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-14 11:37:51 +02:00
gRoussac
1358c696cd [-] BO : Fix #PSCFV-10678 warning in chrome 2013-10-14 11:37:15 +02:00
Jerome Nadaud
833091674c // Adding translations and PHP date format for datepicker 2013-10-14 11:34:04 +02:00
djfm
5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Jerome Nadaud
3282bd19e4 // Small fix 2013-10-14 10:59:20 +02:00
Rémi Gaillard
3bc02bbe10 // fields are already correctly formated when they are in a object coming from the database 2013-10-14 10:56:38 +02:00
gRoussac
af9182dad5 [-] CORE , follow up b87e934a66 and a10dcab6e7 2013-10-14 10:51:17 +02:00
Gregory Roussac
3539eb3697 Merge pull request #842 from kiropowered/patch-1
[-] CORE : StockMvt Fix bug if product have attribute
2013-10-14 01:30:30 -07:00
Kevin Granger
59435fa2ee // login flip WIP 2013-10-14 09:57:02 +02:00
ldecoker
a377ecd571 Update Meta.php
Use strtolower from Tools class.
2013-10-14 09:53:50 +02:00
ldecoker
8d7e96176c SEO - make sure module and controller name are in lowercase
For module controller, make sure that the name of the controller and the module are saved in lowercase. Otherwise the route will not be found in getModuleLink.
2013-10-14 09:38:04 +02:00
Jerome Nadaud
80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +02:00
Jérôme Nadaud
892516342e // Fix when date is null 2013-10-13 11:47:29 +02:00
gRoussac
f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date 2013-10-12 23:24:32 +02:00
gRoussac
ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php 2013-10-12 17:54:26 +02:00
kiropowered
a10dcab6e7 Update StockMvt.php
Fix bug if product have attribute
2013-10-12 14:28:27 +02:00
indesign47
0a441b9a4b Update Alias.php 2013-10-12 11:49:27 +02:00
indesign47
4f9191fe0c Update form.tpl 2013-10-12 11:45:07 +02:00
indesign47
2afbe8fd04 Create alias_import.csv 2013-10-12 11:39:29 +02:00
indesign47
85c6e799c3 [+] BO : AdminImport add entity Alias 2013-10-12 11:33:36 +02:00
Gregory Roussac
418155cf2b Merge pull request #838 from pelTek/patch-1
BO: added UPC and EAN search
2013-10-11 11:52:22 -07:00
Chris
3f6139be42 BO: added UPC and EAN search 2013-10-11 21:02:01 +03:00
Jerome Nadaud
e47f0a7c68 // Adding stats compare date to employee table 2013-10-11 18:34:20 +02:00
Jerome Nadaud
0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 18:30:16 +02:00
Jerome Nadaud
d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Kevin Granger
89251a667b // feedback button 2013-10-11 18:26:12 +02:00
Axome
9d5a9225e5 Correct some "bad query" in the admin products getList
Here the wrong Sql generated :

SELECT SQL_CALC_FOUND_ROWS a.`id_product`,b.name as name,`reference`,a.price as price,a.active as active , MAX(i.id_image) id_image,cl.name `name_category` , a.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, a.`active` FROM `ps_product` a LEFT JOIN `ps_product_lang` b ON (b.`id_product` = a.`id_product` AND b.`id_lang` = 2 AND b.`id_shop` = 1) LEFT JOIN `ps_image` i ON (i.`id_product` = a.`id_product` AND i.cover=1)LEFT JOIN `ps_category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang` AND cl.id_shop = 1) LEFT JOIN `ps_stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 AND sav.id_shop = 1 ) WHERE 1 AND a.`active` = 0 GROUP BY a.id_product ORDER BY quantity desc LIMIT 0,50 

'quantity' is ambigus (for the ORDER BY)
2013-10-11 18:17:55 +02:00
Gregory Roussac
0dbaa59985 Merge pull request #836 from mkdgs/patch-1
[*] MO : blocktopmenu adding clear cache of AddAfter hook for Cms, Supplier, Manufaturer and Product
2013-10-11 09:05:15 -07:00
Rémi Gaillard
06c62c1684 [-] WS: Fix #PSCFV-10672 order by ID for non multishop entities 2013-10-11 17:53:15 +02:00
Jerome Nadaud
0f9c81a683 [-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message 2013-10-11 17:29:44 +02:00
Kevin Granger
cfa4d72eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 17:22:06 +02:00
Kevin Granger
41f5d9f1f1 // fix datepicker 2013-10-11 17:21:45 +02:00
Jerome Nadaud
18690e4b9a // Adding update for customer message 2013-10-11 17:17:58 +02:00
gRoussac
a07733fcec [-] BO : Could not insert referrer id_connections_source can not be null 2013-10-11 16:52:53 +02:00
Mickael Desgranges
1786f8e907 Update blocktopmenu.php
Fix: block top menu is not updated when content is added in CMS

adding support of AddAfter hook for Cms, Supplier, Manufaturer and Product
2013-10-11 16:42:21 +02:00
Fabio Chelly
9fc9df6ba4 Merge remote-tracking branch 'origin/development' into development 2013-10-11 16:38:09 +02:00
Fabio Chelly
9e3b82e8ed [*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl 2013-10-11 16:37:26 +02:00
Damien Metzger
eff292731f // Fixed typo 2013-10-11 16:35:49 +02:00
gRoussac
8cfe9a2065 [-] Bo : Could not update mailalert 2.5 with id_lang missing 2013-10-11 16:19:54 +02:00
Damien Metzger
d2ecdfb93d // fix dashboard modules upgrade 2013-10-11 16:18:53 +02:00
Damien Metzger
0e91352520 // Dashboard update 2013-10-11 16:18:52 +02:00
Jerome Nadaud
0f28393c8f // Fix data range picker 2013-10-11 16:16:03 +02:00
Jerome Nadaud
bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
gRoussac
45e9040606 [-] Bo : Could not update mailarler 2.5 with id_mlang 2013-10-11 15:51:02 +02:00
Damien Metzger
1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Kevin Granger
dcf7e48f6e // datepicker stylesheet 2013-10-11 15:04:14 +02:00
Vincent Augagneur
5bcacf9b48 //statsdata now use boostrap design 2013-10-11 14:38:18 +02:00
Vincent Augagneur
38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Rémi Gaillard
6b52ada195 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 14:11:28 +02:00
Rémi Gaillard
1316bd7e1f // add check stock value for color list if needed 2013-10-11 14:11:12 +02:00
Damien Metzger
7a5187e84e // Fix module active 2013-10-11 14:11:01 +02:00
Damien Metzger
809eac6308 // Fix upgrade and dashboard 2013-10-11 14:07:03 +02:00
Jerome Nadaud
1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. 2013-10-11 13:33:31 +02:00
Kevin Granger
cd5a308ad7 // login : tabindex + ux 2013-10-11 12:28:01 +02:00
Damien Metzger
c68101653d // Fixed tabs 2013-10-11 12:10:24 +02:00
Kevin Granger
b61528057a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/js/admin-theme.js
2013-10-11 11:28:44 +02:00
Kevin Granger
40d4da04bb // cleaned admin-theme.js - added date range picker 2013-10-11 11:18:27 +02:00
Damien Metzger
49cdfb56c6 // Fix class_index generation 2013-10-11 11:15:14 +02:00
Damien Metzger
f80b348d86 // Default vertical menu in BO 2013-10-11 11:02:35 +02:00
Rémi Gaillard
bb81e892a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 10:58:23 +02:00
Gregory Roussac
6c739ee2b3 Merge pull request #833 from djfm/development
[*] LO : set correct currency format for CHF
2013-10-11 01:58:10 -07:00
Rémi Gaillard
49a9f0bcaa // unlink class_index tmp file if not rename 2013-10-11 10:58:05 +02:00
Fabio Chelly
5c66ed4791 Merge remote-tracking branch 'origin/development' into development 2013-10-11 10:51:50 +02:00
Fabio Chelly
d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. 2013-10-11 10:51:28 +02:00
Damien Metzger
f95a4d74df // Added Google Plus to the BO footer 2013-10-11 10:47:48 +02:00
Damien Metzger
28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
gRoussac
7b02da5fdf // bad commit sorry 2013-10-11 10:32:30 +02:00
gRoussac
36ca7bc508 [-] BO : AdminImport, fix Group searchByName 2013-10-11 10:23:17 +02:00
Rémi Gaillard
bb35a5b004 // multishop 2013-10-11 10:04:10 +02:00
Damien Metzger
7f5f78a6f3 // Connected footer links and go-top 2013-10-11 09:44:15 +02:00
fchellypresta
075a911cee Merge pull request #830 from indesign47/patch-5
[-] MO : productcomments errors translated in multi-language
2013-10-11 00:40:32 -07:00
fchellypresta
6f878353a6 Merge pull request #831 from indesign47/patch-7
[-] MO : productcomments round average up not down
2013-10-11 00:29:37 -07:00
djfm
bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00
gRoussac
dc1632a8b0 [-] BO : Adminimport, id_specific key_price not defined 2013-10-10 22:04:42 +02:00
Kevin Granger
544423ea1e // remove duplicate 2013-10-10 20:05:58 +02:00
Gregory Roussac
a87bbf84b4 Merge pull request #825 from indesign47/patch-4
[-] BO : AdminImport add available fields to Products
2013-10-10 10:22:43 -07:00
Kevin Granger
447f1d4ba7 // quick fix customer view 2013-10-10 19:04:25 +02:00
Damien Metzger
77551c03f5 // Fixed potential warning 2013-10-10 18:49:27 +02:00
Damien Metzger
4505387046 // Try to fix regexp issues with some PHP configurations 2013-10-10 18:41:50 +02:00
Vincent Augagneur
87417ed928 //producttooltip now use bootstrap design 2013-10-10 18:07:08 +02:00
gRoussac
286084c42d Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master
Conflicts:
	controllers/admin/AdminImportController.php
2013-10-10 17:06:13 +02:00
Kevin Granger
5620992735 // fix dashboard 2013-10-10 16:52:41 +02:00
Kevin Granger
7d717ea207 // fix css + kpi + dashboard 2013-10-10 16:29:40 +02:00
Jerome Nadaud
22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00
Kevin Granger
be3ccabe66 // footer + go to top + scroll y sidebar 2013-10-10 15:10:51 +02:00
Jerome Nadaud
789911184b [-] BO : FixBug - Remove second email in recipient 2013-10-10 15:04:32 +02:00
gRoussac
39a543188a [-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT 2013-10-10 14:54:12 +02:00
Rémi Gaillard
278dc32482 [*] BO: Add an option to autologout to the backoffice after 15 minutes 2013-10-10 12:20:10 +02:00
Damien Metzger
9bae53a4d9 Merge pull request #828 from djfm/development
// fixed name of gender 2 in English
2013-10-10 03:08:40 -07:00
Kevin Granger
6c35b20b02 // organize css 2013-10-10 11:43:24 +02:00
djfm
819dac6622 // fixed name of gender 2 in English 2013-10-10 09:36:05 +00:00
Rémi Gaillard
7fdf6e614f // don't display some field when an employee edit it's own profile 2013-10-10 11:35:05 +02:00
Jerome Nadaud
067c78f868 // Fix notifications 2013-10-10 11:02:33 +02:00
Damien Metzger
79b0a571c0 // Updated languages in the installer 2013-10-10 09:47:10 +02:00
Damien Metzger
fb9204ebd6 // Fixed module page 2013-10-10 09:14:58 +02:00
François Gaillard
8d1bca5542 Merge pull request #768 from enumag/patch-4
[-] Classes : Hook - Display payment method & custommer currency bug fix
2013-10-09 13:52:09 -07:00
Kevin Granger
9de6ec0379 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 20:28:15 +02:00
Kevin Granger
5b509c2c20 // login WIP 2013-10-09 20:26:04 +02:00
Jerome Nadaud
6245b05b6e // Remove flags from language select 2013-10-09 19:39:05 +02:00
Jerome Nadaud
cade037e4f // Use display modal class for lite displaying 2013-10-09 19:28:37 +02:00
Jerome Nadaud
5ec76a759a // Fix Dashboard toolbar 2013-10-09 19:12:20 +02:00
Jerome Nadaud
a5d1816336 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 18:59:32 +02:00
Jerome Nadaud
0e4cb5bcd5 // Form group bootstraping 2013-10-09 18:59:20 +02:00
Kevin Granger
719e5f4faf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-10-09 18:55:46 +02:00
Kevin Granger
74f12c23be // login WIP 2013-10-09 18:54:13 +02:00
Damien Metzger
079534f039 // Fix header/footer override in admincontroller 2013-10-09 18:51:31 +02:00
Jerome Nadaud
cfbb0d872b // Add confirmation on category image delete 2013-10-09 18:47:33 +02:00
Jerome Nadaud
2d9a54c19e // Remove button icon class 2013-10-09 18:43:22 +02:00
Jerome Nadaud
eae76eb63e // Pagination bootstraping 2013-10-09 18:36:19 +02:00
Fabio Chelly
246340b78c [*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned) 2013-10-09 18:33:41 +02:00
Jerome Nadaud
d4bf765dd6 // Pagination bootstraping 2013-10-09 18:31:51 +02:00
Fabio Chelly
75ffa8c4f8 [*] BO Module search: Enter key is now disabled in quick search field 2013-10-09 18:30:09 +02:00
Damien Metzger
1939b8026b // CSS fix 2013-10-09 18:06:53 +02:00
Kevin Granger
84711bc386 // added .process-icon-save-and-preview 2013-10-09 17:57:02 +02:00
Jerome Nadaud
f6bbb6e241 // Fix duplicate invoice delivery number 2013-10-09 17:43:43 +02:00
Kevin Granger
2c7ed00b39 // pagination 2013-10-09 17:21:53 +02:00
Rémi Gaillard
fee92eecdd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 16:58:13 +02:00
Rémi Gaillard
edddac8a0c // add colors on some controllers 2013-10-09 16:47:47 +02:00
Damien Metzger
9b24cca088 // Fixed category breadcrumb 2013-10-09 16:44:58 +02:00
Jerome Nadaud
eadbefedae Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 16:42:44 +02:00
Jerome Nadaud
e1ff774fcd // Restoring toolbar.tpl file for retrocompatibility 2013-10-09 16:42:13 +02:00
Jerome Nadaud
68d84892c7 // remove self:: 2013-10-09 16:40:09 +02:00
Jerome Nadaud
2feb5dd8d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-09 16:31:09 +02:00
Jerome Nadaud
d0a4636966 [-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number 2013-10-09 16:29:15 +02:00
Vincent Augagneur
477973a43e //carrier wizard button good place and order 2013-10-09 16:24:25 +02:00
Damien Metzger
e7d7e2f1ab // Fixed CSS hover on KPIs 2013-10-09 15:46:06 +02:00
Damien Metzger
1870dd4dd2 // Added order state color in order::getHistory() 2013-10-09 15:33:46 +02:00
Vincent Augagneur
d796d0012e [-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier 2013-10-09 15:25:02 +02:00
Jerome Nadaud
c8347cbc59 // Restore save button on header toolbar 2013-10-09 15:24:19 +02:00
Jerome Nadaud
f5452aea66 // Products fix 2013-10-09 15:23:44 +02:00
Jerome Nadaud
61f3c61e2a // Some fix 2013-10-09 15:22:27 +02:00
Jerome Nadaud
81677cff44 // Toolbar improvement 2013-10-09 15:18:54 +02:00
Damien Metzger
a2371067bf // CSS fixes 2013-10-09 15:11:04 +02:00
Gregory Roussac
df4ae671a2 Merge pull request #826 from gouz/patch-4
[-] BO : Export DeliverySlip, the dates range using delivery_date but date_add
2013-10-09 06:02:52 -07:00
Damien Metzger
9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Rémi Gaillard
6f1cdba40e // typo 2013-10-09 14:56:41 +02:00
Jerome Nadaud
4242e485c7 // Bootstrap design on getPath 2013-10-09 14:25:46 +02:00
Jerome Nadaud
a1ced4ee32 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 14:07:17 +02:00
Jerome Nadaud
3cca8206b9 // Fix missing unwanted div 2013-10-09 14:06:22 +02:00
gRoussac
df97566018 [-] BO : AdminImport no default value for separators 2013-10-09 13:57:36 +02:00
gRoussac
338efcad7f [-] CORE : $smarty->compile_check is not set to false, thanks @prestamodule 2013-10-09 12:14:49 +02:00
Vincent Augagneur
ced6554133 //loyalty module now use bootstrap design 2013-10-09 11:19:32 +02:00
Damien Metzger
c982d08b68 // Removed useless link to the current page in the breadcrumb 2013-10-09 11:12:33 +02:00
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Damien Metzger
623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +02:00
Vincent Augagneur
e16676efaa //added prefix & suffix on helper form 2013-10-09 10:51:04 +02:00
Sylvain Gougouzian
7a6dea4964 [~] BO : Export DeliverySlip
The dates range wasn't using the correct sql fields.
2013-10-09 10:39:24 +02:00
Damien Metzger
38143e1245 // Fixed stats bug (bad id for ajax request) 2013-10-09 10:05:24 +02:00
Jerome Nadaud
8c9dffd854 // Add pagination to states list 2013-10-09 10:03:27 +02:00
Jerome Nadaud
9bdde5c5c0 // Add pagination to countries list 2013-10-09 09:59:49 +02:00
Jerome Nadaud
18d909c05d // Add cache control to ajax request for ipad 2013-10-09 09:55:17 +02:00
Jerome Nadaud
d448891065 // Add new country button to countries controller 2013-10-09 09:51:25 +02:00
Kevin Granger
daa1cc47db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 09:43:10 +02:00
Kevin Granger
b4459e39a4 // Orders WIP 2013-10-09 09:43:04 +02:00
Jerome Nadaud
57c34488ff // Orders refund buttons 2013-10-09 09:41:51 +02:00
Jerome Nadaud
5a4548bd51 // Toolbar for search 2013-10-09 09:41:10 +02:00
gRoussac
fcc2930693 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-09 09:19:22 +02:00
Jerome Nadaud
f9373e6178 // Fix toolbar button and toolbar title for invoices 2013-10-09 08:53:36 +02:00
Rémi Gaillard
60214d8fb6 // nothing 2013-10-08 22:11:28 +02:00
Damien Metzger
d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Kevin Granger
797a6c121a // Orders WIP 2013-10-08 18:53:41 +02:00
Jerome Nadaud
d595cd2f12 // Toolbar modif for products 2013-10-08 18:51:10 +02:00
Jerome Nadaud
b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
gRoussac
008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
gRoussac
85946bacbe // small cast 2013-10-08 18:35:56 +02:00
Rémi Gaillard
f2c6887497 // quickview 2013-10-08 17:44:10 +02:00
Damien Metzger
180a778e51 [*] Installer : replaced radio buttons by a select for the installer language list (too many languages) 2013-10-08 17:06:02 +02:00
Rémi Gaillard
0db2372724 // add color list to some controllers 2013-10-08 15:39:06 +02:00
Damien Metzger
53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Gregory Roussac
cd8af9ae67 Merge pull request #824 from Prestaworks/patch-14
[-] BO : Fixes issue where path is not printed when error with email template saves occur.
2013-10-08 05:57:21 -07:00
Daniel
fa88a0bd93 Update AdminTranslationsController.php
Fixes issue where path is not printed when error with email template saves occur.
2013-10-08 20:54:52 +08:00
Rémi Gaillard
2899dfba5e // Fix AdminTranslationsController::addNewTabs() 2013-10-08 14:53:02 +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
Krystian Podemski
ae7d33effe [*] CORE: Add phone_mobile to address format
I honestly do not know why you decided by default to show only the first field of the phone :)

Users often ask me why they don't see their mobile phone on orders in BO.
2013-10-08 11:11:24 +02:00
gRoussac
e4a642128a [-] FO : Fix bug #PSCFV-10606 could not have correct taxCalculationMethod when vat number in customer address 2013-10-08 11:09:52 +02:00
Zollner Robert
30adb0932d [-] BO : pass correct typed parameter to setCurrency 2013-10-07 23:42:26 +03:00
Rémi Gaillard
7d0e9a5f06 // Fix double entities on AdminLog listing #PSCFV-10472 2013-10-07 19:37:58 +02:00
Gregory Roussac
4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2
[-] MO : Price should apply tax as in configuration.
2013-10-07 09:55:35 -07:00
Kevin Granger
3e2d2e2afc // fix Orders 2013-10-07 18:54:28 +02:00
Gregory Roussac
644e38c05f Merge pull request #817 from cedricfontaine/patch-1
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
2013-10-07 09:54:22 -07:00
Francois Gaillard
77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
cedricfontaine
d63288affd Update loyalty.php
Price should apply tax as in configuration.
2013-10-07 12:14:13 -04:00
Damien Metzger
c51fe5b22d // Changelog 1.5.6.0 2013-10-07 18:07:25 +02:00
cedricfontaine
717e195f57 Update LoyaltyModule.php
Voucher should be without taxes, otherwise points would be negative.
2013-10-07 12:07:03 -04:00
Gregory Roussac
f78a093a1c Merge pull request #815 from PrestanceDesign/development
[*] TR : Italian translation of the country instead of English
2013-10-07 08:39:39 -07:00
Sarah Lorenzini
8f1b19a30b // update customer service page 2013-10-07 16:45:48 +02:00
PrestanceDesign
f9f5a4b090 Italian translation of the country instead of English 2013-10-07 16:45:22 +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
Gregory Roussac
92ffb1eab1 Merge pull request #812 from djfm/release
[*] TR : updated Russian installer
2013-10-07 03:25:42 -07: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
djfm
2969a7f74c // updated Russian installer 2013-10-07 10:14:43 +00:00
Rémi Gaillard
1ed26e2d4e // default perms profiles 2013-10-07 12:13:59 +02:00
gRoussac
302260539b // Report from ebf09792e9 2013-10-07 12:08:39 +02:00
gRoussac
d125ca0a36 [-] FO : isVirtualCart was forced to false 2013-10-07 12:06:28 +02:00
Jerome Nadaud
8c67235c2e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 12:03:43 +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
gRoussac
adb1779764 [-] FO : isVirtualCart was forced to false 2013-10-07 12:02:47 +02:00
gRoussac
900209f93c // bad commit c2bcc5baa1 2013-10-07 11:44:09 +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
Gregory Roussac
bf65404413 Merge pull request #810 from studiokiwik/sk-ps15x-001
[-] MO : button tag on line 56 weren't closed
2013-10-07 02:29:19 -07: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
9b79a02e88 // Remove unused function 2013-10-07 11:03:42 +02:00
Jerome Nadaud
a1f5455d07 // Fix Mark as favorite not updated 2013-10-07 11:03:03 +02:00
Gregory Roussac
68131dc28b Merge pull request #811 from studiokiwik/sk-ps15x-002
[-] TR : typo fixed in polish installer translation (line 85)
2013-10-07 01:59:10 -07:00
gRoussac
7a7da1097d [-] BO : Employee's default_tab may not exists, switching to AdminOrders 2013-10-07 10:53:03 +02:00
gRoussac
df0a24d63c [-] BO : Retro compat, PS_ADMIN_DIR not defined 2013-10-07 10:47:41 +02:00
Vincent Augagneur
46fef35348 //homefeatured now use bootstrap design 2013-10-07 10:25:10 +02:00
Tomasz Slominski
4254ae6edc typo fixed in polish installer translation (line 85) 2013-10-07 10:05:43 +02:00
Vincent Augagneur
3f4f298ad4 [-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin() 2013-10-07 10:01:26 +02:00
Gregory Roussac
2a475d066f Merge pull request #803 from ldecoker/patch-8
[-] BO : Missing $php_self variable in OrderDetailController.php
2013-10-07 01:00:42 -07:00
Tomasz Slominski
b941ac007b bugfix: button tag on line 56 weren't closed 2013-10-07 09:57:55 +02:00
Damien Metzger
d6ffb45eb1 Merge pull request #809 from djfm/kill_miss
[*] LO : Removed 'Miss' from the default genders because too country specific
2013-10-07 00:57:13 -07:00
djfm
b6bba0c787 [*] LO : Removed 'Miss' from the default genders because too country specific 2013-10-07 07:53:19 +00:00
Rémi Gaillard
3477cac1e0 Merge pull request #800 from Ha99y/20131004_retro-compat.js.php
__DIR__ is available since PHP 5.3
2013-10-07 00:35:02 -07:00
Vincent Augagneur
5c605067f0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 09:09:26 +02:00
Vincent Augagneur
8a6dc6233d //jquery.smartWizard use bootstrap css classes 2013-10-07 09:08:20 +02:00
indesign47
d3d0897012 [-] MO : productcomments round average up not down
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
2013-10-07 04:02:42 +02:00
indesign47
e0978a0b84 [-] MO : productcomments errors translated in multi-language 2013-10-07 03:18:56 +02:00
ldecoker
148348855e Update OrderDetailController.php
Missing $php_self variable
2013-10-06 16:31:54 +02:00
indesign47
b61e3e68b9 Update AdminImportController.php 2013-10-05 10:50:19 +02:00
ha99y
98aea24fc3 __DIR__ was never defined
The JS files would not lode, when in dev mode because __DIR__ was not
defined
2013-10-04 17:18:23 -07:00
Zollner Robert
1787923c4c [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase) 2013-10-05 00:42:29 +03:00
Zollner Robert
481cb5c28a [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency 2013-10-04 23:30:24 +03: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
Rémi Gaillard
b2b0c4f00b // remove debug 2013-10-04 18:45:18 +02:00
Rémi Gaillard
2aee99c0b0 [-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580 2013-10-04 18:37:30 +02:00
gRoussac
d141f5bdc0 // wrong modif on ProductSale 2013-10-04 18:35:30 +02:00
gRoussac
c2bcc5baa1 [*] FO : TM home modules preparation 2013-10-04 18:32:31 +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
Jerome Nadaud
2e4f5c0b07 // Menus details list is now bootstraped 2013-10-04 17:34:07 +02:00
Damien Metzger
337725bb86 // Fixed KPI with 0 value 2013-10-04 17:28:03 +02:00
Vincent Augagneur
5564b342f4 //wizard boostrap and title fix 2013-10-04 17:07:10 +02:00
Jerome Nadaud
121fcdc39f // Fix list start 2013-10-04 16:56:35 +02:00
Vincent Augagneur
fe6494bf35 //fixed bug PSCFV-10567 2013-10-04 16:33:50 +02:00
Vincent Augagneur
828b838d22 //products comparison link 2013-10-04 16:25:47 +02:00
Jerome Nadaud
5557ac1aee // Remove attribute language desc from stock movement list when product attribute is removed 2013-10-04 15:30:27 +02:00
Damien Metzger
5c5a989cda // Added javascript validation functions (demo) 2013-10-04 15:24:50 +02:00
Rémi Gaillard
16dfa4e73d // missing file 2013-10-04 15:12:08 +02:00
Jerome Nadaud
887b68d3f2 // Customers Groups View list resize 2013-10-04 14:24:33 +02:00
gRoussac
a4b7fc942f [-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule 2013-10-04 14:11:42 +02:00
Rémi Gaillard
fef8d2beac // Fix group reduction per category 2013-10-04 14:00:42 +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
indesign47
805989da39 [-] BO : AdminImport add products available fields 2013-10-04 13:04:52 +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
Jerome Nadaud
093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
indesign47
75cb92c329 Update AdminImportController.php 2013-10-04 11:44:52 +02:00
Gregory Roussac
f28131fe9b Merge pull request #795 from indesign47/patch-3
[-] BO : AdminImport add combinations available fields
2013-10-04 02:40:29 -07:00
indesign47
96646b5c7a [-] BO : AdminImport add products available fields 2013-10-04 10:56:41 +02:00
PhpMadman
18ab409eeb [*] BO: #PNM-1472 Changed label and transparency range check to 1
Changed label to 1-100 since, there is no need to set transparency to 0, since it will pretty much will be invisible already at 1
2013-10-04 10:38:03 +02:00
indesign47
a92ced814a [-] BO : AdminImport add combinations available fields 2013-10-04 10:26:38 +02:00
Jerome Nadaud
3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-04 10:14:07 +02:00
Gregory Roussac
09ad15730b Merge pull request #794 from indesign47/release
[-] BO : AdminImport add adresses required fields
2013-10-04 01:02:46 -07:00
indesign47
6c9b71ee58 [-] BO : AdminImport add adresses required fields 2013-10-04 04:35:00 +02:00
indesign47
0af24ab034 [-] BO : AdminImport add adresses required fields 2013-10-04 04:31:51 +02:00
Kevin Granger
bb7dd876af // orders WIP 2013-10-03 21:04:35 +02:00
Rémi Gaillard
f100027e5d [-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse 2013-10-03 19:21:49 +02:00
Jerome Nadaud
6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-03 18:58:09 +02:00
gRoussac
62d946ea68 [-] CORE : Fix bug #PSCFV-10179 Duplicate specific price records when updating a product 2013-10-03 18:41:06 +02:00
gRoussac
31f421153d [-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset 2013-10-03 18:20:45 +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
Damien Metzger
e7c860a3dd Merge pull request #792 from djfm/release
// remove backup files
2013-10-03 08:09:41 -07:00
djfm
8580dd0b39 // remove backup files 2013-10-03 15:02:16 +00:00
Damien Metzger
9e837d1ecc // No more translation packs in the ZIP (except for FR and EN), only remotes! 2013-10-03 16:35:54 +02:00
Gregory Roussac
cfd70bf660 Merge pull request #789 from PhpMadman/patch-2
[*] BO: wrong description on getIdOrderCarrier
2013-10-03 07:30:14 -07:00
Rémi Gaillard
0662cd3b12 // don't need to clear smarty cache while installation 2013-10-03 16:29:31 +02:00
Damien Metzger
6c4a69ea0b Merge pull request #790 from djfm/release
// added tab translations to Bengali installer
2013-10-03 07:26:29 -07:00
djfm
b92c9869a4 // added tab translations to Bengali installer 2013-10-03 14:20:08 +00:00
gRoussac
992cc6b437 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-03 16:10:37 +02:00
gRoussac
7f32e8d187 [-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot 2013-10-03 16:09:43 +02:00
gRoussac
cafe2ed9d2 [-] BO : Fix bug #PSCFV-10064, could not import deature in multilang, thanks @E.Bigfoot 2013-10-03 16:08:53 +02:00
PhpMadman
e38d808a85 [*] BO: wrong description on getIdOrderCarrier 2013-10-03 15:51:27 +02:00
Gregory Roussac
86631202df Merge pull request #788 from PhpMadman/patch-1
[*] BO: missing align on order for product warehouse
2013-10-03 06:37:58 -07:00
Fabio Chelly
d601844e82 Merge remote-tracking branch 'origin/development' into development 2013-10-03 15:32:27 +02:00
Fabio Chelly
ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess
#PNM-109
2013-10-03 15:32:10 +02:00
PhpMadman
f979cbef57 [*] BO: missing align on order for product warehouse 2013-10-03 15:26:09 +02:00
gRoussac
8b2215eec5 // remove warning 2013-10-03 15:02:48 +02:00
gRoussac
0f288583ca [-] BO : Remove dead code in AdminImport 2013-10-03 14:57:03 +02:00
Jerome Nadaud
309f4333a7 // Supply orders bootstraping 2013-10-03 14:13:15 +02:00
Gregory Roussac
8762c310b9 Merge pull request #787 from tucoinfo/development
[*] FO : add variable $nofollow to mobile theme header.tpl
2013-10-03 05:02:01 -07:00
Damien Metzger
6e0c3e1aa2 // addFeatureValueImport partial fix 2013-10-03 12:24:35 +02:00
tucoinfo
8f09d49ffc [*] FO : add variable $nofollow to mobile theme header.tpl
Copied from normal theme which already manages the NoFollow variable
2013-10-03 12:19:10 +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
gRoussac
6610bd2067 [-] BO : Could noty save ImportMatchs 2013-10-03 11:15:03 +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
Rémi Gaillard
f2e39488b6 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-03 10:33:58 +02:00
Rémi Gaillard
e190c8df9f // small fix on import 2013-10-03 10:33:43 +02:00
Vincent Augagneur
d1956572a5 //small fix on carrier wizard 2013-10-03 10:29:40 +02:00
Gregory Roussac
ca1bc3daa8 Merge pull request #786 from kpodemski/patch-6
[-] CORE : Increasing the length of link_rewrite & name in Category.php
2013-10-03 01:24:22 -07:00
Krystian Podemski
d87c816038 [*] CORE : Increasing the length of link_rewrite & name in Category.php
In database this fields have varchar(128) so let's give the user full size of fields
2013-10-03 10:20:45 +02:00
Gregory Roussac
3b75dd6785 Merge pull request #785 from djfm/pstw
[*] TR : Traditional Chines Installer
2013-10-03 00:54:48 -07:00
Damien Metzger
e82f0feacf // Fixed customer tab 2013-10-03 09:52:25 +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
djfm
711f5b0bdf [+] LO : Completed Traditional Chinese Installer 2013-10-03 06:57:53 +00:00
djfm
4668d8ffa2 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into pstw 2013-10-03 06:56:08 +00:00
Jerome Nadaud
90b203fde3 // Stock instant bootstraping 2013-10-02 18:59:34 +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
gRoussac
e9a3c98af9 [-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table 2013-10-02 18:57:45 +02:00
Damien Metzger
3cfe76ec0c // Fixed mean age 2013-10-02 18:10:51 +02:00
gRoussac
da48cea96e [-] BO : AdminImport, tables are not truncated 2013-10-02 17:54:48 +02:00
Jerome Nadaud
b472aaed96 // Fix Stock Cover select submit 2013-10-02 17:53:56 +02:00
Jerome Nadaud
c88ea275ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:50:50 +02:00
Jerome Nadaud
2a984186a9 // Fix output for ajax content 2013-10-02 17:50:39 +02:00
Gregory Roussac
a40356d21c Merge pull request #784 from djfm/release
// updated native translation packs
2013-10-02 08:50:29 -07: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
djfm
3a0081912d // updated native translation packs 2013-10-02 15:37:57 +00:00
Jerome Nadaud
dc06ef9c6d // Stock movement fix export button on select filter 2013-10-02 17:09:31 +02:00
Jerome Nadaud
81b9c01824 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:08:39 +02:00
Jerome Nadaud
7454d75fb9 // List simple header bootstraping 2013-10-02 17:08:28 +02:00
Damien Metzger
84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
gRoussac
a027dbd061 [*] BO : Add category id in AdminSpecificPriceRule 2013-10-02 17:00:20 +02:00
Jerome Nadaud
f63e1065b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 16:58:37 +02:00
Jerome Nadaud
04e5617d7d // Instant stock bootstraping 2013-10-02 16:58:27 +02:00
Sarah Lorenzini
5993c188c5 // update login page 2013-10-02 16:50:09 +02:00
Gregory Roussac
3d1d178bba Merge pull request #783 from ellisium/upper
[-] CORE : CART::BOTH should be Cart::Both
2013-10-02 16:35:37 +02:00
Gregory Roussac
4bb4199f5a Merge pull request #783 from ellisium/upper
[-] CORE : CART::BOTH should be Cart::Both
2013-10-02 07:34:00 -07:00
Eric Le Lay
3e0c5e71f4 classname uppercase issue 2013-10-02 16:28:45 +02:00
Sarah Lorenzini
791481e149 // update login page 2013-10-02 16:00:54 +02:00
gRoussac
fe7035aae9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-02 15:48:44 +02:00
gRoussac
96be4068f5 // norms 2013-10-02 15:48:29 +02:00
Damien Metzger
250a9f17a2 [-] BO : managed decimal format in BO orders 2013-10-02 15:47:21 +02:00
gRoussac
bf6a0e0077 [-] BO : Fix bug #PSCFV-5060 could not import supplier_combinations in combinations import 2013-10-02 15:46:11 +02:00
Damien Metzger
6974a88b59 Merge pull request #782 from 202-ecommerce/development
[*] FO : Added new Maintenance Hook
2013-10-02 06:07:42 -07:00
Jerome Nadaud
acb5bf77f6 // Remove comment 2013-10-02 14:52:13 +02:00
Jerome Nadaud
68c5318706 // Icon change for list details button 2013-10-02 14:49:42 +02:00
Jerome Nadaud
3ce163449e // Advanced stock management bootstraping 2013-10-02 14:48:23 +02:00
Rémi Gaillard
f4cadbdfd6 Merge pull request #770 from urecheatu007/development
[-] LO: updated localization pack for Romania / romanian - added states
2013-10-02 05:47:17 -07:00
Vincent Augagneur
dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
thoma202
1ccc25f56c Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development 2013-10-02 14:38:44 +02:00
Sarah Lorenzini
1cb7f27a21 // update login page bootsrap 2013-10-02 14:38:13 +02:00
Sarah Lorenzini
ba06b217cc // update javascript login page 2013-10-02 14:36:14 +02:00
gRoussac
c4e549db13 [-] BO : Fix #PSCFV-6482 could not import tags in deiffrent languages 2013-10-02 14:20:27 +02:00
Kevin Granger
f5a4aeeab5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 13:59:04 +02:00
Kevin Granger
0867e8b7c1 // fix AdminController array unique 2013-10-02 13:58:57 +02:00
Jerome Nadaud
661e18916b // Permission bootstrap design 2013-10-02 12:30:07 +02:00
Jerome Nadaud
51c1ee0cf0 // Move ajax box and ajax confirmation to content part 2013-10-02 12:23:10 +02:00
Damien Metzger
a876b13c1c [-] BO : fixed currency format on order creation 2013-10-02 12:10:54 +02:00
Jerome Nadaud
a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
thoma202
eb7655e318 [+] Added hook in maintenance page 2013-10-02 11:58:35 +02:00
Rémi Gaillard
99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
Jerome Nadaud
43c874e06e // Fix line feed on address observation 2013-10-02 09:59:14 +02:00
Jerome Nadaud
dd79b3c702 // Manufacturer bootstraping 2013-10-02 09:43:46 +02:00
Jerome Nadaud
ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +02:00
gRoussac
c466320887 [-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import 2013-10-01 19:11:51 +02:00
Kevin Granger
65fc1fea63 // orders WIP 2013-10-01 18:50:41 +02:00
Jerome Nadaud
301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00
gRoussac
a6e8af99f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-01 18:13:02 +02:00
gRoussac
6bbcbb536f [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 18:12:15 +02:00
gRoussac
294384d9ea [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules 2013-10-01 18:11:54 +02:00
Jerome Nadaud
dd60eb66cf // Fix features list filters and sort 2013-10-01 18:10:52 +02:00
Gregory Roussac
953f0641e8 Merge pull request #778 from djfm/release
[*] TR : Installer Translations
2013-10-01 09:09:32 -07:00
gRoussac
a5dc1ce6f6 [-] Bo : Fix again #PSCFV-10474 coul not export more than 300 products 2013-10-01 18:02:12 +02:00
Jerome Nadaud
f2849bdb70 // Remove unnecessary function 2013-10-01 17:56:17 +02:00
Jerome Nadaud
68831ffbe9 // Fix attribute group view list 2013-10-01 17:55:20 +02:00
djfm
172986a461 // changed help text 2013-10-01 15:06:33 +00:00
Jerome Nadaud
9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed 2013-10-01 17:00:56 +02:00
djfm
23df6cb875 // updated German installer translations 2013-10-01 14:52:04 +00:00
Jerome Nadaud
88be78d096 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:44:20 +02:00
Jerome Nadaud
99a4ffe583 // Fix enable friendly url button generator on multishop 2013-10-01 16:44:03 +02:00
Kevin Granger
c4c15917ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:24:27 +02:00
Kevin Granger
a866de41e7 // login form 2013-10-01 16:24:14 +02:00
gRoussac
f4c2bacea3 [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 16:17:23 +02:00
Jerome Nadaud
55a5c69d40 // Remove language select on only one language 2013-10-01 16:03:34 +02:00
Jerome Nadaud
a2aa90a4b6 // Fix page header title bug 2013-10-01 15:32:34 +02:00
Jerome Nadaud
bc8e972dfa // Fix language id in features and quantities 2013-10-01 15:32:13 +02:00
Jerome Nadaud
f469b69113 // Fix fixed home category And Norm 2013-10-01 15:18:56 +02:00
Jerome Nadaud
299d1f65ec //Fix Stats bug 2013-10-01 15:15:02 +02:00
Jerome Nadaud
759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +02:00
gRoussac
626ccf0985 [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules 2013-10-01 14:46:40 +02:00
Jerome Nadaud
14b584fc01 // Remove language select if exist only 1 language 2013-10-01 14:36:48 +02:00
Vincent Augagneur
f2a760c245 //small fix 2013-10-01 12:31:07 +02:00
Gregory Roussac
a76a7273ea Merge pull request #776 from kpodemski/patch-5
[*] FO: We let style selected category in CSS on blockcategories
2013-10-01 03:04:54 -07:00
Krystian Podemski
9e4b6c020f [*] FO: We let style selected category in CSS on blockcategories
It's good to have this by default.
2013-10-01 12:02:19 +02:00
djfm
9e64ecc887 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-01 09:58:40 +00:00
Rémi Gaillard
9ad046677c [*] BO: Allow to breakdown the taxes when they are computed 2013-10-01 11:55:56 +02:00
Rémi Gaillard
4fcbde878d [-] BO: Fix total without tax in breakdown taxes when taxes are combined #PSCFV-10394 on the invoices 2013-10-01 11:18:11 +02:00
Vincent Augagneur
f4f1b6e831 //vatnumber now use bootstrap design 2013-10-01 11:03:37 +02:00
gRoussac
f30bc80485 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-01 10:48:17 +02:00
djfm
e706b531bc // updated br, es, fr, ru installer translations 2013-10-01 08:41:03 +00:00
Jerome Nadaud
340f6cebe4 [-] FO : FixBug #PSCFV-10542 - Category description view problem 2013-10-01 10:20:33 +02:00
Gregory Roussac
97a25eb9c6 Merge pull request #774 from kpodemski/patch-4
[-] BO: translation mismatch
2013-10-01 01:15:24 -07:00
Rémi Gaillard
ecb4ccfdda // Fix product visibility on Product::getAccessories and ProductSale::getBestSales #PSCFV-9760 2013-10-01 09:56:26 +02:00
Krystian Podemski
2b55944874 [-] BO: translation mismatch
Here is a form to edit the values ​​in the group, we do not need here "attribute type".
2013-10-01 08:38:04 +02:00
Jerome Nadaud
452e07ab0b [-] BO : FixBug #PSCFV-10477 - Error message not shown on delete module without permissions 2013-09-30 19:26:49 +02:00
gRoussac
4a66bdcdf9 // report of 9b627bf9a2 2013-09-30 19:18:08 +02:00
gRoussac
f899380e3b [-) BO : #PSCFV-10474 coul not export more than 300 products 2013-09-30 19:04:04 +02:00
Jerome Nadaud
1b9472cc37 [-] BO : FixBug #PSCFV-10291 - Remove temporary image on install 2013-09-30 19:01:11 +02:00
Rémi Gaillard
eb40f7db24 // Improve cache colors list 2013-09-30 18:48:59 +02:00
Damien Metzger
9c04f1dace Merge pull request #748 from djfm/release
// fix PSCFV-8260, currency format containing spaces and RTL languages
2013-09-30 09:21:43 -07:00
djfm
1cce312aaa // orthograph 2013-09-30 16:15:53 +00:00
djfm
f39c2c40cf Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 16:13:15 +00:00
Rémi Gaillard
b2a9ec57bf // cache 2013-09-30 17:25:12 +02:00
Jerome Nadaud
b7ff8d634a [-] BO : FixBug #PSCFV-10317 - Attributes value not shown on features sorted by position. 2013-09-30 17:23:12 +02:00
Rémi Gaillard
c2857add42 // add color list on product listing 2013-09-30 17:19:02 +02:00
Jerome Nadaud
f983e0eaf1 [-] BO : FixBug #PSCFV-10380 - Missing lang file existence verification. 2013-09-30 16:25:58 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Kevin Granger
0db013f1c8 // fix checkbox 2013-09-30 15:13:08 +02:00
Jerome Nadaud
6bb1fa6a4d // Missing '?' on regex 2013-09-30 14:59:27 +02:00
Jerome Nadaud
05eafdb14f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-30 14:57:46 +02:00
Jerome Nadaud
cfc41ec4ef [+] BO : Add remove module override on constant - PSCFV-10430 2013-09-30 14:57:30 +02:00
Gregory Roussac
6822373378 Merge pull request #772 from codeurWeb/patch-5
[*] FO : add GET pre-selection of id_contact in contact-form.tpl
2013-09-30 05:56:09 -07:00
Damien Metzger
85abfde45c // Added links to breadcrumbs 2013-09-30 14:45:21 +02:00
Julien
dd5cd33bb4 [-] BO : fix pre-selection of id_contact in contact-form.tpl 2013-09-30 14:38:06 +02:00
Damien Metzger
4ebc47856e [-] BO : fixed breadcrumbs and filters (in the breadcrumbs) 2013-09-30 14:16:33 +02:00
Cosmin Hutanu
7eddca6d15 update localization pack for romania - added states 2013-09-30 13:06:19 +03:00
gRoussac
7d764c5ce8 [-] BO : AdminImport, not matching by ref for updating 2013-09-30 11:50:51 +02:00
Cosmin Hutanu
f9ad0d1b79 Merge pull request #3 from PrestaShop/development
update from prestashop/development
2013-09-30 02:47:52 -07:00
Damien Metzger
80376e9034 // Fixed meta title 2013-09-30 11:27:01 +02:00
Vincent Augagneur
d6a541df58 //pscleaner now use bootstrap design 2013-09-30 11:23:41 +02:00
Damien Metzger
7019af3a11 // Bound the menu to the employee option 2013-09-30 11:20:49 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
Jerome Nadaud
e040c096d1 [-] BO : Remove customers group view list link 2013-09-30 10:34:54 +02:00
Rémi Gaillard
b6f13648db [-] WS: Fix order by on id field on multishop entities 2013-09-30 10:29:54 +02:00
Rémi Gaillard
22173355a5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 09:59:51 +02:00
Rémi Gaillard
06b6facc2d [-] BO: Fix #PSCFV-10488 filter by employee on logs tab 2013-09-30 09:59:33 +02:00
Jerome Nadaud
e0e5f80767 [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-30 09:59:25 +02:00
Gregory Roussac
3e85622972 Merge pull request #767 from enumag/patch-3
[-] BO : Fix #PSCFV-10520 id_attribute_group can not be null
2013-09-30 00:47:12 -07:00
djfm
67d0ac95b5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 07:09:17 +00:00
Jáchym Toušek
6e191fe054 [-] Classes : Hook - Display payment method & custommer currency bug fix 2013-09-29 16:24:33 +02:00
Jáchym Toušek
5ebc2e5e91 [-] BO : Fix #PSCFV-10520 2013-09-29 14:43:14 +02:00
gRoussac
813ef8bc7e [-] BO : Could not import empty linkrewrite for products and not matching refs 2013-09-27 19:22:10 +02:00
Jerome Nadaud
c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-27 19:20:46 +02:00
Gregory Roussac
a4178a9fd2 Merge pull request #761 from nuzelac/patch-1
[-] BO : fix multilingual field validity in AdminProductsController
2013-09-27 19:07:56 +02:00
Gregory Roussac
40617c0a81 Merge pull request #761 from nuzelac/patch-1
[-] BO : fix multilingual field validity in AdminProductsController
2013-09-27 09:50:03 -07:00
Nino Uzelac
ca01b58262 fix multilingual field validity in AdminProductsController 2013-09-27 18:22:07 +02:00
Damien Metzger
f84a3c7fda // Add missing index 2013-09-27 17:47:10 +02:00
Fabio Chelly
9d94337c9b [-] MO sendtoafriend: The method used to check all required input fields could lead to errors 2013-09-27 16:08:00 +02:00
Damien Metzger
650c18e9f7 // Added Translations KPIs 2013-09-27 14:51:12 +02:00
Jerome Nadaud
6449ecfb32 [-] BO : Force invoice footer text to 1 ligne 2013-09-27 14:41:50 +02:00
Jerome Nadaud
9e58e3edfd // Advanced stock bootstrap design 2013-09-27 12:24:44 +02:00
Fabio Chelly
6d8cc454e1 [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice
(cherry picked from commit 345d4cd)
2013-09-27 11:30:42 +02:00
Fabio Chelly
345d4cdbcf [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 2013-09-27 11:27:58 +02:00
djfm
66435cbf4a // grammar 2013-09-27 08:35:48 +00:00
Damien Metzger
84d8ccfa2b // Fixed language code consistency 2013-09-27 10:25:37 +02:00
Damien Metzger
48966f7916 // Fixed language iso code consistency 2013-09-27 10:22:12 +02:00
djfm
2be5233584 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-27 08:03:47 +00:00
Gregory Roussac
33c2669692 Merge pull request #749 from enumag/patch-1
[-] FO : Fixed products without images
2013-09-27 10:00:48 +02:00
Gregory Roussac
6b30cc5084 Merge pull request #750 from djfm/psindonesia
[+] TR : Psindonesia
2013-09-27 00:57:20 -07:00
Gregory Roussac
19fb32545d Merge pull request #749 from enumag/patch-1
[-] FO : Fixed products without images
2013-09-27 00:56:46 -07:00
djfm
4e472fae50 // updated Indonesian installer 2013-09-27 07:16:23 +00:00
Jáchym Toušek
30367e6427 [-] FO : Fixed products without images 2013-09-26 22:21:18 +02:00
gRoussac
126c21d39a [*] BO : AdminImport, remove csv files 2013-09-26 18:34:18 +02:00
djfm
50bd3d613d // fix PSCFV-8260, currency format containing spaces and RTL languages 2013-09-26 16:29:40 +00:00
gRoussac
98148cfe03 // Adminimport revert sort order in select 2013-09-26 18:02:28 +02:00
gRoussac
4fc4ee721e [*] BO : Adminimport, check csv download path 2013-09-26 17:50:26 +02:00
gRoussac
d3ad12e536 [*] BO : Add csv file download in AdminImport 2013-09-26 17:40:33 +02:00
Jerome Nadaud
9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud
a1c7dd3ee9 // Add row break to color element 2013-09-26 16:44:26 +02:00
Jerome Nadaud
fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud
bc80846d7d // Requiered fields bootstrap design 2013-09-26 16:25:18 +02:00
Jerome Nadaud
a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
gRoussac
8c1240cb2c [-] BO : Sort import files in select 2013-09-26 15:13:34 +02:00
Vincent Augagneur
0cf68ade90 //productscategory now use bootstrap design 2013-09-26 15:09:18 +02:00
Jerome Nadaud
157ab0c8b9 // Prices rules list size 2013-09-26 15:01:23 +02:00
Jerome Nadaud
2cc6fe821b // Bootstraping template form checkbox 2013-09-26 14:56:24 +02:00
Jerome Nadaud
2d65f5a8c0 // Cart rules bootstrap design 2013-09-26 14:55:28 +02:00
Cosmin Hutanu
81ec2822ec Merge pull request #2 from PrestaShop/development
update from prestashop/development
2013-09-26 05:52:17 -07:00
Fabio Chelly
7a7a2fb8c3 [-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore 2013-09-26 14:19:08 +02:00
Gregory Roussac
47bf9a397a Merge pull request #745 from djfm/localization_packs
[*] TR : Localization packs
2013-09-26 14:17:13 +02:00
Gregory Roussac
f3e36b896b Merge pull request #746 from Mainmich/patch-1
[-] MO : Blocklayered Fix pagination incompatibility
2013-09-26 14:16:51 +02:00
Gregory Roussac
1abb064958 Merge pull request #747 from djfm/psbengali
[+] TR : Added Bengali Installer
2013-09-26 05:14:28 -07:00
Rémi Gaillard
b6d3bf1bc3 // missing method 2013-09-26 13:49:17 +02:00
Rémi Gaillard
252ab56d75 // error message in double 2013-09-26 13:47:42 +02:00
smartdatasoft
9109708944 // small improvements to Bengali installer 2013-09-26 11:44:28 +00:00
smartdatasoft
e21eef3a87 // updated Bengali installer 2013-09-26 11:44:12 +00:00
smartdatasoft
3ded9549cf // Bengali installer translations 2013-09-26 11:43:58 +00:00
smartdatasoft
37170c74b3 [+] LO : Added Bengali installer 2013-09-26 11:39:58 +00:00
Jerome Nadaud
b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +02:00
Jerome Nadaud
10e472e141 // List header template - Remove extra class attribute 2013-09-26 11:35:19 +02:00
gRoussac
017d19330a // avoid SQL error 2013-09-26 11:10:44 +02:00
djfm
78c1dce528 [+] LO: Added Traditional Chinese installer 2013-09-26 08:23:16 +00:00
Jerome Nadaud
4c5a6d1efb // Payment bootstrap design 2013-09-26 10:09:50 +02:00
Jerome Nadaud
d6a59a1dbd // Maintenance bootstrap design 2013-09-26 09:37:38 +02:00
Jerome Nadaud
eefccd0891 // Multistore check view now include button element 2013-09-26 09:36:57 +02:00
Damien Metzger
1b010da64f // Fixed typo and configuration parse error 2013-09-25 20:21:41 +02:00
Damien Metzger
fd1cfe0c8c // Fixed group information label and a customer KPI 2013-09-25 20:16:34 +02:00
Damien Metzger
d1ead319ef // Fixed exception on the customer 2013-09-25 20:06:23 +02:00
Damien Metzger
cc75b4b912 // Temp fix for labels in the BO listings, before my eyes hurt 2013-09-25 19:59:00 +02:00
Damien Metzger
29e83489a7 // Small improvement of the performances tab 2013-09-25 19:47:55 +02:00
Damien Metzger
01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +02:00
Jerome Nadaud
1a37fee8e7 // Bootstrap icons 2013-09-25 19:03:43 +02:00
Jerome Nadaud
56f27ae2c1 // Some missing icons and multistore problems 2013-09-25 19:00:29 +02:00
Gregory Roussac
37f928ade9 Merge pull request #746 from Mainmich/patch-1
[-] MO : Blocklayered Fix pagination incompatibility
2013-09-25 09:45:51 -07:00
gRoussac
48d9c37590 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-09-25 18:41:52 +02:00
Mainmich
a6e67b078e Fix pagination incompatibility
Javascript function paginateButton does not work with "p" GET parameter in first position, regex only takes &p and not ?p.
2013-09-25 18:33:58 +02:00
Damien Metzger
336e29eb67 // Default tab is the dashboard 2013-09-25 18:08:56 +02:00
gRoussac
7486844222 [-] BO : Fix #PSCFV-10501 Remove fatal error 2013-09-25 18:02:06 +02:00
Jerome Nadaud
8cc892ecce // Trad 2013-09-25 17:47:10 +02:00
Jerome Nadaud
bf86da782a // Add confirmation for memcached server delete 2013-09-25 17:44:57 +02:00
Damien Metzger
95a2b2a8a8 [*] BO : improved automatic language creation 2013-09-25 17:07:18 +02:00
Damien Metzger
147591dbe3 [*] BO : improved automatic language creation 2013-09-25 17:05:30 +02:00
Jerome Nadaud
757fe64217 [-] MO : FixBug #10460 - UTF8 bug on accented URL 2013-09-25 16:09:55 +02:00
Jerome Nadaud
b2b8a2eb19 // Fix list search form submit 2013-09-25 16:04:09 +02:00
Damien Metzger
a7f9f23b73 // AdminStates code cleaning 2013-09-25 16:00:29 +02:00
Gregory Roussac
5245038ea1 Merge pull request #745 from djfm/localization_packs
[*] TR : Localization packs
2013-09-25 06:58:59 -07:00
Damien Metzger
337b7333a2 // Improved States tab 2013-09-25 15:45:00 +02:00
djfm
91d495a4a8 [*] LO : Added states to Japanese localization pack 2013-09-25 13:31:45 +00:00
Damien Metzger
ae8c8218fd // Fixed ISO code of japanese todōfuken 2013-09-25 15:30:16 +02:00
Damien Metzger
b80b363a2e [*] BO : Added Customer Service KPIs 2013-09-25 15:24:30 +02:00
Jerome Nadaud
875120f145 // Advanced parameters bootstrap design 2013-09-25 15:22:38 +02:00
Jerome Nadaud
ffb7113153 // Posibility to add a specifici icon to options list 2013-09-25 15:16:00 +02:00
Jerome Nadaud
e81c9490b0 // Advanced parameters bootstrap design 2013-09-25 15:15:28 +02:00
djfm
81e66233d8 [*] LO : Updated many localization packs 2013-09-25 13:11:52 +00:00
Fabio Chelly
1800c6589c Merge remote-tracking branch 'origin/development' into development 2013-09-25 14:43:42 +02:00
Fabio Chelly
bdd84771b7 [-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore 2013-09-25 14:43:30 +02:00
Damien Metzger
439700f46a // Removed deprecated function 2013-09-25 14:05:16 +02:00
Jerome Nadaud
15b6017ad7 // Logs list resize 2013-09-25 11:54:31 +02:00
Jerome Nadaud
e2c04db881 // Administration list column size 2013-09-25 11:46:12 +02:00
Jerome Nadaud
ae760115be // Fix warning 2013-09-25 11:43:14 +02:00
djfm
54b3ac5a32 [+] TR : Added Indonesian installer 2013-09-25 09:41:59 +00:00
Jerome Nadaud
7b14759aec // Webservice controller bootstrap design 2013-09-25 11:30:38 +02:00
Jerome Nadaud
2a8d251cd6 // Webservice controller bootstrap design 2013-09-25 11:29:11 +02:00
Jerome Nadaud
72f540ad3a // Add textbutton input type to form template 2013-09-25 11:28:41 +02:00
Gregory Roussac
7f9183b1d4 Merge pull request #743 from dlage/modules_update
[*] BO : Show modules update button even if module is not installed but not notices
2013-09-24 20:40:56 +02:00
Gregory Roussac
931d240ca1 Merge pull request #743 from dlage/modules_update
[*] BO : Show modules update button even if module is not installed but not notices
2013-09-24 11:33:48 -07:00
gRoussac
e900474b8e // remove notice 2013-09-24 19:01:08 +02:00
gRoussac
69cb20d5e8 [-] PDF : Report of 9c939ccead 2013-09-24 18:55:55 +02:00
81ca3ac1f9 BO: Modules - show update button even if module is not installed but don't
warn for modules with updates available but not installed.
2013-09-24 17:42:43 +01:00
Damien Metzger
d05ab45543 // KPIs improvments 2013-09-24 18:08:06 +02:00
gRoussac
6f840eceba [-] BO : Fix bug #PSCFV-9675 could not import non existent parent category 2013-09-24 18:00:01 +02:00
Vincent Augagneur
d9803ce086 //newsletter now use bootstrap design 2013-09-24 17:26:28 +02:00
Damien Metzger
6e6fe384ff // KPIs updated 2013-09-24 17:26:05 +02:00
Rémi Gaillard
5e7dbea970 // 2013-09-24 17:22:50 +02:00
Jerome Nadaud
72a7ac2d03 // Special external link in warehouse view 2013-09-24 17:19:01 +02:00
Jerome Nadaud
0247550a0a // Fix accordion for bootsrap and better bulk action for warehouse 2013-09-24 17:18:37 +02:00
Rémi Gaillard
beb0a74135 // use ObjectModel::validateField on validaterules 2013-09-24 17:12:28 +02:00
gRoussac
0f4781053b [-] BO : Bad entity pre selected in AdminImport 2013-09-24 17:08:33 +02:00
gRoussac
10d6e97aca [-] BO : Fix bug #PSCFV-10483, could not import other language product link_rewrite 2013-09-24 16:42:22 +02:00
gRoussac
3448027861 // report of pull request 737 2013-09-24 16:41:15 +02:00
gRoussac
89ac0bc439 [-] FO : Fix #PSCFV-10480 again, css fix 2013-09-24 16:34:18 +02:00
Jerome Nadaud
a175e603ef // Wharehouse view bootstrap fix 2013-09-24 16:20:05 +02:00
Jerome Nadaud
479662aa10 // Fix missing table id for shop asso in helper 2013-09-24 16:19:38 +02:00
Jerome Nadaud
003ba20238 // Products multistore bootstrap fix 2013-09-24 16:19:00 +02:00
gRoussac
3d477c62eb // remove notice 2013-09-24 16:03:39 +02:00
Damien Metzger
d26336aa77 // Copy KPIs from customer to cart 2013-09-24 15:54:45 +02:00
gRoussac
c9b53685c5 // parse error 2013-09-24 15:44:56 +02:00
gRoussac
1cc92fc9c2 [-] CORE : Could not add too long tags 2013-09-24 15:40:18 +02:00
Damien Metzger
799efcba3f [*] BO : Customers KPIs 2013-09-24 15:32:05 +02:00
gRoussac
17323a04b6 [-] CORE : Missing tag max size 2013-09-24 15:10:14 +02:00
Vincent Augagneur
a913a43b17 //mailalerts now use bootstrap design 2013-09-24 14:49:56 +02:00
Jerome Nadaud
00ddfeba05 // CMS select size in form 2013-09-24 13:09:22 +02:00
Jerome Nadaud
c9eb5b5be6 // Products multistore design 2013-09-24 12:29:12 +02:00
Jerome Nadaud
6e2337df44 // Add id attribute to tree header button 2013-09-24 12:27:51 +02:00
Damien Metzger
8f08f67812 [+] BO : Added fees configuration for the dashboard 2013-09-24 12:22:40 +02:00
gRoussac
1d6593612f [-] FO : Fix #PSCFV-10480 again css fix 2013-09-24 12:21:10 +02:00
Gregory Roussac
4c399875d9 Merge pull request #737 from codeurWeb/patch-3
[-] BO : fix postProcess override on AdminImportController
2013-09-24 01:54:18 -07:00
Gregory Roussac
92b987c0f8 Merge pull request #736 from codeurWeb/patch-2
[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
2013-09-24 01:40:16 -07:00
Rémi Gaillard
41af17e06b [-] BO: Fix data validation when iframe is allowed on some entities like CMS 2013-09-24 10:28:04 +02:00
Julien
6acebca8fa [-] BO : fix postProcess override on AdminImportController
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
2013-09-23 21:04:55 +02:00
Julien
6850db0612 [-] BO : fix contructor override on AdminImportController
When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
2013-09-23 20:23:45 +02:00
Jerome Nadaud
18a621e022 // Multistore invisible description in options 2013-09-23 19:02:22 +02:00
Gregory Roussac
aefab21a62 Merge pull request #735 from djfm/release
[*] LO : Use single quote as thousands separator for CHF currency
2013-09-23 09:54:01 -07:00
djfm
d9a24d61ac // change comment 2013-09-23 16:37:13 +00:00
djfm
6195d0c319 [*] LO : Use single quote as thousands separator for CHF currency 2013-09-23 16:32:40 +00:00
gRoussac
b3a425c73a [-] MO : Blockcart, wrong tbody 2013-09-23 18:20:35 +02:00
Jerome Nadaud
f04126c436 // Customers groups - Add special tree handle for categories tree 2013-09-23 18:16:47 +02:00
gRoussac
ccb3179c1a [-] CORE : Partial fix for #PSCFV-10482 getCacheId is different in back office 2013-09-23 18:07:46 +02:00
Jerome Nadaud
c78c8b04bd // Multistore checkbox js functions 2013-09-23 18:05:16 +02:00
Jerome Nadaud
69f97baa6a // Search conf list size 2013-09-23 18:04:48 +02:00
Jerome Nadaud
202c6fe463 // Carrier list size 2013-09-23 18:04:18 +02:00
Jerome Nadaud
320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Gregory Roussac
b4547568a5 Merge pull request #734 from djfm/release
// no quotes around 1 in js=1 please
2013-09-23 08:38:57 -07:00
gRoussac
d37f545058 [-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name 2013-09-23 17:26:36 +02:00
djfm
5c4de83e91 // no quotes around 1 in js=1 please 2013-09-23 15:20:26 +00:00
Damien Metzger
6796b64e18 Merge pull request #691 from djfm/development
// fixed translation of modules descriptions containing quotes
2013-09-23 07:51:57 -07:00
gRoussac
3b075e049b // bad commit 2013-09-23 16:33:44 +02:00
gRoussac
84dc75f57e [-] CORE : Fix bug #PSCFV-10471 Cart item count problem, unique_id grouping error for id_product and id_product_attribute 2013-09-23 16:32:38 +02:00
gRoussac
92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page 2013-09-23 16:08:44 +02:00
Vincent Augagneur
0b35c5506c //crossselling module now use boostrap design 2013-09-23 15:22:42 +02:00
gRoussac
dedc59f1db [-] IN : FIX #PSCFV-10246 errors in stricts sql-mode, thanks @enumag 2013-09-23 15:17:15 +02:00
Vincent Augagneur
a2d770e04f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-23 15:10:49 +02:00
Vincent Augagneur
642ff59bef //cheque module now use boostrap design 2013-09-23 15:10:46 +02:00
Damien Metzger
590e738254 // Fixed typo 2013-09-23 14:40:25 +02:00
Vincent Augagneur
e8420f24d1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-23 14:19:12 +02:00
Jerome Nadaud
e128e17f4e // Geoloc bootstrap design 2013-09-23 14:04:15 +02:00
Jerome Nadaud
748d6271a9 // Stores controller bootstrap 2013-09-23 13:56:30 +02:00
Jerome Nadaud
234b6de1b0 // Stores controller bootstrap design 2013-09-23 13:31:45 +02:00
Jerome Nadaud
4bb0a5f794 // Preferences images bootstrap design 2013-09-23 11:43:31 +02:00
Rémi Gaillard
c6222c51c8 // commit 6b47f5713e is missing 2013-09-23 11:36:15 +02:00
Fabio Chelly
a1555c3fc8 Merge remote-tracking branch 'origin/development' into development 2013-09-23 11:24:26 +02:00
Fabio Chelly
31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
Jerome Nadaud
5206496f64 [-] BO : Fix Bug For new Fancy Box events 2013-09-23 11:22:51 +02:00
Jerome Nadaud
cf82157d47 // oops 2013-09-23 10:48:56 +02:00
Jerome Nadaud
7dbb6088a4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-23 10:42:30 +02:00
Rémi Gaillard
50bbf1a547 // small fix 2013-09-23 10:46:41 +02:00
Jerome Nadaud
32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem 2013-09-23 10:42:10 +02:00
Vincent Augagneur
12f67a825b //carriercompare now use bootstrap design 2013-09-23 10:24:26 +02:00
Rémi Gaillard
a578cfb2e2 [-] FO: Fix #PSCFV-10461 2013-09-23 10:20:22 +02:00
Jerome Nadaud
f4e0f63ef7 // Add lingerie to activities list 2013-09-23 10:14:23 +02:00
Jerome Nadaud
45c7cb7757 // Cms categories list 2013-09-23 10:13:45 +02:00
Vincent Augagneur
39d84759a3 //blockviewed now use boostrap design 2013-09-23 10:06:43 +02:00
Vincent Augagneur
0fa8b4305e //blocktags now use boostrap design 2013-09-23 10:03:28 +02:00
Vincent Augagneur
6e24fe1411 //blocksupplier now use bootstrap design 2013-09-23 09:52:58 +02:00
gRoussac
39468476ab [-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request 361ebc72e0 2013-09-23 09:50:12 +02:00
Vincent Augagneur
d71a6a90da //now blockstore use bootstrap design 2013-09-23 09:48:59 +02:00
Vincent Augagneur
c1a9aa5936 //helper form input type file now can display thumb 2013-09-23 09:45:20 +02:00
Jerome Nadaud
67f05340c0 // Remove list header button link title and remove shop column center 2013-09-23 09:18:44 +02:00
Kevin Granger
c93eb9f40a // orders WIP 2013-09-20 19:11:08 +02:00
Damien Metzger
214b844ef7 // Removed useless tiny mce src 2013-09-20 18:52:42 +02:00
Jerome Nadaud
0e87409bd6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-20 18:31:47 +02:00
Jerome Nadaud
8e1cb5cc34 // Kpi update for customers orders 2013-09-20 18:31:35 +02:00
Damien Metzger
dadf83d6f6 [*] BO : removed deprecated chart engines 2013-09-20 18:27:35 +02:00
Damien Metzger
5c3b8015e5 [-] BO : fixed the redirection to a 404 page when loging in in the updater 2013-09-20 18:21:10 +02:00
Damien Metzger
1fe17f0eb1 // Removed deprecated option form in stats 2013-09-20 18:18:04 +02:00
Damien Metzger
ed1574e9ed // Finished nvd3 chart 2013-09-20 18:12:10 +02:00
Damien Metzger
02e5913dd6 // Fixed potential warning 2013-09-20 18:12:10 +02:00
Vincent Augagneur
504485cef3 //blockspecials now use bootstrap design 2013-09-20 17:51:24 +02:00
Vincent Augagneur
4136697c5e //blocksocial now use boostrap design 2013-09-20 17:22:15 +02:00
Vincent Augagneur
e332de1d50 //blockrss now use boostrap design 2013-09-20 17:14:50 +02:00
Jerome Nadaud
3ef36400bf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-20 17:02:55 +02:00
Jerome Nadaud
c1e6df873d // Fix birthday bootstrap design 2013-09-20 17:02:44 +02:00
Vincent Augagneur
24b6d3d387 //blockpaymentlogo now use boostrap design 2013-09-20 17:02:15 +02:00
Vincent Augagneur
4b4622a1c7 //blocknewsletter now use boostrap design 2013-09-20 16:52:48 +02:00
Vincent Augagneur
b7045b998a //blocknewproducts now use boostrap design 2013-09-20 16:41:31 +02:00
Jerome Nadaud
e9cd8ac145 // Search tree toolbar button 2013-09-20 16:20:27 +02:00
Jerome Nadaud
f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00
Rémi Gaillard
7aa348eb93 // bad char 2013-09-20 15:48:22 +02:00
Jerome Nadaud
caa1dbc7ea //Fix tree search toolbar button design 2013-09-20 15:39:44 +02:00
Jerome Nadaud
f51ffe4c55 // Start design of multistore toolbar 2013-09-20 15:30:59 +02:00
gRoussac
e2a1f5101c [-] BO : Bad input radio names 2013-09-20 15:27:31 +02:00
gRoussac
7d05da1618 [-] IN : Lower by two flush limit in migrate_orders 2013-09-20 15:12:57 +02:00
gRoussac
429c9442a3 [*] CORE : bad else if in getTemplatePath 2013-09-20 15:10:14 +02:00
Jerome Nadaud
f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Vincent Augagneur
2f3d736f13 //blockmanufacturer is now using bootstrap design 2013-09-20 14:56:41 +02:00
Kevin Granger
eeb3b540e2 // orders + css highlight / fixed-width 2013-09-20 14:42:09 +02:00
Rémi Gaillard
2dc91758c3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-20 14:12:56 +02:00
Rémi Gaillard
9b878a33a8 // fix canonical and ssl page without ssl 2013-09-20 14:12:41 +02:00
Damien Metzger
fc42ce17b8 // Set default option for the menu in the installer 2013-09-20 14:08:26 +02:00
Damien Metzger
7eb3b22829 [-] Installer : added the missing default tab in the employee 2013-09-20 14:06:38 +02:00
vAugagneur
aef0897436 //blockcustomerprivacy now use bootstrap design 2013-09-20 13:22:35 +02:00
vAugagneur
23ecca163d //blockcontactinfos is now using bootstrap design 2013-09-20 11:46:02 +02:00
vAugagneur
4c5cd50345 /small fix 2013-09-20 11:38:39 +02:00
Rémi Gaillard
e2ac223f4e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-20 11:34:54 +02:00
Rémi Gaillard
5b7580d487 [-] MO: Fix time of smarty cache invalidation 2013-09-20 11:33:30 +02:00
vAugagneur
2f56a4dbbd //blockcontact is now using bootstrap design 2013-09-20 11:31:12 +02:00
vAugagneur
c7ebf5ba5d //blockcart is now using bootstrap design 2013-09-20 11:24:16 +02:00
vAugagneur
07c03ecf6d //blockcategories is now using bootstrap design 2013-09-20 11:18:30 +02:00
Damien Metzger
1cebd5920e [*] Installer : added file check in order to check if everyhting has been successfuly uploaded 2013-09-20 11:09:22 +02:00
Kevin Granger
76bf61c20a //fix double desc 2013-09-20 11:04:41 +02:00
Fabio Chelly
4f639329e9 Merge remote-tracking branch 'origin/development' into development 2013-09-20 10:47:17 +02:00
Fabio Chelly
91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests
#PNM-1669
2013-09-20 10:46:56 +02:00
Jerome Nadaud
74a262f2ed // Shopping carts bootsrap design 2013-09-20 10:29:32 +02:00
Damien Metzger
f8ca06d927 // Better cache depth management for smarty 2013-09-20 10:26:58 +02:00
Damien Metzger
eb6600e840 // Blockcustomerprivacy should not be installed by default 2013-09-20 10:26:58 +02:00
Gregory Roussac
14cd72121a Merge pull request #732 from Ha99y/20130919_X-Robots
[*] CORE : Send noindex header to avoid ghost carts by bots
2013-09-20 00:52:49 -07:00
ha99y
42cdc988ac Send noindex header to avoid ghost carts by bots 2013-09-19 22:15:00 -07:00
Kevin Granger
724ab12122 // orders cleanup 2013-09-19 20:12:05 +02:00
Jerome Nadaud
660bb870cc // Add tooltip to list header toolbar button 2013-09-19 19:45:21 +02:00
Jerome Nadaud
c0fa5f8f79 // Fix hint in options.tpl 2013-09-19 19:39:46 +02:00
Jerome Nadaud
39edb5a546 // Fix cart rules bootstrap design 2013-09-19 19:33:55 +02:00
Jerome Nadaud
9b308ae7fc // Fix Translatable field on cart rule information 2013-09-19 19:01:43 +02:00
Jerome Nadaud
e1a3440145 // Add array for hint and desc for options.tpl 2013-09-19 18:56:35 +02:00
Jerome Nadaud
b40b9ec328 // Fix Permissions 2013-09-19 18:26:42 +02:00
Jerome Nadaud
e6780f7a86 // Fix menu list position col 2013-09-19 18:08:20 +02:00
Jerome Nadaud
f8fed30b44 // Prevent enter key event propagation for search input 2013-09-19 18:07:50 +02:00
Damien Metzger
33405ed858 // Rollback file wrongly modified by previous commit 2013-09-19 17:57:29 +02:00
Damien Metzger
cda7b225e2 // Removed deprecated module 2013-09-19 17:57:29 +02:00
Jerome Nadaud
2e80f00ba2 // Remove console log 2013-09-19 17:39:11 +02:00
Jerome Nadaud
48d7e43f1c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-19 17:38:19 +02:00
Jerome Nadaud
6f483a87a9 // Fix hide language on ajax load 2013-09-19 17:38:07 +02:00
Sarah Lorenzini
550f6c190b // update stats tabs 2013-09-19 17:36:27 +02:00
Francois Gaillard
8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00
Francois Gaillard
63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
gRoussac
e0b59082f9 [-] BO : Issue with domready on adminImport 2013-09-19 17:19:51 +02:00
Vincent Augagneur
97cff2210f //removed unused code 2013-09-19 17:01:20 +02:00
Vincent Augagneur
53e046c4b5 //removed unused code 2013-09-19 17:00:50 +02:00
gRoussac
0361d5db8d [-] BO : do not reaffect import_type for categories 2013-09-19 16:59:04 +02:00
Kevin Granger
f222bb7b7f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-19 16:58:12 +02:00
Kevin Granger
650001024a // orders cleanup 2013-09-19 16:55:06 +02:00
Vincent Augagneur
2b2b502ba2 //blockbestsellers && bankwire now use displayError & displayConfirmation 2013-09-19 16:55:04 +02:00
Vincent Augagneur
150b68b96b //displayError & displayConfirmation use bootstrap design 2013-09-19 16:52:58 +02:00
Vincent Augagneur
a5642d43a3 //blockbestsellers module configuration is now using bootstrap design 2013-09-19 16:47:51 +02:00
Vincent Augagneur
ef063db2f0 //bankwire module configuration is now using bootstrap design 2013-09-19 16:39:22 +02:00
gRoussac
ea6ea955bb // licence 2013-09-19 16:39:21 +02:00
gRoussac
803b6ce8ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
	controllers/admin/AdminImportController.php
2013-09-19 16:38:01 +02:00
gRoussac
0c511dead5 [*] FIX #PSCFV-8106 do not regenerate thumbnails if not 2013-09-19 16:28:19 +02:00
Jerome Nadaud
33943ef66a // Date range filter 2013-09-19 16:23:26 +02:00
Vincent Augagneur
d1a35838cf //small fix 2013-09-19 16:09:53 +02:00
Jerome Nadaud
3b465111b9 // Customer group 2013-09-19 15:57:28 +02:00
Jerome Nadaud
15622fbf45 // Customers group 2013-09-19 14:25:17 +02:00
Jerome Nadaud
cd627113b6 // Some fix 2013-09-19 12:13:24 +02:00
Kevin Granger
d735496159 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-19 12:09:34 +02:00
Kevin Granger
be8f728b2a // orders 2013-09-19 12:09:25 +02:00
Jerome Nadaud
eb1531a0b3 // Fix textlang size and textarea input group 2013-09-19 11:23:09 +02:00
Jerome Nadaud
c23f01cdc8 // Attributes Groups view 2013-09-19 10:48:16 +02:00
Rémi Gaillard
6b47f5713e // another fix for multishop fields in context all on product page 2013-09-19 09:48:46 +02:00
Rémi Gaillard
5eb4c93b8c [-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935 2013-09-18 19:35:56 +02:00
djfm
0a9f425281 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-18 16:08:44 +00:00
djfm
65559c5cf4 // small improvement to Brazilian translations 2013-09-18 16:08:23 +00:00
Rémi Gaillard
e7286c44f2 // typo 2013-09-18 18:08:22 +02:00
gRoussac
4e1d6de9b0 [-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated 2013-09-18 17:57:00 +02:00
Sarah Lorenzini
5621a3b039 // update tabs stats 2013-09-18 17:47:42 +02:00
Jerome Nadaud
154658befd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-18 17:41:06 +02:00
Jerome Nadaud
5bed29a538 // Fix Employees fields 2013-09-18 17:40:46 +02:00
Francois Gaillard
6e0be0c226 Dashboard - Fixed last day trend 2013-09-18 17:28:04 +02:00
gRoussac
75a9629b8a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-18 17:23:23 +02:00
Jerome Nadaud
38d565110f // List header fix 2013-09-18 17:23:22 +02:00
gRoussac
27f14b9a31 [-] BO : Fix proces and save buttons for Modules and AdminControllers 2013-09-18 17:23:08 +02:00
Rémi Gaillard
70d48d0af1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-18 17:19:18 +02:00
Rémi Gaillard
f6dc81d0f1 // small fix for SSL 2013-09-18 17:19:03 +02:00
Kevin Granger
ac1b9fd96e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-18 17:10:59 +02:00
Kevin Granger
806e628997 // dashboard update version 2013-09-18 17:10:48 +02:00
Jerome Nadaud
4413d04525 // Customer fix 2013-09-18 17:05:16 +02:00
gRoussac
2e311410b2 [*] BO : Set import entity in cookie (#PSCFV-8214) 2013-09-18 17:02:00 +02:00
Jerome Nadaud
64f1ba1e08 // Parameters fix 2013-09-18 16:36:33 +02:00
Rémi Gaillard
0452979ce7 [*] FO: Allow to enable SSL on all the pages 2013-09-18 16:30:34 +02:00
Jerome Nadaud
1f3e717eb6 // Preferences - Admin bootstrap fix 2013-09-18 16:22:05 +02:00
gRoussac
3aec242600 [-] MO : Editorial could not delete image 2013-09-18 16:16:36 +02:00
gRoussac
93aae26269 [-] Bo : Modules 'save' button not active 2013-09-18 15:41:30 +02:00
Jerome Nadaud
0683ed4092 // Some list design fix 2013-09-18 15:25:58 +02:00
Damien Metzger
39fdc8c926 [+] BO : Added new class ConfigurationKPI for KPI cache storage 2013-09-18 15:09:04 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +02:00
Kevin Granger
b71b594ca1 // fix tree search / title / manufacturers 2013-09-18 15:00:10 +02:00
Rémi Gaillard
66f46eee03 // Avoid exception if amount is null on addind an orderpayment 2013-09-18 14:29:01 +02:00
Damien Metzger
8a4b24f45e // Added KPIs in products and categories 2013-09-18 13:49:42 +02:00
Vincent Augagneur
672da852c5 [-] BO - fixed bug #PSCFV-10178 2013-09-18 11:40:58 +02:00
Vincent Augagneur
965b8a1bf3 [-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float 2013-09-18 11:18:26 +02:00
Jerome Nadaud
c48f4f5e1b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-18 10:44:19 +02:00
Jerome Nadaud
5a206e83a8 // Security 2013-09-18 10:43:58 +02:00
Damien Metzger
50a9e7ef99 // Code cleaning 2013-09-18 10:29:19 +02:00
Jerome Nadaud
897f1eafeb //Suppliers view 2013-09-18 10:29:04 +02:00
Jerome Nadaud
8081acb0b5 // Supliers view 2013-09-18 10:09:45 +02:00
Sarah Lorenzini
bdb797a66c // update tabs stats 2013-09-17 17:49:49 +02:00
Jerome Nadaud
8f10a0e32f // Product customization 2013-09-17 17:30:23 +02:00
Kevin Granger
51663f972e // fix scenes 2013-09-17 17:15:40 +02:00
Jerome Nadaud
0971750f9f // Attribute generator to bootstrap 2013-09-17 16:36:54 +02:00
Rémi Gaillard
47c5f400ee // Add gender on order view 2013-09-17 16:30:47 +02:00
Vincent Augagneur
322654cacf //small fix with mode catalog and cart button 2013-09-17 14:54:38 +02:00
Damien Metzger
f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Jérôme Nadaud
a0be556795 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-17 12:33:48 +02:00
Jérôme Nadaud
47341ce0bb // Attributes generator 2013-09-17 12:33:06 +02:00
Kevin Granger
a53080eefc // fix bug css 2013-09-17 12:32:36 +02:00
Vincent Augagneur
3151064daf //small fix on helper form && option 2013-09-17 12:18:37 +02:00
Kevin Granger
5c04e5564c // tags + fixed-width 2013-09-17 11:59:57 +02:00
Rémi Gaillard
e6e8efc19a [-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop 2013-09-17 11:58:12 +02:00
Rémi Gaillard
6ee6317fee // orderby position 2013-09-17 11:07:29 +02:00
Jérôme Nadaud
0ab792cc6e // Change tagify class 2013-09-17 10:52:21 +02:00
Damien Metzger
c0c4af988f // Added net profits / visitor as a KPI 2013-09-17 10:47:54 +02:00
Damien Metzger
70f284ad88 [+] BO : new graph engine nvd3 (still need some development - will replace the other engines) 2013-09-17 10:24:46 +02:00
Jérôme Nadaud
455904a59b // Some input fix 2013-09-17 10:13:00 +02:00
Kevin Granger
e08d2a8361 // fix 2013-09-17 10:00:33 +02:00
Jérôme Nadaud
ab5dd91359 // Localization 2013-09-17 09:18:56 +02:00
Jerome Nadaud
57ed337030 // Fix autosize for products attachment tab textarea 2013-09-16 18:57:11 +02:00
gRoussac
2d5bd901f4 [*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3 2013-09-16 18:51:06 +02:00
Damien Metzger
8934f9c7ed [*] BO : Connected the first KPIs to real data 2013-09-16 18:40:34 +02:00
Jerome Nadaud
80b6d5a570 // fix autosize for textarea in options.tpl 2013-09-16 18:28:57 +02:00
Jerome Nadaud
a4103265e5 // Color picker 2013-09-16 18:17:29 +02:00
Sarah Lorenzini
4ef7bd0b77 // update stats tab 2013-09-16 17:51:03 +02:00
Jerome Nadaud
7b06758e22 // Fix carrier header and button link 2013-09-16 17:23:01 +02:00
gRoussac
b9b4265517 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-16 17:18:56 +02:00
gRoussac
15dd1cf96f [-] BO : Fix bugPSCFV-10249 images copy when unix path 2013-09-16 17:16:11 +02:00
Vincent Augagneur
c7a777163c //small fix 2013-09-16 17:14:08 +02:00
Jerome Nadaud
fce87cf66a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 17:05:39 +02:00
Jerome Nadaud
235af94a92 // Fix Page header toolbar 2013-09-16 17:05:27 +02:00
Vincent Augagneur
b0ace74155 //small fix 2013-09-16 16:30:13 +02:00
Jerome Nadaud
7643a45d81 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 16:12:37 +02:00
Jerome Nadaud
29dad488d4 // Stats list active class 2013-09-16 16:12:23 +02:00
Gregory Roussac
1c58c1ea6b Merge pull request #726 from cinscaen/patch-1
[-] BO : Move product images in POST method in admin.js
2013-09-16 07:01:45 -07:00
CINS
852faeab7a Update admin.js
Lorsqu'un produit possède trop d'images, il est impossible de réordonner celle-ci car la valeur JSON fourni en URL (GET) est beaucoup trop longue. Il faut envoyer les données JSON en POST pour solutionner le problème de longueur.
---------
When a product has many pictures, we can't reorder them. The JSON value is too long in URL (GET). We need to send data with POST to avoid problem.
2013-09-16 15:57:44 +02:00
Sarah Lorenzini
9dfb573422 // update stats tab 2013-09-16 15:46:21 +02:00
Jerome Nadaud
517e95387c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 15:33:04 +02:00
Jerome Nadaud
3107a4c3f0 // Translations 2013-09-16 15:32:49 +02:00
Kevin Granger
7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger
f9334b029b // add .row-margin-bottom 2013-09-16 15:05:19 +02:00
gRoussac
8504574ae1 [-] IN : Could not remove some tabs 2013-09-16 15:02:12 +02:00
Jerome Nadaud
8f7cb72231 // Fix tabstop on language dropdown button 2013-09-16 14:35:28 +02:00
Jerome Nadaud
7e8d119213 // Textarea autosize 2013-09-16 14:25:49 +02:00
Kevin Granger
7c01df9268 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 11:45:13 +02:00
Kevin Granger
70b39019bf // kpi orders 2013-09-16 11:45:02 +02:00
Damien Metzger
e68c124218 [-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396 2013-09-16 11:42:11 +02:00
gRoussac
08efa4e313 [-] IN : Fix bug #PSCFV-10382 add_module_to_hook retunrning false when hook not exists 2013-09-16 11:12:55 +02:00
Vincent Augagneur
636c4575f7 //added warning domaine on dashboard && prestashop news improve 2013-09-16 10:59:42 +02:00
Vincent Augagneur
e0739ea1e0 Merge pull request #720 from makk1ntosh/development
//Added ui.button as dependency of ui.dialog
2013-09-16 01:35:25 -07:00
Damien Metzger
0e3d53321a [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:56:22 +02:00
Kevin Granger
2af6c30bde // fix nav 2013-09-16 09:50:34 +02:00
Damien Metzger
533003faa0 [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:37:58 +02:00
Jerome Nadaud
d7c1cd90bf Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-16 09:25:57 +02:00
Jerome Nadaud
c0afb55d11 [-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link 2013-09-16 09:25:10 +02:00
Gregory Roussac
3b9c125198 Merge pull request #723 from codeurWeb/patch-2
[+] MO : Blocknewproducts add hookHome
2013-09-14 08:58:14 -07:00
Julien
08373c0541 [+] Modules : add hookHome 2013-09-14 14:57:00 +02:00
gRoussac
73dd524de8 [-] BO : Could not order in AdminStatuses by ID or template 2013-09-14 00:05:45 +02:00
Kevin Granger
81a783679d // fix nav 2013-09-13 18:35:27 +02:00
gRoussac
10472ef83c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-13 17:57:06 +02:00
gRoussac
6da1228359 [-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed 2013-09-13 17:56:45 +02:00
Kevin Granger
bcfd092a1d // fix nav 2013-09-13 17:48:46 +02:00
Jerome Nadaud
be0592d5a2 // Some fix 2013-09-13 17:19:20 +02:00
Jerome Nadaud
74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
makk1ntosh
d0ef8cca8f Added ui.button as dependency of ui.dialog
While developing my own module, i've upgraded installation to latest version of PS and impacted a bug:

$('#something').dialog({...}); caused an error: t().button is not a function.



In my php code i had this:
$this->context->controller->addJqueryUI('ui.dialog');

i found that it doesn't load ui.button dependency.

Added 'ui.button' to classes/Media.php at the end of ui.dialog dependencies and all worked fine.
2013-09-13 08:02:47 -07:00
Jerome Nadaud
5e2aa392da // Some fix 2013-09-13 15:40:51 +02:00
Jerome Nadaud
97ec6341e8 [-] BO ; Fix bug #PSCFV-10393 manufacturer filter 2013-09-13 15:39:30 +02:00
Jerome Nadaud
7b532d77fd // Fix some bootstrap design 2013-09-13 15:36:27 +02:00
Kevin Granger
b58dddf521 // moved search/reset of list header 2013-09-13 15:03:26 +02:00
Kevin Granger
4f3183283f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 12:18:43 +02:00
Kevin Granger
4cde899834 // localization 2013-09-13 12:18:27 +02:00
Jerome Nadaud
0ba9704c21 // Fix class index error 2013-09-13 12:17:24 +02:00
Rémi Gaillard
5363e75238 // small fix 2013-09-13 12:13:12 +02:00
Gregory Roussac
a3d9643833 Merge pull request #719 from zimmi1/patch-4
Update Connection.php correction from 717
2013-09-13 02:59:06 -07:00
zimmi1
4f06b74a29 Update Connection.php correction from 717
I'm very very sorry, I produced an error with the last commit on this file: there was an error in parenthesis position on line 117. Line 117 should be as line 131.
(But how did I manage to make this wrong ???)
2013-09-13 11:56:50 +02:00
Jerome Nadaud
2bf17241bd // Fix associated categories tree header 2013-09-13 11:50:27 +02:00
Kevin Granger
968f2a45d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 11:41:26 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
2013-09-13 11:41:14 +02:00
Gregory Roussac
61295e4e21 Merge pull request #717 from zimmi1/patch-2
[*] CORE : Speeding up sql queries in Connection
2013-09-13 02:09:25 -07:00
gRoussac
d9bc07d030 [-] BO : quote badly decoded in customerThreads 2013-09-13 10:45:07 +02:00
Jerome Nadaud
3eb4d65fc9 [-] BO : Fix Bug #PSCFV-10331 check all from list 2013-09-13 10:26:08 +02:00
zimmi1
452f41df8d Speeding up sql queries
Searching for "DATE_ADD(date_add, INTERVAL 30 MINUTE) > now" needs for every line to add 30 minutes to the date. but it is the same operation as comparing "date_add > (now - 30 minutes).
It is faster because there is no DATE_ADD calculation.

The problem:
By profiling speed of my shop, this query appeared after about 3 months always as the absolute slowest query of the shop, needing about 15 to 30 ms to perform, because I have now nearly 700 connections to my shop (and it then browses the 700 lines)

A solution:
Removing DATE_ADD MySql function and using date() and time() functions of php for calculating only once the 30 min. difference.

Using this solution takes it down again to 0.8 to 1.3 ms.

I guess it is the same in case of bots (could be even worse as they can make thousands of connections).
2013-09-13 10:05:30 +02:00
Jerome Nadaud
f20fa55308 // Fix filter by category checkbox 2013-09-13 09:49:07 +02:00
Kevin Granger
ce74aeb357 // nav 2013-09-13 09:35:36 +02:00
Damien Metzger
d914982961 // Rounded sales on dashboard 2013-09-12 19:26:38 +02:00
Jerome Nadaud
7d9f9a7bfc // Fix CMS missing Page header toolbar 2013-09-12 19:21:53 +02:00
Jerome Nadaud
3cf4dc76b5 // Fix missing localizations page header toolbar 2013-09-12 18:54:28 +02:00
Damien Metzger
06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
Damien Metzger
f20a3eb9b5 // Fixed most viewed conversion rate 2013-09-12 18:24:18 +02:00
Damien Metzger
26babfc8f9 // Binded most viewed products on analytics 2013-09-12 18:24:17 +02:00
Damien Metzger
481dc3d307 // Dashboard is almost complete 2013-09-12 18:24:17 +02:00
Damien Metzger
278cd952e2 // Gapi choose between 1.3 and 3.0 versions 2013-09-12 18:24:17 +02:00
Jerome Nadaud
14a9d914d8 // Fix module uninstall button 2013-09-12 18:23:27 +02:00
gRoussac
db4b69d10c [-] BO : Customer message twice encoded 2013-09-12 18:03:30 +02:00
Jerome Nadaud
81b6ec93f9 // Add count down to text input 2013-09-12 17:59:25 +02:00
Jerome Nadaud
039955e6a1 // Fix bug customer list in multistore 2013-09-12 16:59:25 +02:00
Jerome Nadaud
29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Jerome Nadaud
ba6699a378 // Fix Admin access 2013-09-12 15:55:14 +02:00
Jerome Nadaud
c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
gRoussac
5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +02:00
Rémi Gaillard
30591b7c28 // Typo 2013-09-12 15:04:47 +02:00
Rémi Gaillard
f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Jerome Nadaud
bc221b993b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 14:55:58 +02:00
Jerome Nadaud
873eee8ad0 // Tree list bug 2013-09-12 14:55:45 +02:00
Damien Metzger
c2d15f4ade // Changed language display in back office dropdown menu 2013-09-12 14:53:12 +02:00
Jerome Nadaud
e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Kevin Granger
91d3da310b // dashboard panel version 2013-09-12 14:42:20 +02:00
Francois Gaillard
cc36eb2d27 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-12 14:32:22 +02:00
Francois Gaillard
53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day 2013-09-12 14:32:02 +02:00
Gregory Roussac
8590b0e699 Merge pull request #716 from romainberger/typos
[*] FO : removed extra slash and point
2013-09-12 05:30:36 -07:00
romainberger
876be3b452 [*] FO : removed extra slash and point 2013-09-12 14:07:45 +02:00
Kevin Granger
a1b0710f85 // fix menu + sass refacto 2013-09-12 12:26:08 +02:00
gRoussac
e5276ff531 [-] FO : 301 Redirect /iso_lang to /iso_lang/ url 2013-09-12 11:16:12 +02:00
Vincent Augagneur
4a6c5979a8 //added new useful links on dashboard 2013-09-12 10:52:56 +02:00
gRoussac
90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +02:00
gRoussac
3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop
Conflicts:
	modules/mailalerts/mailalerts.php
2013-09-12 10:09:25 +02:00
Vincent Augagneur
6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00
Vincent Augagneur
38822bfb5e //dashactivity configuration 2013-09-12 10:08:28 +02:00
Rémi Gaillard
ea1bdbc849 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-12 10:01:39 +02:00
Gregory Roussac
f0297824d7 Merge pull request #709 from AgenceNetDesign/development
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-12 00:56:36 -07:00
Gregory Roussac
c91a86740f Merge pull request #715 from Prestaspirit/patch-6
[-] MO : Blocklayered Fixed a bug when displaying textures
2013-09-12 00:55:28 -07:00
Prestaspirit
a37033e478 [-] MO : Fixed a bug when displaying textures
Corrections links texture image in the blocklayered
2013-09-12 07:01:55 +02:00
Jerome Nadaud
e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
Rémi Gaillard
9fa6c86a94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-11 20:05:13 +02:00
Kevin Granger
ab8d5bc265 // VT theme 2013-09-11 18:17:57 +02:00
Kevin Granger
18212420c3 // fix switch menu top // side 2013-09-11 17:26:44 +02:00
Damien Metzger
739d1434b5 // Small fix 2013-09-11 17:02:44 +02:00
Kevin Granger
99263a1492 // switch menu top // side 2013-09-11 16:56:10 +02:00
Damien Metzger
ddd7ed2d2b // Connected traffic sources to analytics (dashboard) 2013-09-11 16:43:24 +02:00
Rémi Gaillard
f4f3084c35 [-] Core: Set a remote addr with php-cli #PSCFV-10372 2013-09-11 16:40:33 +02:00
Rémi Gaillard
a4d131eac9 [-] WS: Fix entities retrieve for some cases 2013-09-11 16:32:11 +02:00
gRoussac
e2dac03baa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-11 16:30:52 +02:00
gRoussac
dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Rémi Gaillard
31c94caebc [-] BO: Fix out of stock creation with multishop and stock sharing 2013-09-11 16:22:13 +02:00
Damien Metzger
4a3e0c5075 // Updated README.md 2013-09-11 16:11:28 +02:00
Rémi Gaillard
c42d71b8f5 // oups 2013-09-11 16:06:23 +02:00
Rémi Gaillard
669c3791b5 [-] BO: Fix preview url with multishop 2013-09-11 15:55:25 +02:00
Jerome Nadaud
7909a7388c //Fix disabled categories with add parameter 2013-09-11 15:41:08 +02:00
Jerome Nadaud
617b58ba2f //Fix Text input desc error 2013-09-11 15:40:21 +02:00
Rémi Gaillard
3e750490fe // chmod class_index 666 instead of 664 2013-09-11 15:16:15 +02:00
Jerome Nadaud
49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
gRoussac
01be908e51 [-] CORE : Could not add several cart rules 2013-09-11 14:50:42 +02:00
Damien Metzger
0ff6b25f56 // Fixed norm 2013-09-11 14:15:56 +02:00
Damien Metzger
981ce70594 // Added realtime Analytics to the dashboard (private beta only at this time) 2013-09-11 14:07:56 +02:00
Vincent Augagneur
937ce38a1f //added dashactivity config 2013-09-11 12:25:07 +02:00
Kevin Granger
913ee1007c // menu top 2013-09-11 11:32:06 +02:00
Vincent Augagneur
486bb58bf6 //added dashboard widget config toggle display 2013-09-11 11:07:38 +02:00
Vincent Augagneur
3cc187a716 //dashactivity trafic source data_list & pie_chart 2013-09-11 10:34:01 +02:00
gRoussac
9f12ff15be [-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta 2013-09-11 10:30:40 +02:00
Gregory Roussac
53805f2b93 Merge pull request #712 from Prestaworks/patch-13
[-] MO : Customization data is not included in new order email.
2013-09-11 00:58:30 -07:00
Daniel
614e56283a Update mailalerts.php
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08:00
Kevin Granger
f29b1b3a31 // perts fix + menu top WIP 2013-09-10 20:23:06 +02:00
gRoussac
85a471a690 //bad commit , sorry for that 2013-09-10 18:51:20 +02:00
gRoussac
86d3a8afe1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-10 18:49:05 +02:00
gRoussac
f94f0f14a4 [-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address 2013-09-10 18:48:28 +02:00
Jerome Nadaud
e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Gregory Roussac
31d762b88a Merge pull request #710 from nilsga/development
[*] CORE : Add Bcc support in Mail class
2013-09-10 09:24:04 -07:00
Nils-Helge Garli Hegvik
9713f93075 Add Bcc support in Mail class 2013-09-10 17:11:34 +02:00
Vincent Augagneur
1aba28ff6f //typo 2013-09-10 16:42:54 +02:00
Jerome Nadaud
7990db8b0c // Tree folders icon problem 2013-09-10 14:34:48 +02:00
Jerome Nadaud
85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
unknown
c5afbc75bd [-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691 2013-09-10 12:01:38 +02:00
gRoussac
332d68c7ec [-] MO : Statsdata, exception on duplicate entry 2013-09-10 11:08:57 +02:00
Nicolas Sorosac
f30a088848 [*] MO : MailAlerts : Add SQL update script for v2.5 2013-09-10 11:01:11 +02:00
Rémi Gaillard
3c090535a9 // small fix for image SSL links 2013-09-10 10:39:03 +02:00
Nicolas Sorosac
c4681c1fb1 [*] MO : MailAlerts : multishop/multilang full compatibility
Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)

SQL update table : `ps_mailalert_customer_oos`
=========================================

ALTER TABLE `ps_mailalert_customer_oos`
ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,
DROP PRIMARY KEY ,
ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
2013-09-10 10:24:40 +02:00
Rémi Gaillard
021790a3e2 [-] FO: Fix SSL links on domain_ssl instead domain 2013-09-10 10:15:52 +02:00
Kevin Granger
03d1697e19 // treeview helper 2013-09-10 09:41:39 +02:00
Damien Metzger
1d8da79507 [-] BO : fixed notifications when there is too much data 2013-09-10 09:17:54 +02:00
gRoussac
4968a792b4 [-] IN : Remove notice when upgrading from 2013-09-10 01:12:52 +02:00
Kevin Granger
2a7bc49190 // treeview 2013-09-09 19:03:38 +02:00
Jerome Nadaud
e91460b8fe [-] BO : Change Nested categories 2013-09-09 18:58:32 +02:00
Jerome Nadaud
4e8658f1d6 [+] BO : Helper Tree js improvement 2013-09-09 18:57:42 +02:00
Vincent Augagneur
b6e0583af8 //added security check on dashboard 2013-09-09 18:47:15 +02:00
Vincent Augagneur
4e1a513371 //added rss and useful link on dashboard 2013-09-09 18:44:34 +02:00
Kevin Granger
69b38f4d6f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
2013-09-09 18:13:49 +02:00
Kevin Granger
7774e46cb3 // tree view product 2013-09-09 18:12:31 +02:00
Gregory Roussac
a383d55421 Merge pull request #707 from sjousse/development
[-] MO: ShopImporter fix imported prices
2013-09-09 08:31:15 -07:00
sjousse
00f3045690 fix imported prices 2013-09-09 17:24:27 +02:00
Gregory Roussac
5362f4d426 Merge pull request #699 from sjousse/patch-1
[*] MO : ShopImporter Optimize image copy in ShopImport module
2013-09-09 08:11:51 -07:00
Gregory Roussac
9880d152d4 Merge pull request #706 from sjousse/development
[*] MO : Add some fields to Orders in Import module
2013-09-09 08:10:12 -07:00
sjousse
990a889b1c Add some fields to Orders in Import module 2013-09-09 17:08:17 +02:00
Jerome Nadaud
7bb295b076 // 2013-09-09 16:21:32 +02:00
gRoussac
e6d0a3e5a4 // revert form 2874f14983 2013-09-09 15:11:55 +02:00
Rémi Gaillard
242556e176 [-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache 2013-09-09 15:12:26 +02:00
Jerome Nadaud
c502c9766f [-] BO : FixBug PSCFV-10331 - Tax rules Pagination 2013-09-09 15:04:14 +02:00
Vincent Augagneur
c18dea7296 //carrier wizard fix - bootstrap compatibility 2013-09-09 14:14:57 +02:00
Jerome Nadaud
accd2d77c1 [+] BO : Adding tree templates and functions 2013-09-09 12:20:58 +02:00
gRoussac
54f7c65165 [-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_ 2013-09-09 12:20:38 +02:00
Jerome Nadaud
b5f6e8a1d8 [+] BO : Add "tree-selected" class to tree.js 2013-09-09 12:10:26 +02:00
djfm
641cf225f2 // fix small translation bug PSCFV-10329 2013-09-09 09:47:44 +00:00
djfm
6ea3783013 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-09 09:46:49 +00:00
Damien Metzger
dcad699ede [-] FO : fixed chinese search with multiple symbols #PSCFV-10322 2013-09-09 11:19:11 +02:00
Francois Gaillard
e1d0347757 [-] Classes : Bug fix - FrontController, mobile & JS minifier fixed 2013-09-09 10:17:15 +02:00
gRoussac
b975a9375c [-] IN : remove warnings while upgrading 2013-09-09 00:10:03 +02:00
gRoussac
9c756a7fcb [-] IN : Do not duplicate images types when coming from 1.4, update it 2013-09-08 23:22:36 +02:00
gRoussac
6b03af9ef9 [-] BO : ini_get('safe_mode') can return false 2013-09-08 22:26:21 +02:00
gRoussac
ec556bb307 // remove Warning on array_map() 2013-09-08 20:01:55 +02:00
gRoussac
e6f8dba2e6 // remove Notice: Undefined index 2013-09-08 19:55:03 +02:00
gRoussac
25ba388d69 [-] IN : fix bad pathes 2013-09-08 18:29:06 +02:00
gRoussac
e5337f5e76 [-] IN : Do not test module names if they are not directories 2013-09-08 18:25:54 +02:00
gRoussac
683513a9d2 [-] IN : Remove fails on upgrade coming to loop when upgrading again 2013-09-08 17:29:00 +02:00
gRoussac
19a6c4373e [-] IN : Remove warnings when safe_mode open_basedir missconfigured 2013-09-08 17:25:59 +02:00
gRoussac
2874f14983 [-] CORE : Fix bug #PSCFV-10040 Notice: Undefined index: unifunc && Fatal error: Function name must be a string on some PHP version with empty cache folder and smarty cache enabled 2013-09-06 23:55:58 +02:00
Cosmin Hutanu
7491f46322 Merge pull request #1 from PrestaShop/development
update from prestashop/development
2013-09-06 12:42:22 -07:00
gRoussac
4c49048e39 [-] FO : Partial fix of adding gift on cart rule on the same entity in the cart rule 2013-09-06 18:35:56 +02:00
Rémi Gaillard
302d5f94dd // grmbl 2013-09-06 18:33:19 +02:00
Damien Metzger
a10b5a517f // Added visits to chart 2013-09-06 17:56:26 +02:00
Fabio Chelly
e5f53afd5f Merge remote-tracking branch 'origin/development' into development 2013-09-06 17:54:34 +02:00
Fabio Chelly
9377775eca [-] MO productcomments :
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented

#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
Jerome Nadaud
f6355ff2d5 [-] BO : Change categories tree method 2013-09-06 17:09:32 +02:00
Jerome Nadaud
c7e4f0ce5f [+] BO : Adding Tree Helper 2013-09-06 17:06:19 +02:00
Jerome Nadaud
36a863df59 [+] BO : Adding Tree Helper 2013-09-06 17:05:19 +02:00
Damien Metzger
8df63f256d // Added chart data 2013-09-06 16:25:51 +02:00
Kevin Granger
fa198aeabc // fix menu, design, css 2013-09-06 16:25:01 +02:00
Francois Gaillard
768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set 2013-09-06 15:41:24 +02:00
Fabio Chelly
1b0c5be93d Merge remote-tracking branch 'origin/development' into development 2013-09-06 11:47:11 +02:00
Fabio Chelly
663f592306 [-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
#PNM-627
#PNM-1610
#PNM-1616
2013-09-06 11:40:41 +02:00
Kevin Granger
8e1250dad1 // I hate <br /> 2013-09-06 11:13:18 +02:00
Kevin Granger
1b2bab6943 // performance 2013-09-06 11:03:36 +02:00
Damien Metzger
ec11b7e064 // Better control of the requests when our website is down 2013-09-06 10:18:48 +02:00
Kevin Granger
5afdc024aa // navigation sidebar 2013-09-06 09:48:22 +02:00
Fabio Chelly
7e1c0d5a24 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-06 09:24:43 +02:00
Vincent Augagneur
79677324b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-05 19:11:07 +02:00
Vincent Augagneur
3c2a086296 //merge 2013-09-05 19:10:59 +02:00
Kevin Granger
b2fd886722 // add new tpl for navigation top/side 2013-09-05 19:07:57 +02:00
Vincent Augagneur
4b2ef10dd6 //dashboard data-chart-line added 2013-09-05 19:07:49 +02:00
gRoussac
53241af228 // remove strict standard warning 2013-09-05 19:00:25 +02:00
Rémi Gaillard
a3233cc00c // 2013-09-05 18:51:53 +02:00
Rémi Gaillard
c35d8c7845 // 2013-09-05 18:47:13 +02:00
Rémi Gaillard
f5e00a59f7 // 2013-09-05 18:41:51 +02:00
gRoussac
a7d619b208 [-] MO : fix bug #PSCFV-9906 again, bad url parsing 2013-09-05 18:39:07 +02:00
Rémi Gaillard
8868271c07 // push changes 2013-09-05 18:37:25 +02:00
sjousse
6b080e1f02 Optimize image copy in ShopImport module
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).

+ some cleaning of unused variables
2013-09-05 18:24:02 +02:00
Vincent Augagneur
e7495f3fe4 //oups 2013-09-05 17:38:17 +02:00
Damien Metzger
2ff2a6b6f9 // Profiling adapted to the new dashboard 2013-09-05 17:28:05 +02:00
Vincent Augagneur
06b54d0519 //typo 2013-09-05 16:35:15 +02:00
Vincent Augagneur
4124a48b1e //added check on range picker if date from is superior than date to 2013-09-05 16:34:03 +02:00
Vincent Augagneur
e4932131f6 //small fix 2013-09-05 16:25:42 +02:00
Vincent Augagneur
1481dc0f5f //added PS_DASHBOARD_USE_PUSH in install 2013-09-05 16:03:14 +02:00
Vincent Augagneur
7568b84f9f //added PS_DASHBOARD_USE_PUSH in upgrade 2013-09-05 16:02:30 +02:00
Rémi Gaillard
0f81518ba2 // Add a buton to erase all log 2013-09-05 15:58:36 +02:00
Damien Metzger
c306b2a425 // Small fix dashboard push 2013-09-05 15:41:10 +02:00
gRoussac
6e5fb47642 [-] INSTALLER : Fix bug #PSCFV-8289 bad orders vouchers total after update 2013-09-05 15:31:13 +02:00
Vincent Augagneur
e352f2137f //small fix 2013-09-05 15:30:59 +02:00
Vincent Augagneur
c34dbcf43a //dashboard range date choice in ajax 👍 2013-09-05 15:25:41 +02:00
Sarah Lorenzini
f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +02:00
Sarah Lorenzini
73524c7a4c // update maintenance and email pages 2013-09-05 14:16:06 +02:00
Kevin Granger
d9a429eccc // update radio helper 2013-09-05 14:06:54 +02:00
Vincent Augagneur
1c88bdd24e //dashboard widget regardless refresh 2013-09-05 11:52:18 +02:00
Vincent Augagneur
38e00f9080 //disabled push on dashboard by default 2013-09-05 11:47:57 +02:00
Damien Metzger
95c9edd87a // Fixed Gapi v3.0 token refresh 2013-09-05 11:42:57 +02:00
gRoussac
824a6b90f3 [-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift 2013-09-05 11:07:41 +02:00
Vincent Augagneur
009536d3f4 //small fix on version compare for install module 2013-09-05 10:33:15 +02:00
Vincent Augagneur
5fa8cc4d47 //added translation 2013-09-05 10:17:18 +02:00
Gregory Roussac
284711b22f Merge pull request #697 from sjousse/patch-1
MO : Shopimporter change the way to get the home category (get it from Configuration )
2013-09-05 01:16:29 -07:00
sjousse
2f6e0e3fae Changed the way to get the home category (get it from Configuration table now) 2013-09-05 10:14:31 +02:00
Vincent Augagneur
49718d6ea9 //new install version for gamification & bootstrap compatibility 2013-09-04 23:16:56 +02:00
Vincent Augagneur
befddf0115 //added 1.6.0.1.sql 2013-09-04 23:15:49 +02:00
Rémi Gaillard
6e3d24b567 // add push 2013-09-04 19:33:05 +02:00
Damien Metzger
114b86ed43 // Stats 2013-09-04 19:15:14 +02:00
Kevin Granger
d5a25f063f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-04 18:56:32 +02:00
Kevin Granger
161c612c02 // fix modules list 2013-09-04 18:56:00 +02:00
Gregory Roussac
d59f3383cf Merge pull request #694 from sjousse/patch-1
[*] MO : ShopImporter module is now aware of multi-shop for categories
2013-09-04 09:28:23 -07:00
Vincent Augagneur
6b2492b62c //added data into dashproducts module 2013-09-04 18:26:58 +02:00
sjousse
4d68595447 ShopImporter module is now aware of multi-shop
Imported categories was affected to Root category instead of a Shop's Home category.
I took the first shop home category is by default.
Maybe adding an option to choose the shop where the datas should be imported.
2013-09-04 18:26:24 +02:00
Kevin Granger
22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
Gregory Roussac
07bdcd4129 Merge pull request #693 from sjousse/development
[-] MO : Add date_add field to categories to prevent failure of updateCat() method
2013-09-04 07:46:44 -07:00
sjousse
e9d066c981 fix value of date_add 2013-09-04 16:40:12 +02:00
sjousse
56a1449c69 add date_add to categories 2013-09-04 16:32:00 +02:00
gRoussac
63c19ce1a9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:39:25 +02:00
gRoussac
3ca2c8da95 [-] BO : Fix #PSCFV-9906 could not register search engines keywords 2013-09-04 15:39:02 +02:00
Kevin Granger
b4ecaf3ddb // Carrier Wizard with bootstrap WIP 2013-09-04 15:38:45 +02:00
Rémi Gaillard
00c1860d22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:08:41 +02:00
Rémi Gaillard
9348768ceb [-] MO: Fix blocklayered sort by quantity #PSCFV-10300 2013-09-04 15:05:55 +02:00
Damien Metzger
cf1f9a01db // More stats 2013-09-04 14:38:27 +02:00
Vincent Augagneur
40eab759dd //remove debug 2013-09-04 14:24:17 +02:00
gRoussac
7b0349ca33 // bad commit sorry for that 2013-09-04 11:14:45 +02:00
gRoussac
efa81a7107 [-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0 2013-09-04 11:14:00 +02:00
gRoussac
da353c884d [-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT 2013-09-04 10:45:48 +02:00
gRoussac
df56d7af42 [-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678 2013-09-04 10:38:14 +02:00
djfm
87567ed1a0 // fixed translation of modules descriptions containing quotes 2013-09-04 07:44:52 +00:00
Gregory Roussac
5d38743b72 Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton
[-] BO : Remove warning in AdminController.php
2013-09-04 00:40:41 -07:00
Jerome Nadaud
75a663b6e3 [-] BO : Fix pull request #665 2013-09-04 09:40:12 +02:00
Vincent Augagneur
08806f0240 //recents orders data-table for dashboard 2013-09-04 09:36:09 +02:00
ha99y
f4892686c1 Warning in AdminController.php
If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.

Warning: simplexml_load_file()
1: parser error : Document is empty
2013-09-03 17:30:05 -07:00
Kevin Granger
671d419c27 // Carrier Wizard with bootstrap WIP 2013-09-03 19:36:04 +02:00
gRoussac
b55a84e961 [-] INSTALLER : Fix infinite loop when order message has additional ampersand 2013-09-03 18:36:30 +02:00
gRoussac
6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
Damien Metzger
f29c2d3fcb // Added some figures to the dashboard 2013-09-03 18:00:34 +02:00
gRoussac
5d8e187faa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-03 17:43:51 +02:00
gRoussac
0891c986d6 // fix from comment c6d2e1252e (commitcomment-4002919) 2013-09-03 17:43:33 +02:00
Gregory Roussac
8fedbe189c Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 06:41:06 -07:00
Jerome Nadaud
7d61be252f [+] BO : Get categories in nested array 2013-09-03 15:27:58 +02:00
Kevin Granger
5f5997b567 // fix quick access -> target _blank for frontend 2013-09-03 15:19:34 +02:00
Vincent Augagneur
b840f28137 //oups 2013-09-03 15:13:05 +02:00
soufyan
cd7d604b75 [*] Project : Orders should rely only on ps_order_cart_rule 2013-09-03 15:10:06 +02:00
Gregory Roussac
5caae97813 Merge pull request #680 from djfm/development
// fixed unstranslatable string in AdminSupplyOrdersController
2013-09-03 06:00:50 -07:00
Kevin Granger
dca6e39feb // css for tree view 2013-09-03 14:52:50 +02:00
djfm
572a2e45aa // fixed unstranslatable string in AdminSupplyOrdersController 2013-09-03 12:51:21 +00:00
gRoussac
98f60d039b // fix warning 2013-09-03 12:29:17 +02:00
Kevin Granger
2990497a26 // header notifications 2013-09-03 12:25:48 +02:00
Damien Metzger
a900edee68 // Data, data, data 2013-09-03 11:05:24 +02:00
Vincent Augagneur
70e6aea7c3 //typo 2013-09-03 10:59:12 +02:00
Vincent Augagneur
5dc2eec97d //added tab content in dashproduct module 2013-09-03 10:38:43 +02:00
Damien Metzger
61d10abc76 // Use date_from and date_to in dashboard stats 2013-09-03 10:34:21 +02:00
Vincent Augagneur
7b902ac99d //added param date_from & date_to on hookDashboardDatas 2013-09-03 10:30:08 +02:00
Vincent Augagneur
4d3b378965 //added form date range picker on dashboard 2013-09-03 10:19:15 +02:00
Gregory Roussac
656717fb4c Merge pull request #679 from kluevandrew/patch-3
[*] BO : Cursor "pointer" for .button class
2013-09-03 00:51:38 -07:00
Gregory Roussac
e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50
[*] BO: sort modules name in Stats
2013-09-03 00:49:11 -07:00
Andrew
97f1db480a BO: Cursor "pointer" for .button
Cursor "pointer" for each button in back office
2013-09-03 11:35:50 +04:00
Damien Metzger
19fc22fbf0 // Added translations directory to module gapi 2013-09-02 20:34:43 +02:00
Damien Metzger
1fc507d8d2 // Added configuration checks to the Google Analytics modules
// Implemented the first real data in the dashboard
2013-09-02 20:18:51 +02:00
Jerome Nadaud
c3772fb355 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 19:11:17 +02:00
Jerome Nadaud
da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
Kevin Granger
268183f4d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 19:05:55 +02:00
Kevin Granger
2f5054cb92 // fix anime dashboard loading 2013-09-02 19:05:34 +02:00
Damien Metzger
63a9fd0236 [*] MO : Added help in the Google Analytics API module 2013-09-02 18:54:39 +02:00
gRoussac
94bdde4630 [-] CORE : Remove PHP Warning: file_put_contents on modules config.xml 2013-09-02 18:19:21 +02:00
Gregory Roussac
abf5ad195c Merge pull request #676 from dlage/patch-1
[*] MO : blocknewproducts avoid $newProducts not defined
2013-09-02 08:58:32 -07:00
Vincent Augagneur
11cd88cf63 //data bind dashtrends module 2013-09-02 17:25:33 +02:00
Vincent Augagneur
9265676f0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 17:23:00 +02:00
Vincent Augagneur
f165dae15d //now you can refresh each dashboard module you want 2013-09-02 17:22:51 +02:00
Gregory Roussac
b2ccf88296 Merge pull request #663 from sjousse/patch-1
[-] MO : Shopimporter file_exists does not exists in Validate Class
2013-09-02 08:21:42 -07:00
Gregory Roussac
f7eb6b3a16 Merge pull request #665 from Ha99y/Get-Combination-Images
[*] CLASSES : Add $id_product_attribute param to Image::getImages
2013-09-02 08:11:48 -07:00
Damien Metzger
48d7bc890a // Fixed warning in AdminModulesController (variable conflict) 2013-09-02 17:11:41 +02:00
Rémi Gaillard
6059b4301a // states list 2013-09-02 17:10:20 +02:00
Damien Metzger
c1cdc90343 [+] MO : new module Gapi for Google Analytics API 2013-09-02 17:07:19 +02:00
Kevin Granger
121554026c // adjustments on modules dash 2013-09-02 16:41:48 +02:00
gRoussac
36d9e0eed5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 16:28:56 +02:00
gRoussac
c6d2e1252e [-] INSTALLER : Fix fatal error in upgrade, could not load configuration class 2013-09-02 16:28:38 +02:00
Kevin Granger
af3051ca8f // BO Dashboard : animate transition 2013-09-02 16:09:27 +02:00
Vincent Augagneur
81c47a085e //fix remove class loading 2013-09-02 15:41:28 +02:00
Kevin Granger
399f60b900 // BO Dashboard loading et trends 2013-09-02 15:17:05 +02:00
Vincent Augagneur
f778b0da25 //remove class loading after widget filling 2013-09-02 15:09:27 +02:00
Gregory Roussac
fe209e0c55 Merge pull request #678 from gr4devel/patch-5
[*] BO : add TinyMCE editor for supplier descrpition in AdminSuppliers
2013-09-02 06:03:20 -07:00
Vincent Augagneur
0cf96cd059 //small fix 2013-09-02 14:58:17 +02:00
Vincent Augagneur
d10a339542 //kevin special commit 2013-09-02 14:47:47 +02:00
gr4devel
f535d60a29 [-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController 2013-09-02 14:24:18 +02:00
gr4devel
36ca7f294a [+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier 2013-09-02 14:15:33 +02:00
gRoussac
477457a44f Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1 2013-09-02 12:03:01 +02:00
gr4devel
6177589cd3 [+] MO : add link to all manufacturer page and the feature to show All Suppliers 2013-09-02 11:57:16 +02:00
Vincent Augagneur
b882ecfbbc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 11:44:01 +02:00
Vincent Augagneur
a6aed9632a //dashboard data binding first part 2013-09-02 11:43:50 +02:00
gRoussac
4853772198 [-] INSTALLER : no update value in fix_download_product_feature_active 2013-09-02 11:33:53 +02:00
gRoussac
62303e58df [-] INSTALLER : Fix fatal error when upgrading 2013-09-02 11:24:46 +02:00
Gregory Roussac
82939730dd Merge pull request #667 from Ha99y/Small-Autoload-Fix
[-] CORE : Remove warning on rename on index.php
2013-09-02 02:11:51 -07:00
Kevin Granger
735b20866b // BO Bootstrap Search result page 2013-09-02 11:02:23 +02:00
gRoussac
397e42637a // norms 2013-09-02 10:49:50 +02:00
Kevin Granger
0a8a4dcece // BO Stats : Date Picker + Layout WIP 2013-09-02 10:47:07 +02:00
Gregory Roussac
6dc0edec3a Merge pull request #668 from lrosset/development
[-] CORE : Add APCu support
2013-09-02 01:46:25 -07:00
Gregory Roussac
d019500d81 Merge pull request #670 from gr4devel/patch-2
[+] FO : add getManufacturer() to ManufacturerControllerCore
2013-09-02 01:31:14 -07:00
Vincent Augagneur
252eb868d9 //dashtrends before dashproducts 2013-09-02 10:15:57 +02:00
Vincent Augagneur
d8c4483265 //oups 2013-09-02 10:13:47 +02:00
Vincent Augagneur
d0f2a37fff //dashboard module view tpl init 2013-09-02 10:10:20 +02:00
Gregory Roussac
00afa8ae47 Merge pull request #671 from gr4devel/patch-3
[+] BO : enable TinyMCE editor for short and long descrpition in AdminManufacturers
2013-09-02 01:09:10 -07:00
gRoussac
a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
	modules/blockcart/ajax-cart.js
2013-09-02 10:00:24 +02:00
Jerome Nadaud
48dd826f7d [-] BO : List header module position fix 2013-09-02 09:47:35 +02:00
Vincent Augagneur
10e720b93d //added new modules for dashboard 2013-09-02 09:40:24 +02:00
Gregory Roussac
a436456fa4 Merge pull request #673 from sagaradonis/development
[*] FO : Deprecated .size() to .length
2013-09-02 00:31:05 -07:00
5f1e08e7e2 Fix variable context
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
2013-09-01 22:47:41 +01:00
PrestaEdit
4c633b8b46 [*] BO: sort modules name in Stats 2013-09-01 16:55:22 +02:00
sagaradonis
9cd73b411d Update ajax-cart.js
.size() replaced by .length as .size() is outdated
2013-08-31 19:05:14 +05:30
gr4devel
805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController 2013-08-30 21:24:21 +02:00
Jerome Nadaud
5ce139e7f1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-30 17:41:36 +02:00
Jerome Nadaud
6445a38e71 // Fix cart override 2013-08-30 17:41:21 +02:00
Kevin Granger
84a0f9489c // add submenu shadow + allow html for tooltip 2013-08-30 17:39:37 +02:00
Jerome Nadaud
aab9933ff2 // Fix price option render 2013-08-30 17:27:25 +02:00
Kevin Granger
d4023ce0a3 // config Compass + Bower Update 2013-08-30 15:18:20 +02:00
Francois Gaillard
d0087267df // Fixed tips of the day & encoding 2013-08-30 14:22:24 +02:00
Kevin Granger
0c494912a4 // BO fix product tabs 2013-08-30 11:51:57 +02:00
Rémi Gaillard
f7fefe789d // typo fix 2013-08-30 11:21:00 +02:00
Rémi Gaillard
37e3b9e9e4 [-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229 2013-08-30 11:13:30 +02:00
Kevin Granger
e4d58b7528 // submenu .active link 2013-08-30 11:13:28 +02:00
gr4devel
b72f2a7176 [+] FO : add getManufacturer() to ManufacturerControllerCore
Add getManufacturer() to ManufacturerControllerCore to access the protected manufacturer instance of the controller.
2013-08-29 21:48:32 +02:00
gr4devel
39c8a8fc2d [+] MO : add the option to show all Manufacturer
Add the option to show all Manufacturer in blocktopmenu module.
2013-08-29 21:32:10 +02:00
LOIC ROSSET ltd
24146181c6 Add APCu support 2013-08-29 20:13:58 +01:00
Kevin Granger
357c949faf // opti css menu 2013-08-29 18:54:36 +02:00
Francois Gaillard
e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard
eec8aaa4f8 // php noti 2013-08-29 18:15:51 +02:00
Kevin Granger
40e2b5b8d9 // fix BO modules list -> fav view 2013-08-29 17:23:26 +02:00
Rémi Gaillard
08b8277a7a ///// 2013-08-29 17:21:27 +02:00
Rémi Gaillard
51083e17af // 2013-08-29 17:18:05 +02:00
Jerome Nadaud
40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation 2013-08-29 17:13:48 +02:00
Kevin Granger
7d4c0ad36e // fix col-offset and btn-primary 2013-08-29 17:04:10 +02:00
Francois Gaillard
4a8f6c3116 // Modules categories sort 2013-08-29 17:00:34 +02:00
Rémi Gaillard
ffdc7b51b7 // php 5.2 2013-08-29 16:41:15 +02:00
Rémi Gaillard
1196c5d736 // php 5.2 2013-08-29 16:39:45 +02:00
Damien Metzger
36815be192 // Fixed warning 2013-08-29 16:33:06 +02:00
Kevin Granger
c07f226dd4 // fix dashboard gfx 2013-08-29 16:17:40 +02:00
Rémi Gaillard
01cbffad9b //miss on last commit 2013-08-29 16:11:24 +02:00
Damien Metzger
33578dfd5e // Class index with Dashboard 2013-08-29 15:58:58 +02:00
Kevin Granger
618d980dc7 [+] add css for graph and temp avatar 2013-08-29 15:48:14 +02:00
Kevin Granger
c5ab91f171 [+] BO dashboard WIP 2013-08-29 14:52:14 +02:00
Rémi Gaillard
c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00
Rémi Gaillard
6d1c8c54af Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-29 10:49:53 +02:00
djfm
be83f1364d // updated Czech localization pack 2013-08-29 10:49:39 +02:00
Rémi Gaillard
fb397d3163 Merge pull request #662 from djfm/localization
// updated Czech localization pack
2013-08-29 01:43:33 -07:00
Damien Metzger
f24391be5a // Fixed hook::getidbyname case 2013-08-29 09:39:48 +02:00
Damien Metzger
5dee3ca245 // Fixed hook::getidbyname case 2013-08-29 09:33:28 +02:00
ha99y
75303e82e0 Suppress Error at rename
If debugging  is one (_PS_MODE_DEV_ set to TRUE)
there is a warning on line 142 in /classes/Autoload.php at function
rename()
2013-08-28 18:56:49 -07:00
Kevin Granger
8660a24d55 [+] Dashboard Markup WIP 2013-08-28 19:26:19 +02:00
Rémi Gaillard
ddc16a2f65 [-] BO: Fix fatal error on customer edition when email is not valid 2013-08-28 17:46:05 +02:00
Jerome Nadaud
1fd6540574 [+] BO : Page header toolbar 2013-08-28 14:14:04 +02:00
Jerome Nadaud
c8d9b9bf3a [+] BO : Page header toolbar 2013-08-28 14:07:50 +02:00
Jerome Nadaud
a76fc165db [-] BO : Page header toolbar 2013-08-28 13:43:42 +02:00
Rémi Gaillard
c72fd867fe // git checkout controllers/ 2013-08-28 12:24:10 +02:00
Rémi Gaillard
63d9005a10 // liveedit 2013-08-28 12:21:01 +02:00
Jerome Nadaud
9d991f3474 [+] BO : Page header toolbar 2013-08-28 11:16:36 +02:00
Jerome Nadaud
4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Jerome Nadaud
bfe6c07053 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:17:25 +02:00
Jerome Nadaud
e204cbf24e [+] BO : Page header toolbar 2013-08-28 10:17:07 +02:00
Kevin Granger
97e342984d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:07:02 +02:00
Kevin Granger
ecb4d65347 // list toolbar 2013-08-28 10:06:52 +02:00
Vincent Augagneur
0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Vincent Augagneur
0a2d8175a7 //small fix 2013-08-28 10:03:50 +02:00
Damien Metzger
7a429cd3ea // Version number 2013-08-28 10:00:29 +02:00
Damien Metzger
330aed3f7a // Translations 2013-08-28 09:51:02 +02:00
Vincent Augagneur
efc44392b6 //small fix 2013-08-28 09:48:01 +02:00
Jerome Nadaud
967fc98693 [+] BO : Page header toolbar 2013-08-28 09:37:49 +02:00
ha99y
ffd712312d Add new argument to function getImages
1st: The function will return the product attribute id's with the list.
2nd: If product attribute id is passed to the function it will return
only the image id of the given attribute.
2013-08-28 00:27:52 -07:00
Jerome Nadaud
068da6f87c [+] BO : Page header toolbar 2013-08-28 09:24:16 +02:00
Jerome Nadaud
00155d584e // Fix language bug 2013-08-28 09:23:29 +02:00
Kevin Granger
4c92db8912 // Modules position 2013-08-27 19:08:53 +02:00
Rémi Gaillard
6a4680b4f0 [-] WS: Bad xlink for tax_rules_group in product 2013-08-27 18:58:21 +02:00
Jerome Nadaud
e64e81efa7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-27 18:57:09 +02:00
Jerome Nadaud
64b575911a [+] BO : Add list refresh button 2013-08-27 18:56:47 +02:00
Kevin Granger
9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Vincent Augagneur
5c367cd6e7 //small fix 2013-08-27 18:52:34 +02:00
Vincent Augagneur
41a5eb8411 //small fix 2013-08-27 18:50:14 +02:00
Jerome Nadaud
62b4a3cd5e [+] BO : Page header toolbar 2013-08-27 18:42:24 +02:00
Jerome Nadaud
083eba3431 // Small title fix 2013-08-27 18:25:06 +02:00
Jerome Nadaud
4f022c48f8 [+] BO : Products page header toolbar 2013-08-27 18:23:38 +02:00
Jerome Nadaud
f60fe74336 [+] BO : Tracking page header toolbar 2013-08-27 18:22:54 +02:00
Jerome Nadaud
6e46d718f7 // Fix merge problem 2013-08-27 18:22:02 +02:00
Jerome Nadaud
ed0037c435 [+] BO : New page header toolbar 2013-08-27 18:21:27 +02:00
Vincent Augagneur
9b7f32cbac [-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment 2013-08-27 18:13:44 +02:00
Vincent Augagneur
901c08cac8 [-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed 2013-08-27 18:13:22 +02:00
Vincent Augagneur
4bb0e16509 [-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed 2013-08-27 16:43:14 +02:00
Vincent Augagneur
39c882cdb4 //small fix 2013-08-27 16:21:13 +02:00
Rémi Gaillard
30a914b148 // typo 2013-08-27 15:41:00 +02:00
Rémi Gaillard
598469e41e // typo debug 2013-08-27 15:38:29 +02:00
Damien Metzger
17618efb8b // Fixed details 2013-08-27 15:27:51 +02:00
Jerome Nadaud
eb78f766c3 // Fix for panel heading 2013-08-27 14:19:38 +02:00
Jerome Nadaud
2426eac605 [+] BO : Add first action on menu icon list 2013-08-27 14:18:45 +02:00
Jerome Nadaud
6aad506c80 [-] FO : FixBug when route id is empty 2013-08-27 12:01:40 +02:00
Vincent Augagneur
99b162d16b [-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment 2013-08-27 10:09:35 +02:00
Jerome Nadaud
de200e1c5e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-27 09:50:35 +02:00
Rémi Gaillard
2620242176 // Fix cms_block creation loop on shop addition 2013-08-27 09:52:14 +02:00
Rémi Gaillard
6fd7f0114e // small fix 2013-08-27 09:52:05 +02:00
Rémi Gaillard
1a5b9de372 // small fix 2013-08-27 09:51:56 +02:00
Jerome Nadaud
5a685537a4 // Small Fix 2013-08-27 09:49:59 +02:00
Jerome Nadaud
946840ae45 // Small id fix 2013-08-26 18:39:38 +02:00
Rémi Gaillard
a964162a01 // Fix cms_block creation loop on shop addition 2013-08-26 18:31:45 +02:00
sjousse
536bdb550b fix file validation to use PHP native method 2013-08-26 18:23:39 +02:00
Vincent Augagneur
1673a080a0 //small fix #PSCFV-10194 2013-08-26 17:34:13 +02:00
Rémi Gaillard
2435edc98c // small fix 2013-08-26 17:17:26 +02:00
Rémi Gaillard
1033c61ced Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-26 17:13:51 +02:00
Rémi Gaillard
1b26cfffd9 // small fix 2013-08-26 17:13:29 +02:00
djfm
4c5c38fe61 // updated Czech localization pack 2013-08-26 14:47:54 +00:00
Vincent Augagneur
0a4264c947 [-] BO : fixed bug when try to add jquery from ajax.googleapis.com in BO 2013-08-26 16:31:50 +02:00
Kevin Granger
a972de046e // fix Modules page 2013-08-26 12:26:41 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Damien Metzger
0ccbe8cb15 Merge pull request #661 from matiasiglesias/development
[-] LO: Argeninian localization
2013-08-26 02:19:34 -07:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard
b7a03bdffa // sometimes image was not the cover one for blocklayered 2013-08-26 10:37:59 +02:00
Damien Metzger
08dadb7fd3 Merge pull request #660 from djfm/rel
// Small fixes in installer links
2013-08-26 01:37:15 -07:00
Rémi Gaillard
a23772dfb7 // small change in blockstore logo name 2013-08-26 10:33:25 +02:00
Damien Metzger
bc071f2b04 // Fixed code typo 2013-08-26 09:48:26 +02:00
Jerome Nadaud
9f2423c2c5 [-] BO : FixBug Url rewrite preview when user have a different language from shop 2013-08-26 08:52:22 +02:00
matiasiglesias
235bfada7e [-] LO: Argeninian localization 2013-08-24 18:04:55 -03:00
djfm
1e1aff517f // fixed link in russian installer 2013-08-23 14:37:01 +00:00
djfm
fad94047ff // small fixes in installer translations 2013-08-23 14:33:51 +00:00
Vincent Augagneur
b1a0e715a6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-23 10:34:38 +02:00
Vincent Augagneur
8412192822 [-] BO : fixed bug with multistore context on carrier wizard 2013-08-23 10:34:30 +02:00
Jerome Nadaud
c4bb5a99e4 [+] BO : Improve mod rewrite check 2013-08-23 10:26:36 +02:00
Damien Metzger
9e9eb37978 // Updated translations with remote packages 2013-08-23 10:23:50 +02:00
Vincent Augagneur
d48df48a03 //small fux on live edit URL 2013-08-23 09:44:47 +02:00
Vincent Augagneur
7bcd8ee83c //Added missing file 2013-08-23 09:42:37 +02:00
Damien Metzger
03dc07de2f // And readme ! 2013-08-22 17:36:23 +02:00
Rémi Gaillard
8ff8ea416d // fix weird bug 2013-08-22 17:37:46 +02:00
Damien Metzger
5c1e8e2d79 // CHANGELOG 1.5.5.0 2013-08-22 17:26:53 +02:00
Jerome Nadaud
94133bf734 [-] FO : FixBug duplicate fields for delivery address in OPC mode 2013-08-22 16:45:52 +02:00
Damien Metzger
813c32df2f Merge pull request #659 from djfm/release
// Translations
2013-08-22 07:35:38 -07:00
djfm
fb4a9cdb36 // added missing IT installer strings 2013-08-22 14:06:38 +00:00
djfm
73515f6401 // added missing PL installer strings 2013-08-22 13:57:01 +00:00
djfm
e06b01699b // added missing BR installer strings 2013-08-22 13:44:33 +00:00
djfm
2082e2ad19 // added missing ES installer strings 2013-08-22 13:43:53 +00:00
Rémi Gaillard
a21d3fd22e // shipping block was missplaced on order-detail 2013-08-22 15:41:34 +02:00
djfm
29cb603804 // added missing RU installer strings 2013-08-22 13:30:12 +00:00
Vincent Augagneur
b67827772b [-] BO : fixed bug when save carrier without range 2013-08-22 15:17:14 +02:00
djfm
47827a1a1b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-22 12:31:28 +00:00
Damien Metzger
4de8013b5e // Fixed phone number in installer 2013-08-22 12:19:32 +02:00
Jerome Nadaud
bbea6c4a9b [-] BO : FixBug #PSCFV-10152 - Multibyte string double encoded when send email by SMTP relay 2013-08-22 12:17:51 +02:00
Rémi Gaillard
f476b34139 [-] BO: Fix multishop association for tax rules group - #PSCFV-9967 2013-08-22 11:13:11 +02:00
Rémi Gaillard
9d261b8f1f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-22 10:54:07 +02:00
Rémi Gaillard
907d81c32e // duplication of tax_rules_group on adminproducts with multishop 2013-08-22 10:53:50 +02:00
Vincent Augagneur
6ad274e39d //Small fix 2013-08-22 10:33:03 +02:00
Vincent Augagneur
eea79052e0 [-] BO : fixed bug #PSCFV-10169 - now you can go backward from step 3 to 2 when no ranges are set 2013-08-22 10:15:55 +02:00
Vincent Augagneur
ba95c9a63a [-] BO : fixed bug #PSCFV-10073 - now you can upload carrier logo on windows 2013-08-22 10:09:49 +02:00
Kevin Granger
b2f0a8aea9 // fix switch + ignore bower_components 2013-08-21 19:28:32 +02:00
Kevin Granger
3f8649b6b4 // cleaning components + fix form input, switch 2013-08-21 19:16:04 +02:00
Rémi Gaillard
099baaef70 // small change on specific price rules after condition deletion 2013-08-21 19:14:59 +02:00
Rémi Gaillard
3fcf166a9d // small fix 2013-08-21 18:24:10 +02:00
Jerome Nadaud
f6515a39eb [+] BO : List header new toolbar functionality 2013-08-21 17:52:23 +02:00
Rémi Gaillard
dd9aa9fdb5 // disable log deletion 2013-08-21 17:43:34 +02:00
Kevin Granger
93e03a3c3b // update bower with latest bootstrap 3.0.0 + fix layout 2013-08-21 17:17:24 +02:00
djfm
5faaef9f21 // fixed a few untranslatable strings in CarrierWizard 2013-08-21 14:33:22 +00:00
Damien Metzger
eb69498d2c // Missing icon 2013-08-21 15:34:32 +02:00
Damien Metzger
df418a80db [*] FO : added indexation of attributes references #PSCFV-7294 2013-08-21 15:31:10 +02:00
Jerome Nadaud
d6b50a7f0c // Merge Dev + Bootstrap 2013-08-21 15:27:14 +02:00
Damien Metzger
4d3fc8c314 [-] MO : fixed smarty cache on blocksearch #PSCFV-8739 2013-08-21 15:13:49 +02:00
Rémi Gaillard
600b027efd // fix root categories addition 2013-08-21 14:37:39 +02:00
Damien Metzger
cf35d3762b [-] MO : fixed the possibility to override/remove an override twice in the same session without redeclaration #PSCFV-10168 2013-08-21 14:32:18 +02:00
Damien Metzger
65c6d86e6e // Fixed simple multistore process 2013-08-21 10:23:53 +02:00
Damien Metzger
3287e1664c // Added target blank in a transverse link 2013-08-21 10:18:46 +02:00
Damien Metzger
65becc8550 // Fixed typo 2013-08-21 10:10:52 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
2013-08-21 09:14:10 +02:00
gRoussac
50d5a71ca6 [-] Classes : fix memcache ext #PSCFV-5225 thanks @up2date 2013-08-20 23:09:12 +02:00
Rémi Gaillard
20e2f07939 [-] BO: Delete from attribute_shop when an attribute group is deleted #PSCFV-9902 2013-08-20 17:56:26 +02:00
Damien Metzger
ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Rémi Gaillard
3fcb65ca0f [-] WS: Fix retrieve of stock_availables when stock is shared on the shop group 2013-08-20 17:18:07 +02:00
Jerome Nadaud
e80e2ac5e3 [-] BO : FixBug #PSCFV-10075 remove product attribute image association on delete product attribute 2013-08-20 17:05:48 +02:00
Damien Metzger
750f374036 // error log only in dev mode for pcre backtrack limit #PSCFV-9012 2013-08-20 16:40:17 +02:00
Kevin Granger
17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-20 16:40:14 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud
57d8d9c232 [-] BO : FixBug Preview product url 2013-08-20 15:34:00 +02:00
Damien Metzger
eeb469dda5 [-] FO : fixed bad search redirection #PSCFV-10158 2013-08-20 14:52:53 +02:00
Damien Metzger
43c544465e // Removed deprecated parameter 2013-08-20 14:48:58 +02:00
Vincent Augagneur
f71d4a63cf //small fix 2013-08-20 11:46:58 +02:00
Vincent Augagneur
258d381083 [-] BO fixed bug #PSCFV-9663 - .live() method is deprecated on 1.7 jquery and it is not present into the 1.9 2013-08-20 11:11:21 +02:00
Damien Metzger
496db1d13e // Added automatic smarty cache clearing after catalog import (csv) 2013-08-20 10:45:55 +02:00
Damien Metzger
c5f635f967 // Updated some meta and translations 2013-08-20 10:31:03 +02:00
Damien Metzger
cf1798d2a1 [-] MO : multilines translations does not work #PNM-1645 2013-08-20 09:55:44 +02:00
Jerome Nadaud
787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas 2013-08-20 09:52:50 +02:00
Jerome Nadaud
00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +02:00
Jerome Nadaud
41190a66d4 [+] BO : Product tab fieldset and accordion fix 2013-08-19 18:45:57 +02:00
Jerome Nadaud
5336467e04 [-] BO : FixBug Friendly URL by language 2013-08-19 17:51:53 +02:00
Jerome Nadaud
68d7a320cd [-] BO : FixBug Friendly URL change 2013-08-19 17:48:58 +02:00
Vincent Augagneur
8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
Jerome Nadaud
f610b0d844 [+] MO : Bankwire, cashondelivery, cheque disable confirm button on click 2013-08-19 16:37:48 +02:00
Damien Metzger
415ca83b62 // Code cleaning 2013-08-19 15:23:43 +02:00
Damien Metzger
1a81191c09 // Code cleaning 2013-08-19 15:14:05 +02:00
Jerome Nadaud
d78ac1afe8 [-] BO : FixBug action link class 2013-08-19 15:01:56 +02:00
Jerome Nadaud
155fd516ba // Misplaced if 2013-08-19 14:41:08 +02:00
Jerome Nadaud
8cd8ede1a5 [+] BO : Add Highlighted class for default list row 2013-08-19 13:31:23 +02:00
Jerome Nadaud
4a2e545bc4 [+] BO : Products tab fieldset 2013-08-19 13:30:18 +02:00
Jerome Nadaud
21d5322e16 [-] BO : FixBug unset param icon 2013-08-19 12:00:43 +02:00
Jerome Nadaud
0aa908bd25 [+] BO : Products add fileset for informations and prices tab 2013-08-19 11:59:27 +02:00
Jerome Nadaud
a7f6e91ac0 [-] BO : FixBug #PSCFV-9329 Alias problem in order by 2013-08-19 10:35:43 +02:00
Jerome Nadaud
dc4978ff57 [-] BO : FixBug valuation and real quantity sort 2013-08-19 10:28:02 +02:00
Vincent Augagneur
bad151a66f [-] BO : fixed range deletion when press enter on input 'all' on carrier wizard 2013-08-19 10:20:22 +02:00
Jerome Nadaud
1138e8d01a [-] BO : FixBug Friendly URL change 2013-08-19 10:17:42 +02:00
Damien Metzger
218ce59de6 [-] Installer : added ob_start() (required with the cookie mode when debug mode is activated) 2013-08-19 10:04:23 +02:00
Damien Metzger
c5097b19cc [-] TR : fixed missing space in RMA PDF 2013-08-19 09:54:05 +02:00
Jerome Nadaud
13c5450ca1 [-] BO : FixBug sort bug on values count column 2013-08-19 09:50:01 +02:00
Jerome Nadaud
add997dbba // Traduction error 2013-08-14 18:29:46 +02:00
Jerome Nadaud
8cd3fd0cfe [-] FO : FixBug Missing PS_STOCK_MANAGEMENT smarty variable 2013-08-14 17:40:36 +02:00
Jerome Nadaud
c180a20cf9 [-] BO : FixBug #PSCFV-7571 Error checking available product quantity 2013-08-14 17:16:41 +02:00
Jerome Nadaud
274c90468f // Syntax error 2013-08-14 16:14:56 +02:00
Rémi Gaillard
d40d841cf3 // something is missing in 3d591be8c6 2013-08-14 15:15:41 +02:00
Rémi Gaillard
24ac8582bf [*] BO: Warehouse name is now displayed on each product line orders 2013-08-14 15:02:30 +02:00
Jerome Nadaud
6cff684af1 [-] BO : FixBug update received quantity in suply order 2013-08-14 14:38:10 +02:00
Vincent Augagneur
ec39b9e701 [-] BO : fixed bug #PSCFV-10111 when carrier is free don't display ranges in summary 2013-08-14 14:19:52 +02:00
Rémi Gaillard
3d591be8c6 [-] Core: Fix language link with multishop from another shop #PSCFV-10063 2013-08-14 11:25:46 +02:00
Damien Metzger
cecaee8e68 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file 2013-08-14 11:18:19 +02:00
Damien Metzger
7f3652bea0 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file 2013-08-14 11:16:50 +02:00
gRoussac
b22c2b28ec Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-14 10:29:24 +02:00
gRoussac
0bd04d9f3e [*] BO : Clear smarty cache when submitting SEO rules 2013-08-14 10:27:39 +02:00
Jerome Nadaud
1a1666c399 // Syntax error 2013-08-13 18:45:18 +02:00
gRoussac
533b28ce32 Merge branch 'prestarocket-duplicate_id' into release 2013-08-13 18:26:51 +02:00
gRoussac
f459af7090 Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id 2013-08-13 18:26:22 +02:00
Damien Metzger
7d0e0a7f38 // Removed useless Tools::safeOutput before insertion in the database 2013-08-13 18:21:23 +02:00
Vincent Augagneur
26036cf7b2 //fixed min and max rang in carrier summary 2013-08-13 17:41:43 +02:00
Vincent Augagneur
b9808c5b5e //small js fix 2013-08-13 17:26:16 +02:00
Jerome Nadaud
f73f84dbf2 [+] BO : Product information tab 2013-08-13 17:23:38 +02:00
Jerome Nadaud
c6d3545b8b [-] BO :FixBug Suppliers and Warehouses accordion 2013-08-13 17:14:57 +02:00
Vincent Augagneur
f8acc2a15e //small typo 2013-08-13 16:46:44 +02:00
Krystian Podemski
dab86dffe1 * [MO] : blocknewsletter improvements 2013-08-13 16:45:40 +02:00
Vincent Augagneur
62ab457908 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-13 16:42:36 +02:00
Vincent Augagneur
c11c55e83c //small css fix 2013-08-13 16:42:32 +02:00
gRoussac
1984cb6272 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-13 16:30:39 +02:00
gRoussac
5123d2505e [-] CORE : Do not delete index.php in smarty cache or /img/tmp/ 2013-08-13 16:29:40 +02:00
Damien Metzger
f9fdcb1103 [-] FO : fixed html tags that should not appear in blockcategories 2013-08-13 16:22:38 +02:00
Vincent Augagneur
6e386868a6 [-] BO : fixed bug #PSCFV-10096 2013-08-13 16:14:09 +02:00
Jerome Nadaud
1d6f3382f5 [-] BO : FIxBug Correct image path in product 2013-08-13 16:01:42 +02:00
Jerome Nadaud
0e353fe655 [-] BO : Fix bug to check filter values 2013-08-13 15:42:00 +02:00
Jerome Nadaud
5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
gRoussac
e8685b1430 [*] BO : Add clear smarty cache button 2013-08-13 15:11:00 +02:00
Gregory Roussac
1e10dab8f8 Merge pull request #646 from kpodemski/patch-2
[*] CORE : Get instance of current category in category controller
2013-08-13 05:54:40 -07:00
Krystian Podemski
8051b0021e [*] CORE : Get instance of current category in category controller
Get instance of category in for eg. module hook using:

$category = $this->context->controller->getCategory()

instead of

new Category(1,1);
2013-08-13 14:52:59 +02:00
Damien Metzger
b1b636a911 // Added helpbox and fixed translation 2013-08-13 14:16:40 +02:00
Jerome Nadaud
e33cd2d13b [+] BO : Add active class to list view button 2013-08-13 13:55:41 +02:00
Damien Metzger
86fba93f63 [-] Installer : fixed clear smarty cache 2013-08-13 13:37:04 +02:00
Jerome Nadaud
1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Vincent Augagneur
a2d005701e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-13 11:36:57 +02:00
Vincent Augagneur
b9b03d8259 //small css fix 2013-08-13 11:36:52 +02:00
Damien Metzger
4a6d1e8ff6 [-] Installer : changed syntax from $class:func to call_user_func because it seems to be more compliant with old PHP versions 2013-08-13 11:02:32 +02:00
Jerome Nadaud
2aa4237bb2 [+] BO : Add otf/woff type to htaccess generator 2013-08-13 10:57:06 +02:00
Jerome Nadaud
407abd8a10 [+] BO : Suply order receipt list action 2013-08-13 10:25:41 +02:00
Rémi Gaillard
9c523cf7eb // Log for product deletion was missing 2013-08-13 10:21:01 +02:00
Vincent Augagneur
da02895432 //fix carrier wizard with multistore part2 2013-08-13 10:10:27 +02:00
Jerome Nadaud
a0d870c4eb [+] BO : Button action list improvements 2013-08-13 10:10:24 +02:00
Vincent Augagneur
6cfde246a2 //fix carrier wizard with multistore 2013-08-13 10:09:19 +02:00
Vincent Augagneur
3aff1341f6 //small fix 2013-08-13 10:01:18 +02:00
Rémi Gaillard
284f758cb4 [-] FO: Fix quantity discount table display for non default attribute #PSCFV-9942 2013-08-12 18:40:52 +02:00
Vincent Augagneur
0cd6c5b200 //new tab name for carrier option 2013-08-12 17:32:55 +02:00
gRoussac
5d0f1499ac // without hedgehogs is better 2013-08-12 16:50:14 +02:00
gRoussac
30d9ebe68f [-] FO : Fix bug #PSCFV-9624 try 302 redirect from old 1.4 images format to new _default before 404.gif 2013-08-12 16:44:25 +02:00
Jerome Nadaud
5f6c1ac1ce // HTML Syntax error 2013-08-12 16:44:15 +02:00
gRoussac
7ec55106ce [*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski 2013-08-12 16:23:54 +02:00
Jerome Nadaud
a06dfafb9a // Avoid some filters errors 2013-08-12 15:44:13 +02:00
Vincent Augagneur
e2e5fbe33a //now you can delete all carriers 2013-08-12 15:25:26 +02:00
Vincent Augagneur
7cc59b2f49 //fixed bug #PSCFV-10091 part2 2013-08-12 15:23:52 +02:00
Vincent Augagneur
7a06dca942 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-12 15:18:02 +02:00
Vincent Augagneur
a1be985067 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-12 15:17:35 +02:00
Vincent Augagneur
7ff8e44386 [-] BO : fixed bug when carrier is free and change shipping method 2013-08-12 15:17:28 +02:00
Jerome Nadaud
06cdeb45a5 [-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format 2013-08-12 15:17:21 +02:00
Rémi Gaillard
de41faff80 [-] Core: Fix #PSCFV-8887 - improve performance of search indexation 2013-08-12 15:16:45 +02:00
Vincent Augagneur
bae9df61dc //revert reorganization of shipping menus & options 2013-08-12 15:15:17 +02:00
Vincent Augagneur
136586830d //small fix 2013-08-12 15:09:40 +02:00
Vincent Augagneur
30c9156a41 [-] BO : fixed bug #PSCFV-10091 - you can now enable all zone in one clic 2013-08-12 14:56:49 +02:00
Vincent Augagneur
52806c0056 [-] BO : fixed bug #PSCFV-10033 - disable next step if no range has been added on carrier wizard 2013-08-12 14:41:44 +02:00
Jerome Nadaud
1359f46bae [-] FO : FixBug #PSCFV-10090 urlencode syntax error - Thanks Duarte 2013-08-12 14:37:32 +02:00
Jerome Nadaud
4c47c980f8 // Javascript error if address does not exist 2013-08-12 11:57:40 +02:00
Vincent Augagneur
627e3d8a77 [-] BO : fixed multistore thumbnail on product list 2013-08-12 11:27:25 +02:00
Vincent Augagneur
6befd831c9 //small install fix 2013-08-12 11:10:12 +02:00
Vincent Augagneur
3664f4c394 //reorganization of shipping menus & options 2013-08-12 11:02:28 +02:00
gRoussac
7b92675778 [-] CORE : Fix bug #PSCFV-8542 could not have rewrited link for modules in blocklanguage 2013-08-12 10:26:40 +02:00
Gregory Roussac
b7232aabd7 Merge pull request #643 from Shagshag/patch-2
[*] BO :ProductDownload::getNewFilename() avoid recursion
2013-08-12 00:29:33 -07:00
Shagshag
ce20d55e77 ProductDownload::getNewFilename() little optimisation
Avoid recursion
2013-08-12 04:28:58 +02:00
Jerome Nadaud
54189a5d97 [-] MO : sendtofriend FixBug Form error 2013-08-09 19:03:43 +02:00
Jérôme Nadaud
f119b8e64f [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country 2013-08-09 19:00:18 +02:00
Jérôme Nadaud
7b41098a5d [-] FO : FixBug CGV does not pop-up in Fancy Box 2013-08-09 18:59:00 +02:00
Kevin Granger
d3717f0950 // fix some test with colors & fix for login screen 2013-08-09 18:57:22 +02:00
Jerome Nadaud
8be3344e41 // W3C validation error 2013-08-09 18:49:47 +02:00
Jerome Nadaud
bc7d16ede6 [-] FO : FixBug generated_date error 2013-08-09 18:48:26 +02:00
Jerome Nadaud
501cbea5aa [-] BO : FixBug root category listed after list reset 2013-08-09 18:45:40 +02:00
gRoussac
67a0c96ea2 [-] CORE : getModuleLink not working on module custom route, merge from https://github.com/PrestaShop/PrestaShop/pull/487 thanks @zimmi1 2013-08-09 18:36:23 +02:00
gRoussac
41d29b5445 [-] CORE : Addslashes on not translated strings for javascript js=1 2013-08-09 18:26:26 +02:00
gRoussac
92840f85fe [-] BO : Fix additional quote in live edit template 2013-08-09 18:04:08 +02:00
Damien Metzger
eb0d2d47e4 // The blunder wasn't mine :) 2013-08-09 17:31:00 +02:00
Damien Metzger
971b45e630 // fixed variable that does not exists 2013-08-09 17:21:24 +02:00
Vincent Augagneur
431aa78b6f //small fix 2013-08-09 16:36:26 +02:00
Jerome Nadaud
a64fcdd135 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-09 16:07:26 +02:00
Jerome Nadaud
ecfe61972b [+] BO : Change action link for button 2013-08-09 16:07:07 +02:00
Kevin Granger
bca29980d5 //fix layout and contrasted colors 2013-08-09 15:08:14 +02:00
gRoussac
8733b968f5 [-] FO : input token missplaced in address.tpl 2013-08-09 14:31:59 +02:00
Jerome Nadaud
a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +02:00
Jerome Nadaud
c35d846f60 [-] BO : FixBug root category listed after list reset 2013-08-09 12:16:05 +02:00
Damien Metzger
2820314586 [-] MO : fixed potential warning in pscleaner #PSCFV-10070 2013-08-09 11:40:59 +02:00
Jerome Nadaud
75f0b38ff1 // Syntax error 2013-08-09 11:38:59 +02:00
Rémi Gaillard
1183b14ea9 [-] MO: no more 1.4 support for blocklayered 2013-08-09 11:24:21 +02:00
Kevin Granger
328c6a5439 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-09 11:19:39 +02:00
Kevin Granger
2549924cef Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-09 11:10:58 +02:00
Vincent Augagneur
f41bf1dcca [-] MO : fixed bug #PNM-792 : remove unused js file in blocklayered 2013-08-09 11:07:49 +02:00
Kevin Granger
617c1e01d2 //fix steps of Carriers Wizard with multishop activated 2013-08-09 11:06:54 +02:00
Vincent Augagneur
a5be1f147f //small fix when multi-store is enable on carrier wizard 2013-08-09 10:58:07 +02:00
Vincent Augagneur
1571dd60c8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-09 10:44:24 +02:00
Vincent Augagneur
13be8db639 //added checkbox for all zones 2013-08-09 10:44:20 +02:00
Damien Metzger
cac7b267e6 [-] MO : fixed category link on blocklayered #PNM-1427 2013-08-09 10:37:23 +02:00
Damien Metzger
eed7ceb37a [-] MO : blocklayered also try to find the translations in the translations directory 2013-08-09 10:21:37 +02:00
Jerome Nadaud
cbc7b9567a [-] FO : Do not redirect on 301 when POST request 2013-08-09 10:20:42 +02:00
Damien Metzger
0fc1c9184c [-] MO : added visibility IN ("both", "catalog") in blocklayered 2013-08-09 10:11:01 +02:00
Jerome Nadaud
64698d1590 [-] FO : FixBug generated_date error 2013-08-09 09:10:53 +02:00
Jérôme Nadaud
84ded9f3db [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country 2013-08-08 23:30:31 +02:00
Jérôme Nadaud
f5e28b9212 [-] FO : FixBug CGV does not pop-up in Fancy Box 2013-08-08 21:28:55 +02:00
gRoussac
9ccd9b7cad [-] FO : Do not redirect on 301 when POST request 2013-08-08 19:19:34 +02:00
gRoussac
e923455f6d // revert from 589052325b 2013-08-08 18:58:04 +02:00
Damien Metzger
50cba2b12b // Added link to Addons in the footer 2013-08-08 17:49:17 +02:00
Kevin Granger
6ae222e720 // some sass/compass magic for color schemes… and few new bugs to fix with layout 2013-08-08 16:59:39 +02:00
Damien Metzger
95680e0158 [*] FO : added chinese/japanese search 2013-08-08 16:58:07 +02:00
Jerome Nadaud
97062d60a2 // Add index.php 2013-08-08 16:14:45 +02:00
Jerome Nadaud
390b49122e [-] FO : FixBug #PSCFV-10026 SSL error on ajax action 2013-08-08 15:58:52 +02:00
Rémi Gaillard
d2f41d7467 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 15:52:42 +02:00
Rémi Gaillard
589052325b // Fix cart with ssl 2013-08-08 15:52:16 +02:00
Jerome Nadaud
be9398c6c5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-08 13:06:41 +02:00
Jerome Nadaud
d5cdcab859 [-] MO : sendtofriend FixBug Form error 2013-08-08 13:06:18 +02:00
gRoussac
16fec55c6f // report of 0023950c72 2013-08-08 12:16:19 +02:00
Gregory Roussac
49b6fda40f Merge pull request #639 from PrestaEdit/patch-49
[-] BO: correct link in Block Discover.
2013-08-08 03:09:29 -07:00
Rémi Gaillard
cbdea59753 // revert 1c80b5fdfe 2013-08-08 11:50:35 +02:00
PrestaEdit
0023950c72 [-] BO: correct link in Block Discover. 2013-08-08 11:44:24 +02:00
Rémi Gaillard
5832ab3eb5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 11:40:58 +02:00
Rémi Gaillard
567321dd3d // clean cookie after logout 2013-08-08 11:39:36 +02:00
Damien Metzger
169c3fbc6b // Removed useless line 2013-08-08 11:24:20 +02:00
Jerome Nadaud
7d4feac247 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-08 11:17:07 +02:00
Jerome Nadaud
8e72d122e6 [-] MO : blockcategories FixBug html tags in categories link title 2013-08-08 11:16:45 +02:00
gRoussac
5b3dda1cfb Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 11:05:37 +02:00
gRoussac
1c80b5fdfe [-] BO : list of carriers should only contain the active one in AdminProducts 2013-08-08 11:05:09 +02:00
Damien Metzger
4709f4a3c0 [-] MO : fixed module upgrade with common version number 2013-08-08 11:03:22 +02:00
Gregory Roussac
bb45c93d4f Merge pull request #563 from Prestaworks/patch-12
[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
2013-08-08 02:00:57 -07:00
Damien Metzger
a9b44884f1 // Fixed upgrade of homeslider module 2013-08-08 10:47:03 +02:00
gRoussac
c31c2ca0e9 [-] MO: cover image issue with layered block on multishop, thanks @theginie 2013-08-08 10:46:22 +02:00
Jerome Nadaud
55fc51f20b [-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error 2013-08-08 10:41:22 +02:00
gRoussac
1bfa43fa8b [-] MO : My account column block should not display module icon in list 2013-08-08 10:38:39 +02:00
gRoussac
0f4562eb44 [*] MO : added manufactureres order by name, thanks@Jacky75 2013-08-08 10:24:05 +02:00
gRoussac
4abff03244 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 10:17:00 +02:00
gRoussac
d6ab0696e6 [-] BO : OrderSlip now correctly displays the order slip date, thanks @Jacky75 2013-08-08 10:16:41 +02:00
Jerome Nadaud
ad1efa612f [+] BO : Better SendBulkAction function 2013-08-08 09:44:52 +02:00
Damien Metzger
ff69638595 // removed kay navigation in carrier wizard 2013-08-08 09:38:52 +02:00
Damien Metzger
05946f2932 [-] MO : blocktopmenu should clear cache when adding a new subcategory 2013-08-08 09:35:19 +02:00
Damien Metzger
0550ad5135 // Fixed smarty parse error on live edit 2013-08-08 09:29:13 +02:00
Jerome Nadaud
65271a9385 [-] BO : FixBug Bulk action sended on filter 2013-08-07 18:42:43 +02:00
gRoussac
f89e42a5c5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 18:12:41 +02:00
gRoussac
601bfa628b [-] FO :ProductSale::getBestSales() by modified date renders SQL error, thanks @SebSept 2013-08-07 18:10:39 +02:00
Vincent Augagneur
73f40a6cc6 //fixed carrier wizard typewatch 2013-08-07 17:29:44 +02:00
Jerome Nadaud
000ff0b462 [-] BO : FixBug Missing check value in options list 2013-08-07 17:15:13 +02:00
gRoussac
a1786b97b3 [-] FO : expiration date not displayed in email for downloadable product 2013-08-07 17:08:50 +02:00
Jerome Nadaud
1c6eb93951 [-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it 2013-08-07 17:08:01 +02:00
Jerome Nadaud
44f7356d44 [-] BO : FixBug message charset problem in mail 2013-08-07 16:40:40 +02:00
Gregory Roussac
de3b121b11 Merge pull request #507 from jeckyl/patch-3
[*] BO : Fix size for modules logo AdminModulesPositions
2013-08-07 07:04:13 -07:00
Jerome Nadaud
239c5adb5a [-] BO : FixBug smarty email variable override by blockcontact 2013-08-07 15:09:14 +02:00
gRoussac
5df213f5ae Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 15:06:50 +02:00
Gregory Roussac
942a946147 Merge pull request #497 from romainberger/development
[*] MO: Referral program: display currency in account page next to the voucher value
2013-08-07 05:59:29 -07:00
Jerome Nadaud
5f1506ffc2 [-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country 2013-08-07 14:09:40 +02:00
Rémi Gaillard
d916e65a14 // missing return 2013-08-07 13:56:12 +02:00
Rémi Gaillard
6ccf3e839d // change passwd in cookie after changed it 2013-08-07 13:51:18 +02:00
gRoussac
e43f0619ca Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 11:53:23 +02:00
Jerome Nadaud
cd1ed74d8e [-] BO : FixBug #PSCFV-10038 escaped quote in address fields 2013-08-07 11:53:12 +02:00
gRoussac
82621c08ec [-] BO : Do not display root category bool if addrootcategory not in url 2013-08-07 11:51:48 +02:00
Gregory Roussac
d99a5a740e Merge pull request #638 from vinvin27/patch-1
// parse error
2013-08-07 02:51:21 -07:00
vinvin27
843989489d Update AdminPPreferencesController.php
Parse error: syntax error, unexpected T_ARRAY, expecting ')' in /controllers/admin/AdminPPreferencesController.php on line 120
2013-08-07 11:47:56 +02:00
Rémi Gaillard
e6a819e5dd // Fix double quote translations 2013-08-07 11:29:34 +02:00
Jerome Nadaud
a32ff1e930 [-] BO : FixBug Missing tpl dir in default layout 2013-08-07 11:17:42 +02:00
gRoussac
ac21fa9808 [-] MO : Missing image in my account for MODULE WishList 2013-08-07 10:56:09 +02:00
Jerome Nadaud
95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +02:00
Jerome Nadaud
d95aae9a7b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-07 10:44:42 +02:00
Jerome Nadaud
816a39fb4f [+] BO : Footer list bulk actions 2013-08-07 10:43:53 +02:00
Gregory Roussac
3213b5dffb Merge pull request #635 from cippest/development
[-] BO : missing order lang in Mail::l for in_transit email
2013-08-06 11:23:19 -07:00
cippest
f8efd7a329 [-] BO : Fix send e-mails updating tracking number
Hi,
We've fixed some bugs parameters about the Send function of Mail class in the AdminOrdersController.php.

Regards,
Massimo.
2013-08-06 19:51:16 +02:00
Kevin Granger
349c98d567 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jerome Nadaud
# Via Jerome Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [+] BO : New Bulk actions button
2013-08-06 19:07:59 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
gRoussac
7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
Jerome Nadaud
bb4a72f46d [+] BO : New Bulk actions button 2013-08-06 19:04:44 +02:00
Gregory Roussac
b1ea66d510 Merge pull request #528 from ldecoker/patch-7
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
2013-08-06 09:57:36 -07:00
Jerome Nadaud
0c4aeb31b8 [+] BO : Better action list button 2013-08-06 18:34:31 +02:00
Gregory Roussac
bf355e934e Merge pull request #634 from PhpMadman/RefSort
[*] FO : Sort by Product reference
2013-08-06 09:13:06 -07:00
Vincent Augagneur
67b44b5f17 //fixed carrier bug and added typewatch plugin on range validation 2013-08-06 18:04:12 +02:00
Damien Metzger
bfa5bae702 // Fixed display of root category 2013-08-06 17:45:24 +02:00
Damien Metzger
5be8e169f5 // Fixed totally unexplicable behavior 2013-08-06 17:40:49 +02:00
Vincent Augagneur
ea5f4476a6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 16:56:05 +02:00
Vincent Augagneur
5ed75901fb //typo 2013-08-06 16:55:51 +02:00
Damien Metzger
2303677ebf // Rollback a modification in object model 2013-08-06 16:52:13 +02:00
Damien Metzger
a1cf8d462f // Keep remote file retrieval in the right order 2013-08-06 16:42:10 +02:00
Damien Metzger
b701acc8cf // Clean language pack retrieval 2013-08-06 16:15:30 +02:00
PhpMadman
e4a42ab2b1 Update AdminPPreferencesController.php 2013-08-06 16:08:09 +02:00
PhpMadman
d4270289c1 Update category-product-sort.tpl 2013-08-06 16:06:03 +02:00
Vincent Augagneur
bcaa625f4c //default language fix in carrier wizard 2013-08-06 16:05:36 +02:00
Damien Metzger
c8564fa6b2 // Quick CSS fix 2013-08-06 16:02:22 +02:00
Damien Metzger
d783160af0 // Updated installer 2013-08-06 15:53:59 +02:00
Jerome Nadaud
375fa451d8 [-] FO : FixBug No warning message when no carriers available from advanced stock management 2013-08-06 15:53:25 +02:00
Damien Metzger
38753716e2 // Hide "is root category" option outside multistore 2013-08-06 15:42:31 +02:00
PhpMadman
598a5b3188 [*] FO : Add reference sort to theme 2013-08-06 15:38:25 +02:00
PhpMadman
cd254f8795 [*] FO : Add reference sort to theme 2013-08-06 15:37:10 +02:00
PhpMadman
5e73f0cb07 [*] BO: Add reference to Options 2013-08-06 15:34:58 +02:00
PhpMadman
6a54f6efd5 [*] BO: Add reference to FrontController 2013-08-06 15:32:30 +02:00
gRoussac
4bd59c14cc [*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve 2013-08-06 15:21:46 +02:00
gRoussac
a739117f0d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:20:07 +02:00
gRoussac
8103e89874 [*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve 2013-08-06 15:19:47 +02:00
Gregory Roussac
a0ee3d3c34 Merge pull request #633 from Seynaeve/patch-1
[*] FO : Allow B2B to navigate through the form with Tab betwwen company and VAT field
2013-08-06 06:17:06 -07:00
gRoussac
dbb2b50555 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl 2013-08-06 15:15:03 +02:00
gRoussac
c966eea140 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:11:46 +02:00
Damien Metzger
9caf97ff30 // Add check in object model 2013-08-06 15:11:23 +02:00
gRoussac
c9bf17f400 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:09:38 +02:00
Gregory Roussac
12a3ef3a12 Merge pull request #486 from PhpMadman/patch-1
[-] FO : In stock sort is now removed when Stock managment is disabled
2013-08-06 15:08:55 +02:00
Damien Metzger
3839dbee9a / Add check in object model 2013-08-06 15:06:46 +02:00
Damien Metzger
85e15c00f1 // Added missing french translation in the installer 2013-08-06 14:30:43 +02:00
Seynaeve
4d29142907 Allow B2B to navigate through the form with Tab
With
$('#company').blur(function(){
VAT only appears when we leave the input and therefore does not allow to navigate through the form with Tab

With
$('#company').on('input',function(){
that work
2013-08-06 14:15:45 +02:00
Gregory Roussac
ba69e48f72 Merge pull request #488 from camlafit/pr-countriesbrowser
[*] FO : Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
2013-08-06 03:07:13 -07:00
Gregory Roussac
818e82c09c Merge pull request #486 from PhpMadman/patch-1
[-] FO : In stock sort is now removed when Stock managment is disabled
2013-08-06 02:49:48 -07:00
Vincent Augagneur
3f6ee7cfdd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 11:46:15 +02:00
Vincent Augagneur
7b600ad07f //small css fix 2013-08-06 11:45:59 +02:00
gRoussac
fe0afeadc9 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu 2013-08-06 11:45:29 +02:00
Vincent Augagneur
478e338df0 //added active field on carrier wizard 2013-08-06 11:40:03 +02:00
gRoussac
6449437f58 // norms 2013-08-06 11:38:34 +02:00
gRoussac
084880abda Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 11:38:24 +02:00
gRoussac
16d942b7b6 [*] BO : Do not insert duplicates in product_carrier, thanks @edamart 2013-08-06 11:22:40 +02:00
gRoussac
81e4a5f635 [*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart 2013-08-06 11:19:34 +02:00
Francois Gaillard
c0bc3bda29 // Bug fix template override & admin templates 2013-08-06 11:13:49 +02:00
Vincent Augagneur
33bdfa9c96 //added some help 2013-08-06 11:06:36 +02:00
Gregory Roussac
1b93d251aa Merge pull request #630 from rimas-kudelis/development
[*] CORE :ProductCore::addSupplierReference() if a reference already exists  update it
2013-08-06 01:51:34 -07:00
gRoussac
edfe77b74f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 10:43:14 +02:00
gRoussac
a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
2013-08-06 10:42:44 +02:00
Damien Metzger
f557f24df4 // Fixed module cache key (with the country) 2013-08-06 10:41:58 +02:00
Gregory Roussac
77ba55b090 Merge pull request #629 from ChristopheBoucaut/patch-4
[-] WS : setFieldsToDisplay() calls $this->resourceConfiguration, never initialized
2013-08-06 01:30:46 -07:00
Vincent Augagneur
5bcfc7d4e9 //carrier wizard step validation part 2 2013-08-06 10:30:10 +02:00
Rimas Kudelis
83740496de Update more properties of supplier reference in ProductCore::addSupplierReference() if a reference already exists. 2013-08-06 11:28:42 +03:00
Vincent Augagneur
fe58053439 //carrier wizard step validation 2013-08-06 10:27:32 +02:00
ChristopheBoucaut
0139e3f877 Update WebserviceRequest.php
The deleted method calls $this->resourceConfiguration, which is never initialized in specific web services, so if we use the "display" parameter, the webservice returns an error
2013-08-06 10:22:45 +02:00
Kevin Granger
58cba9f894 // [+] Module - Login Addons 2013-08-06 10:19:43 +02:00
Gregory Roussac
23b9c3b8f9 Merge pull request #627 from davyrolink/upstream
[*] CORE : add $smarty to params in smartyHook function
2013-08-06 01:10:41 -07:00
Vincent Augagneur
88d4f57894 //carrier range validation fix 2013-08-06 10:04:54 +02:00
Francois Gaillard
29bbe81ae6 // CloudCache removed from AdminPerformanceController 2013-08-06 09:25:47 +02:00
Davy Rolink
0b99a7b331 added the smarty var to the hook_params, this makes it possible to create modules that can assign variables to the smarty local scope 2013-08-05 23:20:19 +02:00
Gregory Roussac
5f0ef76731 Merge pull request #626 from davyrolink/upstream
[-] CORE : id_address_invoice was not updated, updateAddressId method
2013-08-05 14:13:54 -07:00
Davy Rolink
f3361fbedf Bug fix: id_address_invoice was not updated, updateAddressId method of the Cart class 2013-08-05 22:53:54 +02:00
Kevin Granger
bdc9d77c09 // Module List + some design WIP 2013-08-05 20:42:14 +02:00
Rémi Gaillard
faec5a9226 // small change on fixtures installation 2013-08-05 20:33:39 +02:00
gRoussac
adceb5ccf5 [-] Fo : Bad date format in order-detail, merge from https://github.com/PrestaShop/PrestaShop/pull/476 thanks @gbelorgey 2013-08-05 19:16:44 +02:00
Gregory Roussac
9f13b9f7b1 Merge pull request #474 from madef/master
[*] Project : Add paging to Collections
2013-08-05 09:52:16 -07:00
jeromenadaud
8be06bba2d [-] BO : FixBug Multiple list pagination error. 2013-08-05 18:22:30 +02:00
gRoussac
d585b015c1 // move toolbar delete button on AdminProducts 2013-08-05 18:18:35 +02:00
Gregory Roussac
931cfee258 Merge pull request #625 from axometeam/patch-18
[-] MO : All fields available in the RSS
2013-08-05 09:06:02 -07:00
Vincent Augagneur
ea10b94ef2 //onkeypress enter to validate range 2013-08-05 18:02:08 +02:00
Axome
9dfeb1d528 All fields available in the RSS
Not just link & title but all available fields
2013-08-05 17:58:49 +02:00
Vincent Augagneur
cf9d20f83b //range overlapping bug fix 2013-08-05 17:43:31 +02:00
gRoussac
9ca9928c58 [-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis 2013-08-05 17:17:22 +02:00
gRoussac
5cd75f23ff [-] CORE : Cast product price to float instead of int when adding supplier reference, thanks @rimas-kudelis 2013-08-05 17:05:07 +02:00
Vincent Augagneur
3a75a783f6 //added label on carrier zones && improve range validation 2013-08-05 16:54:36 +02:00
gRoussac
a98740d25c // small change, switch two buttons in list_header 2013-08-05 16:39:29 +02:00
jeromenadaud
fc54ddb86f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:32:55 +02:00
jeromenadaud
114eb3b78b [-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception 2013-08-05 16:32:39 +02:00
Francois Gaillard
58b5028147 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:25:57 +02:00
Francois Gaillard
176c6a8767 [-] Classes : ModuleFrontController updated. Thank you @codeurWeb 2013-08-05 16:25:52 +02:00
jeromenadaud
48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:12:04 +02:00
jeromenadaud
b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
Rémi Gaillard
3317ab878d [-] WS: add id_address_delivery on cart products association 2013-08-05 15:53:40 +02:00
Gregory Roussac
07181a37f5 Merge pull request #413 from ccauw/patch-9
[-] BO : bug color parameter in List
2013-08-05 06:37:46 -07:00
Francois Gaillard
db951f5b76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 15:37:20 +02:00
Francois Gaillard
f217061e27 [-] Classes : ModuleFrontController & templates overrides fixed 2013-08-05 15:37:16 +02:00
Damien Metzger
f3b87f126a // Feeder not installed by default 2013-08-05 15:32:52 +02:00
gRoussac
ed887fd5c3 [*] BO : Add filter choices in title of List, thankx to @ccauw 2013-08-05 15:18:42 +02:00
gRoussac
2ea0dc7749 [*] CORE : Allow external css loading, manual merge of https://github.com/PrestaShop/PrestaShop/pull/406 thanks @m-hume 2013-08-05 14:26:07 +02:00
Gregory Roussac
d1631e6920 Merge pull request #405 from ottonascarella/patch-1
[*] CORE : Enable Progressive JPG
2013-08-05 05:08:10 -07:00
Vincent Augagneur
5a88dc0f8b //fixed bug on carrier wizard when edit carrier 2013-08-05 14:06:50 +02:00
Gregory Roussac
b8e5ad0e44 Merge pull request #624 from iNem0o/development
[-] FO : getBestSales() $order_way doesnt  work in DESC mode
2013-08-05 04:58:39 -07:00
inem0o
2de866eff3 Correct assignation of $order_way parameter 2013-08-05 12:21:19 +02:00
gRoussac
13b3adb8c0 [-] INSTALLER : Force update of PS_LEGACY_IMAGES to 0 2013-08-05 12:17:21 +02:00
Sarah Lorenzini
6533ee4bec // update stock tab 2013-08-05 12:13:43 +02:00
gRoussac
8c2af798a4 // small change on pack css 2013-08-05 12:01:40 +02:00
Damien Metzger
144c85ed4f // Removed useless param 2013-08-05 11:40:03 +02:00
Damien Metzger
581dcec718 // [-] IN : Fixed language detection and help in the installer 2013-08-05 11:23:09 +02:00
Damien Metzger
7f4e4efbd8 [*] TR : Added 10 new localization packs 2013-08-05 11:23:09 +02:00
gRoussac
19918dea8e [-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses 2013-08-05 10:47:04 +02:00
Sarah Lorenzini
166d8a69fa [-] FO: fixed bug shopping cart price misplaced - #9971 2013-08-05 10:21:46 +02:00
Rémi Gaillard
003c05a729 [-] BO: Fix #PSCFV-9885 catalog price rules edition 2013-08-05 09:55:29 +02:00
jeromenadaud
9ff0d60158 [-] BO : FixBug #PSCFV-7839 No invoice file attached to payment email confirmation 2013-08-05 09:41:46 +02:00
Kevin Granger
9f11ecfd78 // Add label attributes for, refacto browse file 2013-08-02 18:46:37 +02:00
gRoussac
055134719d [-] BO : Fix warning in AdminAttributesGroups after https://github.com/PrestaShop/PrestaShop/pull/392 2013-08-02 18:33:53 +02:00
Gregory Roussac
47b7e6aab5 Merge pull request #392 from ldecoker/patch-4
[-] [BO] : The div for colorAttributeProperties is not closed
2013-08-02 09:15:51 -07:00
gRoussac
33116dfa47 [-] FO : Fix bug #PSCFV-9856 could not add Uncombinable cart rules and Minimum amount check badly calculated 2013-08-02 18:00:10 +02:00
Sarah Lorenzini
94a43f2991 // update advanced parameters and administration tabs 2013-08-02 17:44:26 +02:00
Vincent Augagneur
be93a00277 //new place for validate and add new range && global range validation part 1 on carrier wizard 2013-08-02 17:29:15 +02:00
Sarah Lorenzini
60f567d2ff // update modules tab 2013-08-02 15:20:12 +02:00
Sarah Lorenzini
142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
Vincent Augagneur
f55a8c2dd5 //remove debug 2013-08-02 11:38:38 +02:00
Vincent Augagneur
02fdc5fe24 //fixed float validation on carrier wizard 2013-08-02 11:25:08 +02:00
Vincent Augagneur
f2146ac2ae //fixed somes bug on carriers wizard 2013-08-02 10:54:07 +02:00
Vincent Augagneur
46d0663b2f //remove debug 2013-08-02 10:29:30 +02:00
Vincent Augagneur
9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range 2013-08-02 10:22:06 +02:00
Damien Metzger
fc63b8ad7f // Improved configuration checklist 2013-08-02 09:11:55 +02:00
Kevin Granger
32b50b4dad // small fix on carriers wizard ( remove original css, and change js add/remove class .error to .errorStep) 2013-08-01 20:25:36 +02:00
Francois Gaillard
268b3c6bda // Variables name fixed 2013-08-01 19:14:04 +02:00
Francois Gaillard
b51d4f4c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 19:11:27 +02:00
Francois Gaillard
28de7890d2 [*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook) 2013-08-01 19:10:25 +02:00
jeromenadaud
d8f5caee7b [-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation 2013-08-01 19:09:34 +02:00
Vincent Augagneur
ac48c1b786 //remove inline css 2013-08-01 18:26:39 +02:00
jeromenadaud
3f2da1095f [-] BO: FixBug #PSCFV-10005 Filter on COUNT field 2013-08-01 18:06:14 +02:00
jeromenadaud
b34acf74f2 [-] BO : FixBug Undefined variable title 2013-08-01 17:33:53 +02:00
Francois Gaillard
07ce127723 [-] Classes : Bug fix Validate.php - Error with $mail_name 2013-08-01 17:31:45 +02:00
Sarah Lorenzini
e2abf3ecb7 // update preferences tab -> images controller 2013-08-01 17:26:53 +02:00
jeromenadaud
24bf5e5bdf [-] BO : FixBug Undefined variable currency 2013-08-01 17:26:07 +02:00
Francois Gaillard
7e7b5af26e // Profiler fixed 2013-08-01 17:21:38 +02:00
Vincent Augagneur
1447be6f3c //fixed bug when changing range type 2013-08-01 17:16:52 +02:00
Vincent Augagneur
fa958c9a5e //carrier wizard currency sign bug 2013-08-01 17:13:08 +02:00
jeromenadaud
174dfa9a6b [+] BO : Filter button default css class style 2013-08-01 17:13:02 +02:00
jeromenadaud
a29fa2dd09 [+] BO Better filters display 2013-08-01 16:59:08 +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
Sarah Lorenzini
680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
gRoussac
6a073143f2 [-] BO : Fix bug #PSCFV-9990 bad count on list header helper 2013-08-01 16:15:41 +02:00
gRoussac
ccc2312053 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 16:12:19 +02:00
gRoussac
1028c8671c [-] CORE : Merge from PrestaEdit last pull request again 2013-08-01 16:12:05 +02:00
Vincent Augagneur
adede4f7ea //small fix 2013-08-01 16:11:50 +02:00
Vincent Augagneur
9c86943e2a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 16:03:19 +02:00
Vincent Augagneur
c0db0bfca9 //Added currency sign and weigh unit on carrier wizard 2013-08-01 16:03:14 +02:00
Damien Metzger
b27d030fd2 // Added units to package dimensions 2013-08-01 15:52:07 +02:00
Vincent Augagneur
79a4a84163 //small fix on carrier wizard oups 2013-08-01 15:41:42 +02:00
Vincent Augagneur
f5454748b2 //small fix on carrier wizard 2013-08-01 15:41:01 +02:00
Vincent Augagneur
9df90cc575 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 15:23:30 +02:00
Vincent Augagneur
c9b1546a2e //disabled all fess when carrier is free 2013-08-01 15:23:26 +02:00
jeromenadaud
550aa01faf [-] BO : FixBug #PSCFV-9859 Carriers free shipping inline edit 2013-08-01 15:14:14 +02:00
jeromenadaud
48067e1a3d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 15:12:37 +02:00
gRoussac
7fb483eaa2 // harmonisation within Tools:: instead self:: 2013-08-01 15:07:38 +02:00
gRoussac
c9bb88cac7 // harmonisation within Tools:: instead self:: 2013-08-01 14:52:29 +02:00
Gregory Roussac
99ebde1e8e Merge pull request #622 from PrestaEdit/patch-48
[*] CORE : toCamelCase should use utf8 Tools functions
2013-08-01 05:48:49 -07:00
PrestaEdit
37cd2a3ab3 [*] Class: Tools / toCamelCase
Change the name of the var to a correct name.

Use the Tools method like strtolower, ucfirst and strtoupper.
2013-08-01 14:42:51 +02:00
Kevin Granger
5defc39def [+] BO Images / Marketing / Spe. Prices Rules 2013-08-01 14:42:43 +02:00
gRoussac
fd7facc9b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 14:28:41 +02:00
gRoussac
8a9376ae22 [-] FO : Fix bug #PSCFV-9993 could not see product quantity in pack content 2013-08-01 14:28:36 +02:00
gRoussac
2b6b65a303 // norms 2013-08-01 14:27:50 +02:00
jeromenadaud
409bc533cd [-] BO : FixBug #PSCFV-9748 Missing confirmation and update button problem 2013-08-01 14:21:48 +02:00
Vincent Augagneur
c6c4fd03e8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 14:12:39 +02:00
Vincent Augagneur
0898a63060 //fixed bug when carrier is free 2013-08-01 14:12:32 +02:00
Damien Metzger
82a912e3f1 // Fixed iframe height in the installer 2013-08-01 12:30:38 +02:00
Damien Metzger
3cfa17b837 // Improved help iframe in the installer 2013-08-01 12:30:38 +02:00
Vincent Augagneur
afd41af8c5 //carrier wizard fix logo duplication when edit carrier 2013-08-01 12:20:55 +02:00
Vincent Augagneur
5f9d83dd37 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 12:10:06 +02:00
Vincent Augagneur
59fca8eb85 //carrier wizard fix when range as no fees 2013-08-01 12:09:58 +02:00
gRoussac
3e75881bdc Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 11:48:50 +02:00
Vincent Augagneur
dfb1924884 //carrier wizard fix when edit a carrier 2013-08-01 11:47:39 +02:00
gRoussac
184a1c561c [-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page 2013-08-01 11:44:00 +02:00
Vincent Augagneur
c432c44987 //carrier wizard fix 2013-08-01 11:42:58 +02:00
Vincent Augagneur
bf7c38ef49 //carrier wizard fix 2013-08-01 11:28:53 +02:00
Damien Metzger
af9397a11b [-] BO : fixed domain warning 2013-08-01 10:50:21 +02:00
Damien Metzger
ebe8d6294d // CSS fix for carrier wizard 2013-08-01 09:34:07 +02:00
Damien Metzger
0d7ca1d8cf // Install version ready for 1.5.5 2013-08-01 09:21:51 +02:00
Kevin Granger
e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
Damien Metzger
168759a383 // Stock performance optimization 2013-07-31 18:46:45 +02:00
Damien Metzger
e930d40482 // Added debug function Tools::debug_backtrace() 2013-07-31 18:46:45 +02:00
jeromenadaud
50bdfb9a1a [-] BO FixBug Action button in list content 2013-07-31 18:44:20 +02:00
jeromenadaud
017e5ccbc8 [+] BO Pagination, filter and display 2013-07-31 18:37:01 +02:00
Vincent Augagneur
33951c1834 //fixed carrier wizard summary range limit 2013-07-31 18:14:13 +02:00
Vincent Augagneur
d3b000e72f //fixed bug on carrier wizard when is_free 2013-07-31 18:09:00 +02:00
jeromenadaud
683818ebd4 [+] BO : Remove advanced header on empty list 2013-07-31 18:04:28 +02:00
Sarah Lorenzini
ca253bcda2 // update preferences tab 2013-07-31 17:43:48 +02:00
Vincent Augagneur
e1fa26d002 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-31 17:33:19 +02:00
Vincent Augagneur
32f23a79a4 //carrier wizard added validation fields 2013-07-31 17:33:09 +02:00
Vincent Augagneur
60ecfaafd2 //fixed bug on carrier wizard tabindex 2013-07-31 17:16:52 +02:00
gRoussac
c41537f4e4 [-] INSTALLER : missing parenthesis in SQL in set_product_suppliers, thanks to @EvaldasUzkuras 2013-07-31 16:08:54 +02:00
gRoussac
e85ffae69d [-] INSTALLER : Fix bug while updateing supplier reference, back from https://github.com/PrestaShop/PrestaShop/pull/618 thanks @EvaldasUzkuras 2013-07-31 15:55:06 +02:00
gRoussac
5e0b5db23b [*] BO : refact for modules exeptions regarding https://github.com/PrestaShop/PrestaShop/pull/614 2013-07-31 15:16:42 +02:00
Sarah Lorenzini
9debffe910 // update shipping tab 2013-07-31 15:06:59 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +02:00
Vincent Augagneur
69944e1618 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-31 14:31:27 +02:00
Vincent Augagneur
175427cb2e //fixed input text not disabled when change range behavior 2013-07-31 14:31:23 +02:00
Gregory Roussac
304e479ca5 Merge pull request #617 from axometeam/patch-16
[*] BO : Fix statistics redirection when change date
2013-07-31 05:17:13 -07:00
Axome
1187e7cb09 [*] BO : Fix statistics redirection when change date
When going into a special stats module (for exemple "statsproduct") if you change the date, Prestashop redirect to the "home" of statistics.
2013-07-31 14:15:33 +02:00
Gregory Roussac
b0ac617e9f Merge pull request #615 from nilsga/development
[-] BO : Fixed fieldset issue when customer is a guest
2013-07-31 05:15:13 -07:00
Gregory Roussac
6f27508972 Merge pull request #616 from sebastienhouzet/development
[*] CORE : htaccess in override folder
2013-07-31 05:11:41 -07:00
Yoozio
fd339d96b2 [*] Security : deny access to this folder as already done for classes 2013-07-31 12:29:05 +02:00
Nils-Helge Garli Hegvik
b362c808dc Fixed fieldset issue when customer is a guest 2013-07-31 12:25:35 +02:00
Vincent Augagneur
e3265dcb1b //carrier wizard range validation 404 when change range type 2013-07-31 11:12:01 +02:00
Vincent Augagneur
be7e4b4128 //carrier wizard Shipping and handling are set to no by default 2013-07-31 11:00:31 +02:00
Vincent Augagneur
80c2e3ea60 //small fix on carrier wizard 2013-07-31 10:34:52 +02:00
jeromenadaud
d68363fdda [-] FO : FixBug #PSCFV-9846 Bookmark title escape problem on special language 2013-07-31 10:24:14 +02:00
jeromenadaud
e1b7470845 [-] BO : FixBug Install currency on Localization Pack 2013-07-31 09:38:10 +02:00
jeromenadaud
0e3f2d6a82 [-] BO : FixBug Invalid offset when only one error in layout 2013-07-31 09:18:13 +02:00
gRoussac
f28a480bf9 // remove console.log 2013-07-30 20:36:38 +02:00
gRoussac
f606cb4efb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-30 20:28:12 +02:00
gRoussac
6600112ab1 [-] BO : Fix onchange event on Adminmodules list execption 2013-07-30 20:28:06 +02:00
gRoussac
9ae8667783 [-] BO : Fix onchange event on adminmoudlue list execption 2013-07-30 20:26:45 +02:00
gRoussac
024800d4f9 // w3c multiple 2013-07-30 20:04:45 +02:00
gRoussac
edb8cce49f //norms 2013-07-30 19:57:23 +02:00
gRoussac
5677826b2f // wrong commit 2013-07-30 19:21:02 +02:00
gRoussac
0821194f94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-30 19:19:32 +02:00
gRoussac
d6856a5c62 //norms 2013-07-30 19:18:29 +02:00
Damien Metzger
e0f1041070 // Performance improvements for the cart page 2013-07-30 19:16:05 +02:00
gRoussac
d68d844303 // norms 2013-07-30 19:02:05 +02:00
Gregory Roussac
800c63036e Merge pull request #605 from Captain-FLAM/patch-10
[*] BO : Proposition : IMPROVEMENT Admin Modules Positions
2013-07-30 09:48:11 -07:00
Kevin Granger
a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
Captain-FLAM
be613fa008 fixup! [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 2013-07-30 17:42:50 +01:00
jeromenadaud
24a70479d3 [-] BO : FixBug Module list template 2013-07-30 18:06:35 +02:00
Vincent Augagneur
d50b8c679f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-30 18:02:46 +02:00
Vincent Augagneur
fcc1867a94 //merge 2013-07-30 18:02:30 +02:00
jeromenadaud
9bf6871e8d [-] FO : FixBug #PSCFV-9766 All products in products list for email confirmation with multi-shipping 2013-07-30 17:50:36 +02:00
Vincent Augagneur
cf694be5a1 //fixs carrier wizard 2013-07-30 17:46:44 +02:00
Sarah Lorenzini
635076a7ad // update localization tab 2013-07-30 17:45:50 +02:00
jeromenadaud
a93667a58b [-] FO : FixBug Wrong offset in more than one shipping address 2013-07-30 17:03:15 +02:00
Kevin Granger
062a4250cc //fixed unclosed div 2013-07-30 15:26:00 +02:00
jeromenadaud
6ddf2ee1ab [-] BO : FixBug allow_url_fopen on BackOffice home page 2013-07-30 15:19:54 +02:00
Damien Metzger
d9ce51f38c Merge pull request #613 from djfm/nl_installer
[*] LO : Added Dutch Installer
2013-07-30 06:14:40 -07:00
Damien Metzger
f59bd2f55f Merge pull request #612 from djfm/development
// Reviewed CarrierWizard strings, and corrected a few glitches with smarty translation functions and quotes
2013-07-30 06:13:10 -07:00
djfm
28c0ef2b7d // added a few translations to NL installer 2013-07-30 13:07:14 +00:00
Sarah Lorenzini
faafe4167a // update localization tab 2013-07-30 14:56:39 +02:00
Sarah Lorenzini
816153687c // update localization tab 2013-07-30 12:25:20 +02:00
djfm
cba79bdcd6 // corrected quote problems in the translation files 2013-07-30 09:47:02 +00:00
Vincent Augagneur
3d40814739 //added name in errors array in validateRules 2013-07-30 11:33:30 +02:00
djfm
9ba17d642a // CarrierWizard: English Strings reviewed and corrected 2013-07-30 09:30:41 +00:00
Vincent Augagneur
5929727be1 Merge pull request #601 from PrestaEdit/carrier_wizard2
[-] Carrier Wizard: fix
2013-07-30 02:22:45 -07:00
Vincent Augagneur
3814a8c735 [-] BO : fixed bug #PSCFV-9809 - carrier wizard tab access fix 2013-07-30 10:40:13 +02:00
gRoussac
4185026880 [-] CORE : Fix warning #PSCFV-9678 when sending message to customer 2013-07-30 10:37:07 +02:00
Kevin Granger
8bafaceb40 [+] BO Customers > Addresses // Helper > Required Fields 2013-07-30 10:35:47 +02:00
gRoussac
a36ac7784d // trailing space 2013-07-30 10:35:23 +02:00
Jérôme Nadaud
7d57255b70 [-] BO : FixBug #PSCFV-9959 file_get_contents error 2013-07-30 10:27:55 +02:00
Damien Metzger
192940946d // Fixed pscleaner method 2013-07-30 09:21:41 +02:00
Kevin Granger
b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Gregory Roussac
b004151695 Merge pull request #599 from PrestaShop/master
[*] CORE : Update gitignore
2013-07-29 10:19:55 -07:00
Kevin Granger
d95a519ace [+] BO Customers WIP 2013-07-29 19:18:02 +02:00
gRoussac
918ceb3ed5 // norms 2013-07-29 19:15:47 +02:00
Gregory Roussac
a23a576d47 Merge pull request #611 from 202-ecommerce/fix_translation
[-] BO : Fix while of translation, to find in folder if translation exists
2013-07-29 10:07:50 -07:00
Guillaume DELOINCE
8ddd592da1 [-] BO : Fix while of translation, to find in folder if translation exists 2013-07-29 19:00:57 +02:00
Gregory Roussac
53c195e9d9 Merge pull request #610 from indesign47/patch-8
[*] BO : shipping enlarge listbox carriers
2013-07-29 09:38:59 -07:00
Jérôme Nadaud
39a6d0a42d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:18 +02:00
Vincent Augagneur
db98509443 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:01 +02:00
Jérôme Nadaud
0ecc2fb0a0 [-] BO : FixBug #PSCFV-9965 currency not active by default in Localization pack 2013-07-29 18:36:55 +02:00
Vincent Augagneur
0e6f1598f7 [-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img 2013-07-29 18:36:50 +02:00
Gregory Roussac
5f791dc839 Merge pull request #541 from indesign47/patch-4
[-] MO : products comments impossible if quantity > 0
2013-07-29 09:36:32 -07:00
indesign47
b8dc750547 [*] BO : shipping enlarge listbox carriers
enlarge listbox carriers to see all the name of the carrier
2013-07-29 18:25:05 +02:00
Jérôme Nadaud
72dc8b943f [-] FO : FixBug #PSCFV-9961 Remove wishlists icon 2013-07-29 17:58:31 +02:00
Jérôme Nadaud
aa9a6e66b8 [-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B 2013-07-29 17:44:14 +02:00
Gregory Roussac
d356fe684a Merge pull request #608 from indesign47/patch-7
[*] BO : skip the first line by default
2013-07-29 08:23:32 -07:00
indesign47
d76059ff23 [*] BO : skip the first line by default
All sample csv file use a first line of information
2013-07-29 17:19:46 +02:00
Gregory Roussac
44b9909d4f Merge pull request #607 from indesign47/patch-6
[-] BO : doesn't match available_fields of AdminImportController
2013-07-29 08:12:26 -07:00
indesign47
65287d71c3 [-] BO : doesn't match available_fields of AdminImportController
- Correct wrong position of available_fields
- Add some of available_fields
2013-07-29 17:10:57 +02:00
Kevin Granger
613c9b66e5 // fix carriers 2013-07-29 16:51:03 +02:00
Kevin Granger
483dbd7b53 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // update shipping tab
  // update shipping tab

Conflicts:
	admin-dev/themes/default/template/helpers/options/options.tpl
2013-07-29 16:21:31 +02:00
Kevin Granger
ae225dce4c // WIP customer 2013-07-29 16:16:10 +02:00
Sarah Lorenzini
b528b7b6fc // update shipping tab 2013-07-29 16:13:07 +02:00
Sarah Lorenzini
101d9283ae // update wizard 2013-07-29 15:12:50 +02:00
gRoussac
ab0189a726 [-] CORE : Fix bug #PSCFV-9572 when seizing in 0 in forms input fields for objects 2013-07-29 14:39:35 +02:00
sLorenzini
243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00
PrestaEdit
c1b0d32d32 [-] Carrier Wizard: fix 2013-07-29 13:57:31 +02:00
Captain-FLAM
0de4642d09 [*] BO : Proposition : IMPROVEMENT Admin Modules Positions
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
2013-07-29 12:35:02 +01:00
PhpMadman
1dd7d6afcc [-] BO : Fixed incorrect error message in a_s_m
[+] BO : Added support for Depends On Stock
[-] BO : Added missing check if warehouse is set in csv
2013-07-29 11:54:15 +02:00
Damien Metzger
ad9d3af3ad // Class index for Carrier Wizard 2013-07-29 11:54:08 +02:00
Gregory Roussac
155102da4b Merge pull request #603 from xBorderie/patch-1
// Removed "502" from the notice of license.
2013-07-29 02:49:48 -07:00
Xavier
4291b23e23 Update CartRule.php
Removed "502" from the notice of license.
2013-07-29 11:41:35 +02:00
Vincent Augagneur
e1b408f1f3 //added missing carrier wizard step img 2013-07-29 11:36:44 +02:00
sLorenzini
2ac6ada03d // update order tab 2013-07-29 11:01:48 +02:00
Vincent Augagneur
210d24343c [-] BO : fixed input action when set fees for all zones in carrier wizard 2013-07-29 10:47:20 +02:00
PhpMadman
909948bfb9 [+] BO : Added support to set A warehouse by id
[*] BO : Import will clear any warehouses allready set
2013-07-29 10:27:31 +02:00
gRoussac
1c37fdbc23 // foloww up 2e6e5a2604 2013-07-29 10:24:36 +02:00
Vincent Augagneur
60d67a7798 Merge pull request #600 from PrestaEdit/carrier_wizard
[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"
2013-07-29 01:04:17 -07:00
PhpMadman
4857c8c788 [+] BO: Added support for Advanced Stock Management
[*] BO: Fixed typos
[*] BO: Auto remove product from DependsOnStock of Advanced Stock Management is disabled
[*] BO: Added id to warehouse controller
2013-07-29 09:35:39 +02:00
Jérôme Nadaud
95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion 2013-07-29 09:33:50 +02:00
PrestaEdit
c089b1e69e [-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference" 2013-07-27 15:23:48 +02:00
PrestaEdit
85553525e9 Merge pull request #2 from PrestaShop/development
// Merge PrestaShop
2013-07-27 04:39:15 -07:00
Rémi Gaillard
a786606c9a // small fix on carrierwizard 2013-07-26 20:27:25 +02:00
Rémi Gaillard
77f4eec64f // Fix group association on carrierwizard 2013-07-26 19:38:06 +02:00
Rémi Gaillard
159d0b3904 // improve exception 2013-07-26 19:15:37 +02:00
Jérôme Nadaud
06834e404d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-07-26 19:00:00 +02:00
Jérôme Nadaud
52ff61719b [+] BO : Remove invoices button toolbar 2013-07-26 18:59:39 +02:00
Kevin Granger
94de4d3d2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : Order template misplaced empty form
  [+] BO : Handler invoice date generation button
2013-07-26 18:55:18 +02:00
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Jérôme Nadaud
0ef7578f26 [-] BO : Order template misplaced empty form 2013-07-26 18:43:40 +02:00
Rémi Gaillard
0d76af7f41 // debug deletion 2013-07-26 18:29:01 +02:00
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
gRoussac
42c5335f27 [*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus 2013-07-26 17:55:53 +02:00
Jérôme Nadaud
f3ca8ec15b [+] BO : Handler invoice date generation button 2013-07-26 17:23:15 +02:00
gRoussac
2704f52fe4 [-] Installer: update leftcolumn alias to enable live_edit on blockmyaccount 2013-07-26 17:20:52 +02:00
gRoussac
076b6d11a2 [-] CORE: Copy live_edit bool when register alias hook 2013-07-26 17:15:36 +02:00
sLorenzini
c1e4b812f9 // update "create order" tab 2013-07-26 16:33:52 +02:00
Kevin Granger
1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Jérôme Nadaud
3287ff5300 [+] BO : Product attachment "For" 2013-07-26 15:32:04 +02:00
Madman
1895ec8731 // Begining of Support for Advanved Stock Managment in CSV Import 2013-07-26 15:30:54 +02:00
Jérôme Nadaud
7db1fb89ec [+] BO : Products customization "For" 2013-07-26 15:09:14 +02:00
Jérôme Nadaud
5c52ba31e9 [+] BO : Products quantities "For" and small template fix 2013-07-26 15:03:29 +02:00
sLorenzini
3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Jérôme Nadaud
5d2e19fe3b [-] BO : FixBug Impossible to remove available date from product attribute 2013-07-26 12:14:00 +02:00
Jérôme Nadaud
23e0467993 [-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date 2013-07-26 11:48:18 +02:00
Kevin Granger
8b7c29dd18 [+] BO Scenes - Tags - Attachments 2013-07-26 11:12:50 +02:00
Damien Metzger
e80364984a // Fixed manufacturers addresses export 2013-07-26 10:36:41 +02:00
Kevin Granger
72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00
Gregory Roussac
30c689df22 Merge pull request #584 from Captain-FLAM/patch-3
[-] FO : product with declinaisons without reductions, reduction price is showed anyway
2013-07-26 00:58:00 -07:00
Gregory Roussac
5015f88a46 Merge pull request #595 from codl/fix/too-many-packs
[-] WS: Sanity check before creating packs
2013-07-26 00:51:08 -07:00
Gregory Roussac
7d06d50d40 Merge pull request #597 from Captain-FLAM/patch-9
[-] CORE : Exception Text filled on Positions Page is not working (Hook Modules Exceptions)
2013-07-26 00:38:22 -07:00
Captain FLAM
a35011e9a5 Update Module.php 2013-07-25 19:16:46 +01:00
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
Kevin Granger
9308c5c527 no message 2013-07-25 19:18:54 +02:00
Gregory Roussac
c9e87d99da Merge pull request #551 from cinscaen/development
[-] BO: Fix Bug Progress Bar Upload Image Product
2013-07-25 09:23:07 -07:00
Gregory Roussac
ceee011d5c Merge pull request #555 from piotrmocko/patch-1
[- ] BO : Do not limit feature values on a  getList
2013-07-25 09:20:53 -07:00
Jérôme Nadaud
07000c1f66 [-] BO : BugFix Cancel modification button error 2013-07-25 18:15:41 +02:00
gRoussac
d2acb9dedb [-] MO : Fix sort order for combinations, report of pull request https://github.com/PrestaShop/PrestaShop/pull/364 2013-07-25 18:15:06 +02:00
gRoussac
9848468f3e [-] MO : blockviewed Fix bug adding last product to list, thanks @kluevandrew 2013-07-25 17:58:22 +02:00
Jérôme Nadaud
ce5355415b [+] BO : Product "For" and combination button 2013-07-25 17:53:09 +02:00
Damien Metzger
e6ecf0c177 // Added a more efficient index 2013-07-25 17:07:28 +02:00
Damien Metzger
eff81dfe05 // Moved a condition/function from SQL to PHP. 2013-07-25 17:07:28 +02:00
sLorenzini
832f5cf0dd // update order tab 2013-07-25 16:53:18 +02:00
Jérôme Nadaud
76c87044de [+] BO : Product "For" 2013-07-25 16:44:52 +02:00
Gregory Roussac
6531572c15 Merge pull request #596 from ChristopheBoucaut/patch-3
[-) FO : addtextfield if magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST
2013-07-25 07:36:31 -07:00
Jérôme Nadaud
cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger
488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
ChristopheBoucaut
a9e233b209 Update Cart.php
If magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST as they already are.
2013-07-25 15:46:08 +02:00
Gregory Roussac
a54ac39632 Merge pull request #356 from arnolem/dev-wsSetProductTags
[*] WS : Allow to set the tags list of product
2013-07-25 06:17:15 -07:00
Gregory Roussac
3896453c7c Merge pull request #352 from sdevilcry/development
[-] CORE : Fix issue after a payment redirection error, delivery_option is not sent
2013-07-25 06:11:51 -07:00
gRoussac
bff2844adf [*] MO : Added customer and product object to hook sending email 2013-07-25 14:50:35 +02:00
Jérôme Nadaud
f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +02:00
Corentin Delcourt
53526304a5 [-] WS: Sanity check before creating packs
As it is before this commit, every product that is created from the
schema without removing the empty bundle item in the schema will become
a pack containing one broken item.

Sorry, this bug was introduced by my previous pull request.
2013-07-25 14:45:17 +02:00
Jérôme Nadaud
3f83dd9222 [+] BO : Product "For" 2013-07-25 14:33:14 +02:00
Gregory Roussac
b4d3b631ad Merge pull request #594 from Shagshag/patch-6
[*] BO: twice class attribute in color input
2013-07-25 05:18:41 -07:00
Jérôme Nadaud
d6b38635f9 [+] BO : Product "For" 2013-07-25 14:02:36 +02:00
gRoussac
ae7ee01028 [*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages 2013-07-25 12:26:57 +02:00
Gregory Roussac
56aa91a3fa Merge pull request #296 from samy-r/dev-address-update
[*] CORE : Add mobile phone in default adress layout update
2013-07-25 03:05:36 -07:00
Kevin Granger
59aa781b0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // oops
  [-] BO : Add missing tmp directory
2013-07-25 11:55:58 +02:00
Kevin Granger
b5ae321ea5 // fix input + switch 2013-07-25 11:55:27 +02:00
gRoussac
2e7f3c296b [-] FO : Force browser language detection in Tools::setCookieLanguage 2013-07-25 11:44:45 +02:00
Jérôme Nadaud
a470cd7d12 // oops 2013-07-25 11:28:40 +02:00
Jérôme Nadaud
059872b1ba [-] BO : Add missing tmp directory 2013-07-25 11:24:43 +02:00
Shagshag
21cf113c44 twice class attribute in color input 2013-07-25 10:26:53 +02:00
Gregory Roussac
5ee247ad23 Merge pull request #592 from Captain-FLAM/patch-8
[*] MO : blocklayered : Supress unsuseful # at the end of URLs
2013-07-25 01:23:46 -07:00
sLorenzini
312ad4eb37 // update order tab 2013-07-25 09:41:31 +02:00
Jérôme Nadaud
cfeaf0fa36 // norm 2013-07-25 08:51:22 +02:00
Jérôme Nadaud
7b980217b5 // norm 2013-07-25 08:49:40 +02:00
Jérôme Nadaud
541a4525b5 [-] FO : FixBug #PSCFV-9879 Email confirmation message not present 2013-07-24 19:24:22 +02:00
Gregory Roussac
ef22b9d5d4 Merge pull request #162 from bumbu/patch-2
[-] CORE : updateMultishopTable() where argument is not mandatory anymore
2013-07-24 10:07:56 -07:00
Jérôme Nadaud
ae7f47a275 [-] BO : FixBug #PSCFV-9042 Supply orders now accept 0 value to automatically load products 2013-07-24 18:52:47 +02:00
gRoussac
aaaa5cb086 [-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593 2013-07-24 18:22:04 +02:00
gRoussac
a406778e17 // norm 2013-07-24 17:32:58 +02:00
Kevin Granger
edc2113330 // fix merge 2013-07-24 17:02:23 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
2013-07-24 17:01:23 +02:00
Jérôme Nadaud
08aa1f90c6 [-] BO : FixBug #PSCFV-9839 Update product warehouse on suply order - thanks @O'Donnell 2013-07-24 16:40:59 +02:00
Damien Metzger
71c0a483e1 // Small fix 2013-07-24 16:16:40 +02:00
Damien Metzger
056ced75b5 // Fixed double module call 2013-07-24 15:55:40 +02:00
Captain FLAM
daec59d13d Update blocklayered.js 2013-07-24 11:55:05 +01:00
Gregory Roussac
063fd9941c Merge pull request #189 from PrestaEdit/patch-12
[*] BO: use lang for input file
2013-07-24 03:10:00 -07:00
Gregory Roussac
cfa6e61acb Merge pull request #351 from PrestaEdit/patch-23
[*] WS: POST for php://input and XML ressource
2013-07-24 03:08:23 -07:00
Kevin Granger
f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Gregory Roussac
6ac3f1133a Merge pull request #591 from djfm/locpacks
[*] LO: Improved Argentina Localization Pack
2013-07-24 02:08:42 -07:00
djfm
2af3afcc13 [*] LO: Improved Argentina Localization Pack 2013-07-24 08:06:52 +00:00
Gregory Roussac
26247a18c3 Merge pull request #564 from sylwit/patch-1
[*] CORE : Translations shouldn't be cached if they contain dynamic vars (sprintf) in Translate.php
2013-07-23 10:22:54 -07:00
Gregory Roussac
1c71dc54dc Merge pull request #556 from piotrmocko/patch-2
[-] Bo : Payment currency restriction incorret type of input for radio
2013-07-23 10:21:20 -07:00
Gregory Roussac
c025b8cb2b Merge pull request #568 from urecheatu007/development
[-] CORE : setMedia() proper order for typewatch and cart-summary.js
2013-07-23 10:15:43 -07:00
Gregory Roussac
166a133080 Merge pull request #577 from PhpMadman/patch-2
[-] MO : If no homefeatured nb, get default 8 not 10
2013-07-23 10:14:24 -07:00
Gregory Roussac
f8bff15894 Merge pull request #581 from Captain-FLAM/patch-1
[-] Installer : Missing default value for id_employee in log table
2013-07-23 10:12:50 -07:00
Gregory Roussac
9b9e5a122a Merge pull request #586 from Captain-FLAM/patch-7
[-] BO : Hook.php : Missing _DB_PREFIX_, thanks @Captain-FLAM
2013-07-23 09:52:15 -07:00
Francois Gaillard
2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes 2013-07-23 18:47:35 +02:00
Jérôme Nadaud
71271ded7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-23 18:38:33 +02:00
Jérôme Nadaud
d241013692 [-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl 2013-07-23 18:36:51 +02:00
gRoussac
4aab4f88cd [-] BO : Fix SQL query when $join_category == false, pull request d5f75c63b6 thanks @Captain-FLAM 2013-07-23 18:25:32 +02:00
Gregory Roussac
abf6f0d626 Merge pull request #587 from ChristopheBoucaut/patch-2
[-] CORE : Search terms can now have dashes in Search.php
2013-07-23 09:18:16 -07:00
Gregory Roussac
a5e7f7fdac Merge pull request #588 from joseantgv/patch-1
[-] BO : Update AdminCustomerThreadsController.php
2013-07-23 09:16:39 -07:00
sLorenzini
5b804d3628 // update order tab 2013-07-23 17:54:47 +02:00
Damien Metzger
2e6e5a2604 // Removed useless check in the installer 2013-07-23 15:29:09 +02:00
Damien Metzger
c829ac5b7d // Fixed fix 2013-07-23 14:19:13 +02:00
Damien Metzger
87a4b75df4 [*] FO : updated Fancybox plug-in 2013-07-23 12:53:20 +02:00
Rémi Gaillard
6ed713e847 [-] Fix #PSCFV-9038 carrier warehouse association after carrier edition 2013-07-23 11:57:44 +02:00
gRoussac
dbe26e0a1d [-] BO : Could not find cover when image table corrupted 2013-07-23 11:47:16 +02:00
Damien Metzger
0ddf5d1025 // Fixed getMainShopDomain 2013-07-23 11:33:07 +02:00
gRoussac
a805941c1f // typo in EN string 2013-07-23 10:34:05 +02:00
Gregory Roussac
3b213a505c Merge pull request #583 from djfm/development
[*] TR : Small localization fixes & correction in templates so that translation regexes work OK
2013-07-23 00:59:31 -07:00
joseantgv
63b2f63058 Update AdminCustomerThreadsController.php
If language is not defined returns an array instead of a string which makes function Mail::Send to throw a warning.
2013-07-23 09:58:53 +02:00
Damien Metzger
209615d4f4 // Missing } 2013-07-23 09:52:41 +02:00
Damien Metzger
07e3354d0e // Code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger
9169995adc // Small fixes and code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger
91c5d184b6 // Small backend optimization 2013-07-23 09:50:26 +02:00
Damien Metzger
4b6642d76c // Small optimization 2013-07-23 09:50:25 +02:00
ChristopheBoucaut
3503670478 Update Search.php
$string = preg_replace('/[._-]+/', '', $string);

Ex :
Product's name : Saint-leon
Search : leon => 0 result

------------------------------------------------------

$string = preg_replace('/[._-]+/', ' ', $string);
Ex :
Product's name : Saint-leon
Search : leon => 1 result

-------------------------------------------------------

I think that thus the search is more relevant
2013-07-23 09:36:08 +02:00
Captain FLAM
928181bd1f Update Hook.php 2013-07-22 21:35:20 +01:00
Captain FLAM
2e860d6750 Update product.js
if product with declinaison without reduction : reduction price is showed !!

because of this comparison after (line ~400):

if (productPriceWithoutReductionDisplay > productPriceDisplay)

and :

var tmp = productPriceDisplay * group_reduction;

is unused
2013-07-22 18:58:59 +01:00
djfm
939f7d7770 //most of the translation of the NL installer is done 2013-07-22 17:09:26 +00:00
Jérôme Nadaud
3ecf929ff0 [-] BO : FixBug #PSCFV-9881 Remove updateCarriersList on zip code blur 2013-07-22 18:05:37 +02:00
sLorenzini
f194aec8c5 // update module and orders tab 2013-07-22 17:56:24 +02:00
Jérôme Nadaud
0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order 2013-07-22 17:07:57 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Jérôme Nadaud
b88ddf4483 [-] Classes : SwiftMailer - Fix deprecated preg_replace (PHP 5. 5.0) 2013-07-22 15:39:50 +02:00
Jérôme Nadaud
b87e934a66 [-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement 2013-07-22 14:58:55 +02:00
Jérôme Nadaud
794475a9cc [-] BO : FixBug #PSCFV-8237 Javascript Error setting default supplier 2013-07-22 14:33:16 +02:00
Rémi Gaillard
d79365fe4d // small fix 2013-07-22 11:54:35 +02:00
Rémi Gaillard
32c02bba5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-22 11:39:44 +02:00
Rémi Gaillard
b8d272a459 // fix entities 2013-07-22 11:39:15 +02:00
Damien Metzger
f76fe635ff // Added queries table to the profiling mode, you can easily copy/paste it into excel or anything 2013-07-22 11:37:29 +02:00
djfm
3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail 2013-07-22 09:34:18 +00:00
Jérôme Nadaud
ca9f2c9459 [-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction 2013-07-22 11:25:13 +02:00
Captain FLAM
287cf0c955 Update 1.5.5.0.sql
Missing DEFAULT
2013-07-22 09:55:06 +01:00
Damien Metzger
3556e75ce3 // Moved useless code into the block where it is useful 2013-07-22 10:49:41 +02:00
djfm
838a4e8bc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-22 08:25:26 +00:00
gRoussac
3483706951 [-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM 2013-07-20 19:07:10 +02:00
Jérôme Nadaud
1581a371c5 [-] BO : FixBug #PSCFV-9251 Meta Tag delete previous 2013-07-19 18:41:46 +02:00
Kevin Granger
288c0d3ca8 // Css cleaning 2013-07-19 18:41:15 +02:00
Fabio Chelly
aa276aeee6 Merge remote-tracking branch 'origin/development' into development 2013-07-19 17:51:00 +02:00
Fabio Chelly
5825dda836 [-] MO mailalerts : infinite coverage (-1) is taken into account when sending coverage e-mails
#PNM-1563
#PNM-1597
2013-07-19 17:36:51 +02:00
djfm
2f6a53f971 [+] TR: Created file structure for Dutch installer 2013-07-19 15:34:10 +00:00
Damien Metzger
b1f380c120 // Fixed statsforecast category distribution 2013-07-19 16:59:54 +02:00
Jérôme Nadaud
19fb1da4f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-19 16:30:21 +02:00
Jérôme Nadaud
abf874d576 [-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description 2013-07-19 16:30:04 +02:00
Damien Metzger
84d9caca81 // Blind fix 2013-07-19 16:29:17 +02:00
Jérôme Nadaud
5646e682bc [-] BO : FIxBug Correct image language in product 2013-07-19 15:21:06 +02:00
Damien Metzger
3389cf8acb [-] FO : fixed pagination for p = 0 #PSCFV-9746 2013-07-19 14:08:24 +02:00
Damien Metzger
8d034a7ebf // up 2013-07-19 13:33:56 +02:00
Fabio Chelly
95122e8849 Merge remote-tracking branch 'origin/development' into development 2013-07-19 12:04:39 +02:00
Damien Metzger
8c47ca3edf [-] BO : fixed sort by currency exchange rate #PSCFV-9840 2013-07-19 11:40:52 +02:00
Damien Metzger
989dafce21 [*] FO : a few more SQL improvements 2013-07-19 11:29:18 +02:00
Fabio Chelly
7570c9eb87 [-] MO loyalty : minimum amount is now taken into account when creating discount vouchers
#PNM-1561
2013-07-19 11:15:14 +02:00
Damien Metzger
bd4ece095b [*] FO : lots of performance improvements (removed or merged useless SQL queries) 2013-07-19 10:58:51 +02:00
PhpMadman
eb6b233e31 [-] BO : If no nb, get default 8, not 10. 2013-07-19 10:33:28 +02:00
Damien Metzger
219ec6e8be [-] FO : Removed useless live edit query #PSCFV-9845 2013-07-19 09:50:30 +02:00
Damien Metzger
78ddec3ac7 [-] BO : translation copy is now easier #PSCFV-8886 2013-07-18 18:51:37 +02:00
Kevin Granger
0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
gRoussac
a6a700c9d8 // parse error 2013-07-18 18:40:19 +02:00
gRoussac
236aaa9354 [*] MAILS : add {order_name} & {attached_file} , manaul merge from e9f9631744 2013-07-18 18:38:12 +02:00
Jérôme Nadaud
54fe5dfe96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:34:18 +02:00
Rémi Gaillard
ac02e5191a // ups 2013-07-18 18:34:10 +02:00
Jérôme Nadaud
c90ba4c406 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:33:51 +02:00
Jérôme Nadaud
066b791cf7 [-] FO : FixBug of total products from supliers and manufacturer 2013-07-18 18:33:35 +02:00
Rémi Gaillard
354622857f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:31:35 +02:00
Rémi Gaillard
958d92c9fa [*] BO: Add an option to allow iframes on descriptions 2013-07-18 18:31:31 +02:00
Damien Metzger
c70fe92dac // Validate::isGenericName now allow "#" #PSCFV-6530 2013-07-18 18:22:50 +02:00
gRoussac
a71a5d7c18 [-] MO : Fix bug discount display in mail, manual merge from 1d5df338c4 2013-07-18 18:18:57 +02:00
gRoussac
e3d9dd89e9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:18:12 +02:00
Jérôme Nadaud
caf321e691 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden 2013-07-18 18:16:57 +02:00
Jérôme Nadaud
d879fb15a9 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products 2013-07-18 18:10:29 +02:00
Jérôme Nadaud
dd78e97b4a [-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination 2013-07-18 17:09:44 +02:00
Jérôme Nadaud
3693349643 [-] BO : FixBug #PSCFV-5316 Translation problem in delete button link 2013-07-18 15:49:53 +02:00
Jérôme Nadaud
2c6978e97c [-] BO : FixBug #PSCFV-6140 Pagination link error 2013-07-18 14:55:28 +02:00
Damien Metzger
6ae0717e32 // PS Cleaner now clean the img/tmp dir 2013-07-18 14:48:47 +02:00
gRoussac
a6b2299ed1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 14:08:36 +02:00
Jérôme Nadaud
a6da3e94f0 [-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows 2013-07-18 14:02:22 +02:00
Damien Metzger
6293631ac4 [-] FO : fixed group query for cart rules #PSCFV-8992 2013-07-18 13:47:43 +02:00
Jérôme Nadaud
69066361a6 [-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search 2013-07-18 12:15:42 +02:00
gRoussac
d99a1eba24 [-] BO : Bad return value for AdminCountries::processStatus() 2013-07-18 12:12:05 +02:00
Damien Metzger
108bd92c3b [-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216 2013-07-18 12:09:48 +02:00
Damien Metzger
c1a4dd6b66 // Added readme in the override directory 2013-07-18 11:31:08 +02:00
Damien Metzger
3be36f9897 [*] MO : added configuration cleaning to pscleaner 2013-07-18 09:36:01 +02:00
Jérôme Nadaud
2e3ec0f038 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 08:52:56 +02:00
Jérôme Nadaud
40389822c3 [-] BO : FixBug Directory Separator on URL 2013-07-18 08:52:39 +02:00
gRoussac
5939f65fac //norms 2013-07-17 19:05:01 +02:00
Jérôme Nadaud
eecfdae0b6 [-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change 2013-07-17 18:23:59 +02:00
Gregory Roussac
1537f0e9eb Merge pull request #566 from PrestaEdit/patch-45
[*] FO: display Error500 if no database access
2013-07-17 09:02:28 -07:00
Gregory Roussac
312e066751 Merge pull request #550 from PrestaEdit/patch-44
[-] Class: PaymentModule / Be sure to have the right "TaxCalculationMeth...
2013-07-17 09:01:32 -07:00
Gregory Roussac
cf04c18ce6 Merge pull request #537 from PrestaEdit/patch-43
[-] FO: OrderHistory - Unclosed tag
2013-07-17 08:53:31 -07:00
Gregory Roussac
8d5027a89b Merge pull request #530 from PrestaEdit/patch-42
[-] BO: remove old icon into New Version block
2013-07-17 08:44:49 -07:00
Jérôme Nadaud
5c6640c258 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-17 17:34:44 +02:00
Jérôme Nadaud
458838e598 [-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent 2013-07-17 17:33:53 +02:00
Gregory Roussac
ffb62426d8 Merge pull request #516 from PrestaEdit/patch-41
[*] BO: more than one image in HelperForm
2013-07-17 07:44:26 -07:00
gRoussac
8d5a632c92 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-17 16:34:50 +02:00
gRoussac
014758d1d8 Merge branch 'PrestaEdit-translate' into development 2013-07-17 16:34:26 +02:00
gRoussac
3f7bf5c6b0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-17 16:34:03 +02:00
gRoussac
c9d2cf8ed2 Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate
Conflicts:
	admin-dev/header.inc.php
2013-07-17 16:31:49 +02:00
Jérôme Nadaud
6884d7c5de [-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong 2013-07-17 16:19:15 +02:00
gRoussac
24b2e1ec8c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-17 15:36:03 +02:00
gRoussac
d55f31d3b5 Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
Conflicts:
	classes/Tools.php
	controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
Jérôme Nadaud
2d1ec5f642 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-17 15:14:05 +02:00
Jérôme Nadaud
421c199e1f [-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country
Default country value set to manufacturer country
Click on manufacturer address line now redirect to manufacturer address
edition
2013-07-17 15:13:34 +02:00
Damien Metzger
1b9892b944 // removed deprecated message 2013-07-17 13:42:45 +02:00
François Gaillard
899dc30097 [-] Class : AdminController - Object id fixed 2013-07-17 11:33:33 +02:00
Jérôme Nadaud
1199ad8cf2 [-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images 2013-07-17 10:51:34 +02:00
Kevin Granger
02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
gRoussac
ea89c2235d [-] BO : Fix bug #PSCFV-9722, do not propose adding root categories in categories when there is only one shop 2013-07-16 19:01:05 +02:00
Jérôme Nadaud
d66f407fcb [-] BO : Use only 0% reduction from category in group 2013-07-16 18:28:11 +02:00
Jérôme Nadaud
ae5b6b79ee [*] BO : #PSCFV-8498 You can now use 0% in groups category rules in order to not apply discount on this category 2013-07-16 17:42:38 +02:00
Gregory Roussac
e7eae03508 Merge pull request #575 from dreammeup/development
[-] BO : Correcting errors in order graph at admin home
2013-07-16 07:17:03 -07:00
dreammeup
82c7e3eeff Correcting errors in order graph at admin home
The SQL request was returning multiple lines for every days. This modification change the request to have one line for the 7 days of the week.

So it corrects the number who was totally wrong.
2013-07-16 15:34:52 +02:00
djfm
145df5a26e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-16 13:08:36 +00:00
Rémi Gaillard
8d39f32506 [-] BO: Fix tax rule edition - unique tax rule can't be edited 2013-07-16 11:52:05 +02:00
gRoussac
d2ff50ddb7 [*] CORE : Fix bug #PSCFV-9811 doc on display404Error 2013-07-16 10:50:27 +02:00
Damien Metzger
3d283000a0 // Fixed misplaced comma 2013-07-16 10:27:52 +02:00
Jérôme Nadaud
672f2d9dd1 [-] BO : Fix bug #PSCFV-9395 Missing vertical separation between flags 2013-07-16 10:18:54 +02:00
Jérôme Nadaud
97b16d2726 [-] BO : Fix Bug #PSCFV-9550 Bad URL redirection 2013-07-16 09:59:47 +02:00
gRoussac
e48b2a411e [-] INSTALLER : Errors in upgrader 2013-07-15 22:01:41 +02:00
Fabio Chelly
a6d0ef744e Merge remote-tracking branch 'origin/development' into development 2013-07-15 19:37:19 +02:00
Fabio Chelly
b67ffb1a50 [-] MO loyalty : categories are now taken into account when creating discount vouchers
#PNM-1492
#PNM-1191
#PNM-1223
2013-07-15 19:36:32 +02:00
Gregory Roussac
272f2ec8f7 Merge pull request #573 from soware/patch-2
[*] BO : Update AdminStockManagementController.php
2013-07-15 09:49:17 -07:00
Damien Metzger
d9c2ec37d4 // Code cleaning 2013-07-15 18:13:07 +02:00
Damien Metzger
a3039024e7 // Code cleaning 2013-07-15 18:07:53 +02:00
sLorenzini
66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
soware
c253a8edf4 Update AdminStockManagementController.php
Hi, I altered these values to make default on the radio button.
I think is better because is a value more frequent in stock management form.
2013-07-15 12:45:00 -03:00
gRoussac
7a27b11309 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-15 17:31:17 +02:00
gRoussac
f9c5bf0bf2 [-] Fix bug #PSCFV-9633 again could not see delete href in block cart 2013-07-15 17:29:08 +02:00
Gregory Roussac
f6ef6f5d0e Merge pull request #572 from PrestaEdit/patch-47
[-] Class : Media / Correct jquery_ui_dependencies fileName
2013-07-15 07:41:07 -07:00
gRoussac
01bad90b29 // Welcome 2013 2013-07-15 16:36:54 +02:00
PrestaEdit
4b8a756add [-] Class: Media / Correct jquery_ui_dependencies fileName
Even if not used...
2013-07-15 16:34:51 +02:00
gRoussac
ca4a73ddf4 // avoid copy paste mistake with trailing space 2013-07-15 15:34:34 +02:00
gRoussac
1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
gRoussac
f1dcf02caf //fix warnings #PSCFV-9786 2013-07-15 14:25:58 +02:00
gRoussac
e30e15d76d [-] INSTALER: Fix bug #PSCFV-9762 marketing tab disapear after upgrade 2013-07-15 12:29:51 +02:00
sLorenzini
27571f4d06 //update module tab 2013-07-15 12:02:03 +02:00
sLorenzini
0c4a5bd984 // update module tab positions & payment 2013-07-15 11:55:06 +02:00
Rémi Gaillard
ee1187d821 [-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query 2013-07-15 11:00:35 +02:00
Damien Metzger
db7f0da746 // Improved display in pscleaner 2013-07-15 10:48:48 +02:00
Damien Metzger
cf7f72fc30 // Fixed AdminMarketing position in upgrade 2013-07-15 10:11:40 +02:00
gRoussac
6ea4a2c553 [-] FO : Fix bug #PSCFV-9662 udpate payments means after delete thanks @maofree 2013-07-15 10:08:16 +02:00
Cosmin Hutanu
324dff0595 ParentOrderController->setMedia() proper order for typewatch and cart-summary
In the original class, typewatch is inserted after cart-summary, but it is used for the quantity input in cart-summary.js, so we need to have typewatch first.
2013-07-15 00:56:56 +03:00
PrestaEdit
795976cadb [*] FO: display Error500 if no database access
Sometimes, we have some problems with the MySQL Database and a Fatal Error is done. With this, we show the error500 template.
2013-07-14 14:59:25 +02:00
Kevin Granger
b8babdadb3 // products wip 2013-07-12 19:17:51 +02:00
Rémi Gaillard
e34289b0b7 // fix product warehouses 2013-07-12 18:53:22 +02:00
Damien Metzger
22b73a7339 [*] BO : upgraded cover icon management in product > images 2013-07-12 18:43:49 +02:00
Gregory Roussac
c89281166b Merge pull request #467 from PrestaEdit/patch-40
[-] BO : Controller: AdminTranslationsController / Back translations
2013-07-12 09:23:29 -07:00
Gregory Roussac
5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39
[*] BO: hook displayAdminForm / add param fieldset
2013-07-12 08:56:42 -07:00
Rémi Gaillard
e23854d143 // Add currency ID on default modules cache id 2013-07-12 17:49:38 +02:00
sLorenzini
4919d6d81a // update positions module tab 2013-07-12 17:48:07 +02:00
Gregory Roussac
5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5
[-] PDF : Get correct prefix for invoices
2013-07-12 08:44:24 -07:00
Gregory Roussac
39a23e1494 Merge pull request #560 from BigZ/patch-4
[-] PDF : Develivery slip should use prefix
2013-07-12 08:42:16 -07:00
Gregory Roussac
b25b88cf33 Merge pull request #559 from BigZ/patch-3
[-] PDF : Invoice prefix wasn't used in filename
2013-07-12 08:41:37 -07:00
Gregory Roussac
0453698f50 Merge pull request #557 from BigZ/patch-1
[-] BO : Update documents listing to display proper prefix
2013-07-12 08:37:21 -07:00
Kevin Granger
c12ce3dd29 // Products 2013-07-12 17:27:25 +02:00
gRoussac
9c44faf295 [-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps 2013-07-12 16:59:11 +02:00
Damien Metzger
4e0723b3cc [-] BO : fixed charts and grids in multishop #PSCFV-8978 2013-07-12 16:29:31 +02:00
Gregory Roussac
105b1422a3 Merge pull request #562 from axometeam/patch-14
[*] BO : Do not increment stock if statut change fom Error to Canceled
2013-07-12 07:22:50 -07:00
Damien Metzger
38b32f7e1a [-] MO : fixed disappearing form in sekeyword #PSCFV-9743 2013-07-12 15:56:54 +02:00
Damien Metzger
f82e748fc8 [*] MO : you can now exclude IP addresses from the online visitors module #PSCFV-9056 2013-07-12 15:38:36 +02:00
Sylvain WITMEYER
9fec968488 Update Translate.php
Translations shouldn't be cached if they contain dynamic vars (sprintf)

On productcomments, 
<li>{l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful, $comment.total_advice] mod='productcomments'}</li>
was always printing the same sentence
2013-07-12 15:17:09 +02:00
gRoussac
8588978e03 [*] FO : getCatImageLink doesn't work without type thanks @axometeam 2013-07-12 15:03:52 +02:00
sLorenzini
160857bdc3 // update css module tab 2013-07-12 14:30:44 +02:00
gRoussac
24d124f190 [*] MODULE : Multi-shop compatibility in newsletter module tanks @axometeam 2013-07-12 14:17:49 +02:00
Daniel
876c49b690 PNM-1241 Issue with backbutton
This will solve the issue with url indexing not working for all languages.
2013-07-12 18:24:18 +08:00
gRoussac
b880bc3a18 [*] PDF : Free shipping in invoice PDF display X2 thanks @axometeam 2013-07-12 12:09:34 +02:00
gRoussac
6f9e415ca7 // missing image 2013-07-12 12:03:32 +02:00
djfm
e4173fbc98 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-12 09:50:04 +00:00
Axome
1c960da57a [*] BO : Not increment stock if statut change fom Error to Canceled
Not increment stock if statut change fom Error => Canceled or Canceled => Error (stock should stay the same).
Add a code simplification too
2013-07-12 11:22:42 +02:00
Rémi Gaillard
0928efb112 // small fix 2013-07-12 11:17:30 +02:00
Gregory Roussac
c3b7e1dad9 Merge pull request #519 from axometeam/patch-5
[*] BO : Correct Request Sql Manager validate options
2013-07-12 02:08:45 -07:00
Gregory Roussac
44debd682f Merge pull request #517 from axometeam/patch-4
[*] BO : AdminControllers Keep "active" filter on pagination
2013-07-12 02:07:51 -07:00
Rémi Gaillard
4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Gregory Roussac
8fcca7999d Merge pull request #502 from axometeam/patch-2
[-] BO : Prevent false error for product duplication
2013-07-12 01:29:39 -07:00
Damien Metzger
994d43d3e4 // Oops 2013-07-12 09:40:14 +02:00
BigZ
f1049c021a get correct prefix for invoices
One must use the shop id when getting invoices prefix
2013-07-12 03:43:03 +02:00
BigZ
25b5d2857b develivery slip should use prefix
as develivery_prefix uses lang and shop id, those variables has to be passed as parameters
2013-07-12 03:03:21 +02:00
BigZ
e28a1e793a Invoice prefix wasn't used in filename
As invoice_prefix uses lang and shop ids they have to be passed has parameters
2013-07-12 03:01:33 +02:00
BigZ
bd432641a0 update documents listing to display proper prefix
In order details, generic prefix was displayed in right column instead of shop specific prefix
2013-07-12 02:32:52 +02:00
Kevin Granger
84c0ccbae6 // products TPL 2013-07-11 18:58:44 +02:00
gRoussac
5d8d7c0383 [-] MO : Followup : don't send emails for empty carts thanks @axometeam 2013-07-11 18:57:37 +02:00
Piotr Moćko
68d135b4cf Payment currency restriction incorret type of input for radio
When payment module has currencies restrictions set to radio it still displays as checkbox because in TPL file type of input is not being changed
2013-07-11 18:56:50 +02:00
Piotr Moćko
291cec36ab Do not limit features value on a list
Controller use default method getList with pagination of 50 items. Argument $limit should be set to FALSE to disable limit, because if you have more than 50 values of one feature, then you can not access them in back office.
2013-07-11 18:49:44 +02:00
Damien Metzger
9af2d3946f // Fixed potential error when deleting a module 2013-07-11 18:46:06 +02:00
gRoussac
a5ee2c2f4f [-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab 2013-07-11 18:27:54 +02:00
Gregory Roussac
293d1afbc7 Merge pull request #484 from axome/module_followup_guests
[-] MO : Followup : Don't send followup vouchers to guest accounts
2013-07-11 09:13:39 -07:00
Gregory Roussac
27a72f9b2c Merge pull request #482 from axome/module_followup_cron
[-] MO : Followup : Don't execute crontasks if the module is disabled
2013-07-11 09:08:51 -07:00
Damien Metzger
184515a27c [-] MO : fixed bad redirection in trackingfront #PSCFV-8378 2013-07-11 18:03:39 +02:00
sLorenzini
40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Rémi Gaillard
d8a444335f Merge pull request #524 from ChristopheBoucaut/development
Update OrderDetailController.php
2013-07-11 08:26:13 -07:00
Rémi Gaillard
d0cf8fce18 // small fix 2013-07-11 17:04:29 +02:00
Rémi Gaillard
20b5449231 [*] Core: that is now easier to get links for another shop 2013-07-11 16:40:40 +02:00
Rémi Gaillard
17ee071bdf Merge pull request #540 from axometeam/patch-7
[*] BO : Correct the getList() request for quantity and id_product
2013-07-11 06:40:17 -07:00
Rémi Gaillard
004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Damien Metzger
d772d97bfa [-] BO : you can now have different mail topic for one mail template #PSCFV-9617 2013-07-11 14:27:40 +02:00
Francois Gaillard
d0e4e956c4 [-] Classes : Mail - check instance of link in the context 2013-07-11 14:01:24 +02:00
Damien Metzger
7cc5196fec [-] FO : fixed useless error when the product id in the URL is not an int #PSCFV-9726 2013-07-11 11:38:57 +02:00
Rémi Gaillard
c0cdd0a0e1 Merge pull request #547 from PiotrKaczor/patch-1
[*] MO : pscleaner reset employees notyfications
2013-07-11 00:46:30 -07:00
Rémi Gaillard
2578ffb6e1 Merge pull request #552 from codl/development
[-] WS: do not escape shop name overzealously
2013-07-11 00:44:52 -07:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
sLorenzini
f847c821ed // update tab modules bootsrap 2013-07-10 18:19:03 +02:00
gRoussac
105ae7e59f [*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko 2013-07-10 18:16:09 +02:00
gRoussac
9f2dad0c6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-10 17:44:48 +02:00
gRoussac
8b16bd44aa [*] FO : Fix bug #PSCFV-9440 add another address in guest checkout in OPC 2013-07-10 17:43:36 +02:00
Vincent Augagneur
53ec2aab7e //remove unused configuration 2013-07-10 17:33:02 +02:00
sLorenzini
8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers 2013-07-10 12:21:22 +02:00
Corentin Delcourt
02faf9d18e [-] WS: do not escape shop name overzealously 2013-07-10 10:21:33 +02:00
Kevin Granger
ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
gRoussac
e8b8fa0527 [-] CORE: No category in url preview on BO product page 2013-07-09 18:06:02 +02:00
Agence CINS
32a83e20c4 [+] BO: Fix Bug Progress Bar Upload Image Product
Lorsque l'on ajoute des images a des produits, la barre de progression
s'affiche en dehors de son cadre. "position:relative" n'est pas présent
pour "div.progressBarImage" dans le fichier admin.css .
----
When we add pictures to products, the progress bar is out of his
wrapper.
"position:relative" is missing for "div.progressBarImage" in admin.css
file.
2013-07-09 17:09:19 +02:00
gRoussac
5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on 2013-07-09 16:06:21 +02:00
gRoussac
4f5661572e [-] PDF : Fix columns error 2013-07-09 11:58:56 +02:00
Damien Metzger
bad15211a8 [-] BO : added checks on product attributes properties #PSCFV-9703 2013-07-09 11:30:59 +02:00
Rémi Gaillard
7b62144220 [-] Core: ObjectModel::toggleStatus should change only active field on multishop with global context #PSCFV-9707 2013-07-09 11:19:58 +02:00
Damien Metzger
bfa82c9648 [-] FO : you cannot access the front office with a disabled language anymore #PSCFV-9714 2013-07-09 10:59:25 +02:00
Damien Metzger
00425a4c1a [-] FO : fixed bad condition in the dispatcher rules 2013-07-09 10:52:50 +02:00
Damien Metzger
c0c6c10bba [-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709 2013-07-09 10:21:22 +02:00
Rémi Gaillard
18b247be94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-08 16:07:43 +02:00
Rémi Gaillard
f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders 2013-07-08 16:07:20 +02:00
Damien Metzger
1bdc07be20 [*] FO : removed code specific to multishipping from the no-multishipping process 2013-07-08 11:21:50 +02:00
Rémi Gaillard
4b88e8cc06 // John Doe is really a big scammer ! #PSCFV-9434 2013-07-08 11:17:12 +02:00
Gregory Roussac
1a6518689c Merge pull request #415 from ccauw/patch-11
[-] BO : Fix bug #PSCFV-8987 in BO translations when Windows OS
2013-07-08 01:34:48 -07:00
PrestaEdit
3166573aa9 [-] Class: PaymentModule / Be sure to have the right "TaxCalculationMethod" 2013-07-06 13:50:38 +02:00
Kevin Granger
1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
gRoussac
19c9ae0a5c [-] FO : Fix bug #PSCFV-9653 could not return a custom product 2013-07-05 18:15:27 +02:00
gRoussac
cf849077ed // small css fix on history 2013-07-05 17:43:10 +02:00
Fabio Chelly
391c7301da Merge remote-tracking branch 'origin/development' into development 2013-07-05 17:18:50 +02:00
Fabio Chelly
a70d3145cd [-] MO Blockwishlist : images are displayed in wishlist page loaded through a permalink. Add to cart is restored and quantity is correctly calculated for each product with or without combinations
#PNM-573
#PNM-663
#PNM-1268
#PNM-1302
#PNM-1303
#PNM-1313
#PNM-1512
#PNM-1541
2013-07-05 17:18:28 +02:00
gRoussac
9f0867b700 [-] FO : could not see old_price_display when specific price on one combination 2013-07-05 14:42:39 +02:00
Damien Metzger
62ff976d69 // Removed redundant function calls 2013-07-05 14:25:22 +02:00
gRoussac
91cd196cf6 // remove console.log sorry bad commit 2013-07-05 12:29:29 +02:00
gRoussac
128ceffcc0 [-] FO : Bad specific price for a combination // sorry 2013-07-05 12:28:10 +02:00
gRoussac
268f1fd030 [-] FO : Bad specific price for a combination 2013-07-05 12:11:02 +02:00
Fabio Chelly
2489778b3c [-] MO Blocknewsletter : deletes e-mail from newsletter table only if newsletter checkbox has been checked on subscription page
#PNM-1419
2013-07-05 11:53:04 +02:00
Piotr Kaczor
54b882e936 [*] MO : pscleaner reset employees notyfications
pscleaner afetr truncating orders, messages and customers reset also employees notyfications
2013-07-05 08:05:51 +02:00
gRoussac
8a7edf3668 [-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart 2013-07-04 17:42:35 +02:00
gRoussac
58091a3b0e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 17:25:41 +02:00
gRoussac
df7b5c9861 [-] FO : Fix bug #PSCFV-9669, update total price on order-payment 2013-07-04 17:25:00 +02:00
Rémi Gaillard
12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 2013-07-04 17:00:27 +02:00
gRoussac
c335115f68 // remove console.log 2013-07-04 16:48:56 +02:00
gRoussac
c360e841b3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 16:48:14 +02:00
gRoussac
0bddd17889 // remove console.log 2013-07-04 16:43:17 +02:00
gRoussac
fd14268da3 // remove .gitattributes 2013-07-04 15:23:39 +02:00
Damien Metzger
47d343df90 // Fixed module positions in tabs 2013-07-04 09:33:43 +02:00
Damien Metzger
ae03669541 // Added the possibility to sort the modules in the tabs 2013-07-03 17:50:24 +02:00
Damien Metzger
ec981b7f86 [*] WS : improved performances 2013-07-03 17:03:33 +02:00
Damien Metzger
d2440df8ca [*] FO : added smarty cache on productscategory 2013-07-03 15:49:32 +02:00
Damien Metzger
f78f3dc3a8 [*] FO : added smarty cache on crossselling module 2013-07-03 15:30:31 +02:00
gRoussac
36e3956267 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-03 15:06:05 +02:00
Damien Metzger
afda9cdd94 // Small fix 2013-07-03 15:05:22 +02:00
gRoussac
ae0299a6eb [-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart 2013-07-03 15:04:11 +02:00
Sébastien
16e90488c4 [-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed.
Fix Bug when favoriteproducts is not install.
2013-07-03 14:55:32 +02:00
indesign47
1208e45958 [-] BO : products comments impossible if quantity > 0
The pull request https://github.com/PrestaShop/PrestaShop/pull/219 makes the module not working properly in v1.5.4.1.
Indeed, after this change, the OosHook works as expected but now, as the product comments module is attached to the OosHook, comments information is only shown when the product is out of stock!
2013-07-03 14:09:44 +02:00
Francois Gaillard
8d3f330b2d [-] IN : Fixed bug with database creation 2013-07-03 12:19:34 +02:00
Damien Metzger
5789e6eb51 [*] IN : only display the button to create the database if you can actually create the database 2013-07-03 11:28:55 +02:00
Axome
fe660c097c [*] BO : Correct the getList() request for quantity and id_product
Quantity and Id_product should be fixe as Int, else the Mysql request do something like : quantity LIKE "%0%"

When an admin key-in quantity as 0, he want product with quantity as 0, not as 0 / 10 /20 / 30... ect (The same for id_product)
2013-07-03 11:18:04 +02:00
Damien Metzger
bfa2f33c65 [*] IN : the installer can now attempt to create the database for you 2013-07-03 11:04:34 +02:00
Kevin Granger
0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Damien Metzger
92959311d9 [*] Core : Smarty updated from 3.1.13 to 3.1.14 (cache issues fixed) 2013-07-02 18:45:07 +02:00
Damien Metzger
c60c3da6a1 [*] WS : improved web service performances 2013-07-02 17:46:11 +02:00
PrestaEdit
86bdcd99e9 [-] FO: OrderHistory - Unclosed tag 2013-07-02 17:08:49 +02:00
Rémi Gaillard
6b71ec8b09 [-] BO: product supplier price should not be converted on product page #PSCFV-9420 2013-07-02 15:45:12 +02:00
Damien Metzger
854c16997c [*] FO : improved entity links retrieval (no need to instanciate an object when there is no need... to instanciate un object) 2013-07-02 15:08:56 +02:00
gRoussac
84c88dab65 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-02 14:55:28 +02:00
Francois Gaillard
b8bfdcd3f5 // .gitattributes files added 2013-07-02 14:53:58 +02:00
gRoussac
75942074d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-02 14:53:18 +02:00
gRoussac
9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency 2013-07-02 14:51:25 +02:00
Damien Metzger
25dc4e25ac // Code cleaning 2013-07-02 11:48:48 +02:00
Damien Metzger
f204f80c99 // Improved profiling tool 2013-07-02 11:08:24 +02:00
Damien Metzger
d05968823e // Try to fix warning 2013-07-02 10:46:46 +02:00
Vincent Augagneur
cab425e819 //remove useless css 2013-07-02 08:41:51 +02:00
Vincent Augagneur
0ff23eee9f //miss to delete some files 2013-07-02 08:02:05 +02:00
Gregory Roussac
0d7af59657 Update .gitignore 2013-07-01 10:58:54 +02:00
Gregory Roussac
7c2323f1cc Update .gitignore 2013-07-01 10:56:31 +02:00
gRoussac
85da11181d //remove warning 2013-06-30 19:42:07 +02:00
PrestaEdit
679ee351df [-] BO: remove old icon into New Version block 2013-06-29 16:28:03 +02:00
Kevin Granger
d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
ldecoker
a617bec39b Update shopping-cart.tpl
To access template "shopping-cart-product-line.tpl", it should use the $tpl_dir variable.
2013-06-28 16:46:12 +02:00
ChristopheBoucaut
0de8c2dbc6 Update OrderDetailController.php
Fixed link between thread and an order's product
2013-06-27 15:49:40 +02:00
djfm
f2e08c9c94 Merge branch 'development' of https://github.com/djfm/PrestaShop into development 2013-06-25 08:41:35 +00:00
djfm
9b16761a68 [*] LO : corrected Israel standard tax rate 2013-06-25 08:37:54 +00:00
Axome
7f7cd3bdaa [*] BO : Correct Request Sql Manager validate options
Correct Request Sql Manager validate options :
- No size limit for the request
- cutJoin() doesn't work for multiple Join (exemple : LEFT JOIN `XXX ON XXX AND XXX) => Then you can't save the request, even if it work
2013-06-25 11:01:01 +03:00
Axome
f4fc1d3cab [*] BO : AdminControllers : Keep active filter on pagination 2013-06-24 10:57:05 +02:00
PrestaEdit
f4a5dd1409 [*] BO: more than one image in HelperForm 2013-06-21 23:02:51 +03:00
Kevin Granger
aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
fram
dc133e3e41 [*] LO : Fixed units in Belgium localization pack 2013-06-20 18:33:27 +02:00
Kevin Granger
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
jeckyl
783b02b34f Update admin.css
force size for module logo to keep a good design structure
2013-06-18 14:56:55 +02:00
Kevin Granger
3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
Kevin Granger
993690801e // Small changes with layout an css 2013-06-17 18:49:45 +02:00
Axome
6e383a2d38 Prevent false error for product duplication 2013-06-17 10:16:13 +02:00
Kevin Granger
6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Rémi Gaillard
7a65f478b6 // miss ; 2013-06-14 11:48:27 +02:00
romainberger
c94dbb36ce [*] MO: Referral program: display currency in account page next to the voucher value 2013-06-14 11:04:20 +02:00
Rémi Gaillard
7a91d4b4dd // small fix on toolbar 2013-06-13 19:23:58 +02:00
Kevin Granger
b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
Kevin Granger
86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Vincent Augagneur
518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +02:00
cam.lafit
663ec76bb9 Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
With HTTP_ACCEPT_LANGUAGE we have two choices :
* Country == language (displayed with two letter as fr,de,en,...)
* Country with multi language (displayes as fr-CH, de-CH, it-CH)

Previous regexp find only first case.
2013-06-10 11:00:49 +02:00
PhpMadman
77864b88ae [-] FO : In stock sort is now removed when Stock managment is disabled on default theme.
Not to be confused for my pull #465, which was for default mobile theme.
This is for the default regular theme.
2013-06-07 10:41:02 +02:00
Nicolas Sorosac
e65f68107f [-] MO : Followup : Don't send followup vouchers to guest accounts 2013-06-07 08:42:24 +02:00
Nicolas Sorosac
12ab790579 [-] MO : Followup : Don't execute crontasks if the module is disabled 2013-06-06 16:30:16 +02:00
PrestaEdit
66522c4a2c // Add translate() as deprecated 2013-06-03 22:46:52 +02:00
Maxence
371edf9edb Keep retro-compatibility 2013-06-03 13:28:51 +02:00
Maxence
879aa9f98a Use PrestaShop norme 2013-06-02 20:18:59 +02:00
Maxence
10e3fec8a2 Add page limit to Collection
I do not see any way to limit the number of object in a Collection. Collection::setPageSize() and Collection::setPageNumber() add a limit clause to the query.
2013-06-02 21:04:48 +03:00
PrestaEdit
6ae0dbb4ca [*] BO: use Translate::getAdminTranslation instead of translate() 2013-06-01 00:21:28 +02:00
PrestaEdit
58e5ea606c [~] Controller: AdminTranslationsController / Back translations
Files login.php and password.php are now redirect to an AdminController. No need to check it anymore.
2013-06-01 00:46:24 +03:00
PrestaEdit
f7f6175191 [*] BO: hook displayAdminForm / add param fieldset 2013-05-31 14:58:19 +02:00
PrestaEdit
b6fbbe6187 [*] FO: use Tools::fileAttachment() in ContactController 2013-04-30 20:46:34 +02:00
ccauw
051adc7b36 [-] BO : bug in BO translations when Windows OS
[-] BO : bug in BO translations when Windows OS

Impossible to translate the strings of the back office in the directory override/controllers/admin/...
under windows environment.

The statement " $parent_class = explode(DIRECTORY_SEPARATOR,..) " returns wrong result under windows environment. because the path name has '/' and '\' chars.

$parent_class contains bad values and the string "override" is not found.
2013-04-29 16:00:55 +03:00
ccauw
8331ab0c1a [-]BO : bug color parameter in List
[-]BO : bug color parameter in List

In field list, if there is another field with 'color' => 'color_field', (and color_field column in the select), the background color is always the value of field list column 'color', never 'color_field'

the lines:
			{block name="td_content"}
				...
				{if isset($params.color) && isset($tr[$params.color])}
					<span class="color_field" style="background-color:{$tr.color};...
				{/if}

must be:
			{block name="td_content"}
				...
				{if isset($params.color) && isset($tr[$params.color])}
					<span class="color_field" style="background-color:{$tr[$params.color])};...
				{/if}

In the fields list, for display list, there is :
'osname' => array(
	'title' => $this->l('Status'),
	'color' => 'color',
	...
),
'color parameter gives the name of column in _List to be used as color background.
Currently, it is the same 'color' parameter which is used for one field and the row: (ex:osname)
		<span class="color_field" style="background-color:{$tr.color};...

But if there is another field with 'color' => 'color_field', (and color_field in the select), the background color is always 'color', never 'color_field'
That can be fixed with :
		<span class="color_field" style="background-color:{$tr[$params.color])};...

So the background color of the row (if colorOnBackground = true) and one row's field will be the value of the column given by 'color'=>'color', and The background color of others fields will be the value of the column given by their parameter 'color'=>'<color_field>'

$this->_select = '..color ..., ... color_field2 ...';

$this->fields_list = array(
		'field1' => array(
			'title' => $this->l('Status'),
			'color' => 'color',			// will also be the bg color of the row
			...
		),
		'field2' => array(
			'title' => $this->l('Status'),
			'color' => 'color_field2',
			...
		),
		'field2' => array(
			'title' => $this->l('Status'),
			'color' => 'color_field3',
			...
		),
2013-04-28 16:01:55 +03:00
Otto Nascarella
a994c93dee Progressive JPEG
https://plus.google.com/+PaulIrish/posts/5KzxfS9nNEZ
2013-04-25 12:18:50 -03:00
ldecoker
34644ee6eb Update AdminAttributesGroupsController.php 2013-04-16 19:17:51 +03:00
ldecoker
624fed3710 Update form.tpl 2013-04-16 19:15:45 +03:00
Arnaud Lemercier
07979774f6 Delete products tags entries without delete tags for webservice usage 2013-04-02 18:44:12 +02:00
PrestaEdit
18edd9bf75 [*] Class: Tools::fileAttachment() 2013-03-29 10:40:07 +01:00
Arnaud Lemercier
5b058e6723 Allow webservice to set the tags list of product when creating or updating a product 2013-03-29 10:26:44 +01:00
Vincent Schoener
312e16a926 [-] CORE : Fix issue with delivery option
Happens after a payment redirection error, delivery_option is not sent
(but should be set in the cart context)
2013-03-28 12:45:03 +01:00
PrestaEdit
47d3085a4a [*]WS: POST and XML ressource 2013-03-18 01:03:43 +01:00
Samy Rabih
f9f673d78f Default adresse layout update
As many countries use mobile phones in an extensive way, it should be
useful to update the default address layout
2013-03-02 17:40:54 +01:00
PrestaEdit
d59ea3e6dd [*] BO: use lang for input file 2013-01-17 23:29:11 +01:00
bumbu
0036768ae5 ObjectModel::updateMultishopTable() where argument is not mandatory 2013-01-07 19:24:12 +02:00
4536 changed files with 200987 additions and 110350 deletions

31
.gitignore vendored
View File

@@ -5,6 +5,9 @@
.idea
.svn
.DS_Store
.sass-cache
*.sublime-project
*.sublime-workspace
robots.txt
sitemap.xml
cache/cachefs/*
@@ -41,6 +44,12 @@ themes/default/modules/*/*.php
!themes/default/modules/*/index.php
themes/default/lang/*.php
!themes/default/lang/index.php
themes/default-bootstrap/cache/*.js
themes/default-bootstrap/cache/*.css
themes/default-bootstrap/modules/*/*.php
!themes/default-bootstrap/modules/*/index.php
themes/default-bootstrap/lang/*.php
!themes/default-bootstrap/lang/index.php
modules/*/translations/*.php
!modules/*/translations/index.php
mails/*
@@ -104,4 +113,24 @@ modules/upscarrier
modules/uspscarrier
modules/wexpay
modules/yotpo
modules/zingaya
modules/zingaya
modules/bankwire
modules/blockwishlist
modules/carriercompare
modules/cashondelivery
modules/cheque
modules/dateofdelivery
modules/editorial
modules/favoriteproducts
modules/feeder
modules/followup
modules/gapi
modules/loyalty
modules/mailalerts
modules/newsletter
modules/productcomments
modules/pscleaner
modules/referralprogram
modules/sendtoafriend
modules/watermark
admin-dev/themes/default/bower_components

29
404.php
View File

@@ -1,29 +0,0 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
require_once(dirname(__FILE__).'/config/config.inc.php');
Tools::displayFileAsDeprecated();
Controller::getController('PageNotFoundController')->run();

View File

@@ -1,7 +1,7 @@
Contributing
------------
PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the development branch.
PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the 1.6 branch or to the 1.5 branch if you have a fix for the 1.5 versions.
If you need some help to make a [pull-request][1]
All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request.
All core files you commit in your pull request must have Open Software License (OSL 3.0)

View File

@@ -1,80 +1,186 @@
- (d)oekia
- adonis karavokyros
- aFolletete
- Agence CINS
- aKorczak
- Aleksander Palyan
- Alexander Otchenashev
- anat
- Andrew
- aNiassy
- antoniofr
- AntonLejon
- Arnaud Lemercier
- Axome
- Benjamin PONGY
- BigZ
- bLeveque
- bMancone
- bumbu
- Burhan
- Caleydon Media
- cam.lafit
- Captain FLAM
- Captain-FLAM
- ccauw
- cedricfontaine
- Cédric Mouleyre
- Chris
- ChristopheBoucaut
- CINS
- cippest
- cmouleyre
- Corentin Delcourt
- Cosmin Hutanu
- Damien Metzger
- DamienMetzger
- Damon Skelhorn
- Daniel
- Daniele Giachino
- David Gasperoni
- DrySs
- DrÿSs'
- François Gaillard
- Gabriel Schwardy
- Gregory Roussac
- Ha!*!*y
- Jonathan Danse
- Krystian Podemski
- Marco Cervellin
- Michel Courtade
- Milow
- Patanock
- Pierre
- PrestaEdit
- Raphaël Malié
- Rémi Gaillard
- Samy Rabih
- Sarah Lorenzini
- Shagshag
- Vincent Augagneur
- Xavier POITAU
- aFolletete
- aKorczak
- aNiassy
- adonis karavokyros
- anat
- bLeveque
- bMancone
- bumbu
- cmouleyre
- dMetzger
- dSevere
- Davy Rolink
- Dinis Lage
- djfm
- dlage
- dMetzger
- (d)oekia
- Dragan Skrbic
- dreammeup
- DrySs
- DrÿSs
- DrÿSs'
- dSevere
- Edouard Gaulué
- emily-d
- Eric Le Lay
- Fabio Chelly
- fBrignoli
- fSerny
- fchellypresta
- fram
- Francois Gaillard
- François Gaillard
- Fran<61>ois Gaillard
- fSerny
- Gabriel Schwardy
- Gaelle ITZKOVITZ
- gBrunier
- gCharmes
- gPoulain
- gr4devel
- Grégoire Bélorgey
- Gregory Roussac
- gRoussac
- Guillaume DELOINCE
- ha99y
- hAitmansour
- Ha!*!*y
- indesign47
- inem0o
- ivancasasempere
- Jáchym Toušek
- Javsmile
- jBreux
- jObregon
- jeckyl
- jeromenadaud
- Jerome Nadaud
- Jérôme Nadaud
- jessylenne
- jmCollin
- jObregon
- Jonathan Danse
- joseantgv
- Julien
- Kevin Granger
- kiropowered
- kpodemski
- Krystian Podemski
- lBrieu
- lCherifi
- ldecoker
- lLefevre
- LOIC ROSSET ltd
- Madef
- Mainmich
- makk1ntosh
- marcinsz101
- Marco Cervellin
- matiasiglesias
- Mats Rynge
- MatthieuB
- Maxence
- mBertholino
- mDeflotte
- Michel Courtade
- Mickael Desgranges
- Mikael Blotin
- Milow
- minic studio
- misthero
- mMarinetti
- marcinsz101
- montes
- nPellicari
- MustangZhong
- nezenmoins
- Nicolas Sorosac
- Nils-Helge Garli Hegvik
- Nino Uzelac
- nPellicari
- nturato
- oleacorner
- Otto Nascarella
- Patanock
- PhpMadman
- Pierre
- Piotr Kaczor
- Piotr Moćko
- PrestaEdit
- PrestaLab
- PrestanceDesign
- prestarocket
- Prestaspirit
- pxls
- Raphaël Malié
- raulgundin
- Rémi Gaillard
- rGaillard
- Rimas Kudelis
- rMalie
- rMontagne
- romainberger
- root
- runningz
- sagaradonis
- Samy Rabih
- Sarah Lorenzini
- Seb
- Sébastien
- Sébastien Bocahu
- Seynaeve
- Shagshag
- sjousse
- sLorenzini
- smartdatasoft
- soufyan
- soware
- Staging
- sThiebaut
- Sylvain Gougouzian
- Sylvain WITMEYER
- tDidierjean
- thoma202
- Tomasz Slominski
- Tom Panier
- tucoinfo
- unknown
- vAugagneur
- vChabot
- Vincent Augagneur
- Vincent Schoener
- Vincent Terenti
- vinvin27
- vKham
- vSchoener
- Xavier
- Xavier POITAU
- Yoozio
- zimmi1
- Zollner Robert

View File

@@ -1,48 +1,60 @@
README
======
![PrestaShop](http://www.prestashop.com/images/banners/general/prestashop_728x90.png "PrestaShop")
![PrestaShop](http://www.prestashop.com/images/banners/general/banner-github_728x90.png "PrestaShop")
PREPARATION
ABOUT PRESTASHOP
--------
To install PrestaShop, you need a remote web server or on your computer (MAMP), with access to a database like MySQL.
You'll need access to phpMyAdmin to create a database and to indicate the information in the database in the installer.
PrestaShop is a free and open-source e-commerce web application, committed to providing the best shopping cart experience for both merchants and consumers.
ABOUT THIS REPOSITORY
--------
This repository contains two branches of PrestaShop: version 1.5 and version 1.6. The default one is the 1.6 branch, which means that clicking the "Download ZIP" button from the root of this repository will download the current state of PrestaShop 1.6 -- a branch that is currently under development, and thus unstable. You can learn more about the upcoming features of version 1.6 by going to [the progress page][6].
If you want to download the latest stable version of PrestaShop from Github, you need to switch to the 1.5 branch of this repository: click on the "Branch" selector and choose the "1.5" branch (or directly go [this URL][7]), and then click on the "Download ZIP" button, which will download the latest version of the 1.5 branch.
Note that you can also simply download the latest 1.5 version from [the download page][8] on the official PrestaShop site.
SERVER CONFIGURATION
--------
To install PrestaShop, you need a web server running PHP5 and any flavor of MySQL5 (MySQL, MariaDB, Percona Server, etc.).
You will also need a database administration tool, such as phpMyAdmin, in order to create a database for PrestaShop.
We recommend the Apache or Nginx web servers.
If your host does not offer PHP5 by default, [here are a few explanations][2] about PHP5 or the .htaccess file for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc.).
If you want your online store ready to go, visit [http://www.prestabox.com][1]: it lets you create your online store in less than 10 minutes without any technical knowledge.
If you do not host and unable to create your store, we offer a turnkey store, which lets you create your online store in less than 10 minutes without any technical knowledge.
We invite you to visit: [http://www.prestabox.com][1]
INSTALLATION
--------
Simply go to your PrestaShop web directory and use installer :-)
With your web browser, go to the root of your PrestaShop directory, and the installer will start. Follow the instructions until PrestaShop is installed.
If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host.
Please go to our forum to find pre-installation settings (PHP 5, htaccess) for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
If you get any PHP error, it might be that you don't have PHP5 or you need to activate it on your web host. See the page linked above.
If you don't find any solution to start the installer, please post on [the PrestaShop forums][3].
English webhost [specifics settings][2]
If you don't find any solution to launch installer, please post on [our forum][3]
There are always solutions for your issues ;-)
DOCUMENTATION
--------
For any extra documentation (how-to), please read our [Online documentation][4]
The official PrestaShop documentation is available online [on its own website][4].
FORUMS
--------
You can also discuss, help and contribute with PrestaShop community on [our forums][5]
You can discuss, help and contribute with PrestaShop community on [the PrestaShop forums][5].
Thanks for downloading and using PrestaShop e-commerce Open-source solution!
Thank you for downloading and using PrestaShop e-commerce Open-source solution!
[1]: http://www.prestabox.com
[2]: http://www.prestashop.com/forums/topic/2946-pre-installation-settings-php-5-htaccess-for-certain-hosting-services/
[3]: http://www.prestashop.com/forums/forum/7-installing-prestashop/
[4]: http://doc.prestashop.com
[5]: http://www.prestashop.com/forums/
[5]: http://www.prestashop.com/forums/
[6]: http://www.prestashop.com/fr/progression-1-6
[7]: https://github.com/PrestaShop/PrestaShop/tree/1.5
[8]: http://www.prestashop.com/en/download

View File

@@ -1,37 +0,0 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
/**
* This file will be removed in 1.6
* You have to use index.php?controller=page_name instead of this page
*
* @deprecated 1.5.0
*/
require(dirname(__FILE__).'/config/config.inc.php');
Tools::displayFileAsDeprecated();
Tools::redirect('index.php?controller=address'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

View File

@@ -1,37 +0,0 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
/**
* This file will be removed in 1.6
* You have to use index.php?controller=page_name instead of this page
*
* @deprecated 1.5.0
*/
require(dirname(__FILE__).'/config/config.inc.php');
Tools::displayFileAsDeprecated();
Tools::redirect('index.php?controller=addresses'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

View File

@@ -26,45 +26,12 @@
define('_PS_ADMIN_DIR_', getcwd());
include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
/* Getting cookie or logout */
require_once(_PS_ADMIN_DIR_.'/init.php');
$context = Context::getContext();
if (Tools::isSubmit('changeParentUrl'))
echo '<script type="text/javascript">parent.parent.document.location.href = "'.addslashes(urldecode(Tools::getValue('changeParentUrl'))).'";</script>';
if (Tools::isSubmit('installBoughtModule'))
{
$file = false;
while ($file === false OR file_exists(_PS_MODULE_DIR_.$file))
$file = uniqid();
$file = _PS_MODULE_DIR_.$file.'.zip';
$sourceFile = 'http://addons.prestashop.com/iframe/getboughtfile.php?id_order_detail='.Tools::getValue('id_order_detail').'&token='.Tools::getValue('token');
if (!copy($sourceFile, $file))
{
if (!($content = file_get_contents($sourceFile)))
die(displayJavascriptAlert('Access denied: Please download your module directly from PrestaShop Addons website'));
elseif (!file_put_contents($file, $content))
die(displayJavascriptAlert('Local error: your module directory is not writable'));
}
$first6 = fread($fd = fopen($file, 'r'), 6);
if (!strncmp($first6, 'Error:', 6))
{
$displayJavascriptAlert = displayJavascriptAlert(fread($fd, 1024));
fclose($fd);
unlink($file);
die($displayJavascriptAlert);
}
fclose($fd);
if (!Tools::ZipExtract($file, _PS_MODULE_DIR_))
{
unlink($file);
die(displayJavascriptAlert('Cannot unzip file'));
}
unlink($file);
die(displayJavascriptAlert('Module copied to disk'));
}
if (Tools::isSubmit('ajaxReferrers'))
{
require(_PS_CONTROLLER_DIR_.'admin/AdminReferrersController.php');
@@ -101,39 +68,6 @@ if (Tools::isSubmit('ajaxProductPackItems'))
die('['.implode(',', $jsonArray).']');
}
if (Tools::isSubmit('ajaxStates') AND Tools::isSubmit('id_country'))
{
$states = Db::getInstance()->executeS('
SELECT s.id_state, s.name
FROM '._DB_PREFIX_.'state s
LEFT JOIN '._DB_PREFIX_.'country c ON (s.`id_country` = c.`id_country`)
WHERE s.id_country = '.(int)(Tools::getValue('id_country')).' AND s.active = 1 AND c.`contains_states` = 1
ORDER BY s.`name` ASC');
if (is_array($states) AND !empty($states))
{
$list = '';
if (Tools::getValue('no_empty') != true)
{
$empty_value = (Tools::isSubmit('empty_value')) ? Tools::getValue('empty_value') : '----------';
$list = '<option value="0">'.Tools::htmlentitiesUTF8($empty_value).'</option>'."\n";
}
foreach ($states AS $state)
$list .= '<option value="'.(int)($state['id_state']).'"'.((isset($_GET['id_state']) AND $_GET['id_state'] == $state['id_state']) ? ' selected="selected"' : '').'>'.$state['name'].'</option>'."\n";
}
else
$list = 'false';
die($list);
}
if (Tools::getValue('form_language_id'))
{
if (!($context->cookie->employee_form_lang = (int)(Tools::getValue('form_language_id'))))
die ('Error while updating cookie.');
die ('Form language updated.');
}
if (Tools::isSubmit('submitTrackClickOnHelp'))
{
@@ -144,15 +78,6 @@ if (Tools::isSubmit('submitTrackClickOnHelp'))
HelpAccess::trackClick($label, $version);
}
if (Tools::isSubmit('toggleScreencast'))
{
if (Validate::isLoadedObject($context->employee))
{
$context->employee->bo_show_screencast = !$context->employee->bo_show_screencast;
$context->employee->update();
}
}
if (Tools::isSubmit('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
{
$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
@@ -200,17 +125,6 @@ if (Tools::isSubmit('getParentCategoriesId') && $id_category = Tools::getValue('
die(Tools::jsonEncode($output));
}
/* Update attribute */
if (Tools::isSubmit('ajaxUpdateTaxRule'))
{
$id_tax_rule = Tools::getValue('id_tax_rule');
$tax_rules = new TaxRule((int)$id_tax_rule);
$output = array();
foreach ($tax_rules as $key => $result)
$output[$key] = $result;
die(Tools::jsonEncode($output));
}
if (Tools::isSubmit('getZones'))
{
$zones = Zone::getZones();
@@ -223,8 +137,3 @@ if (Tools::isSubmit('getZones'))
$array = array('hasError' => false, 'errors' => '', 'data' => $html);
die(Tools::jsonEncode($html));
}
function displayJavascriptAlert($s)
{
echo '<script type="text/javascript">alert(\''.addslashes($s).'\');</script>';
}

View File

@@ -22,26 +22,18 @@
$upload->setInvalidFileExt(explode(",", CONFIG_UPLOAD_INVALID_EXTS));
if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_UPLOAD)
{
$error = SYS_DISABLED;
}
elseif(empty($_GET['folder']) || !isUnderRoot($_GET['folder']))
{
$error = ERR_FOLDER_PATH_NOT_ALLOWED;
}else if(!$upload->isFileUploaded('file'))
{
elseif (!$upload->isFileUploaded('file'))
$error = ERR_FILE_NOT_UPLOADED;
}else if(!$upload->moveUploadedFile($_GET['folder']))
{
$error = ERR_FILE_MOVE_FAILED;
}
elseif(!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
{
elseif (!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
$error = ERR_FILE_TYPE_NOT_ALLOWED;
}elseif(defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))
{
elseif (defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))
$error = sprintf(ERROR_FILE_TOO_BID, transformFileSize(CONFIG_UPLOAD_MAXSIZE));
}else
elseif (!$upload->moveUploadedFile($_GET['folder']))
$error = ERR_FILE_MOVE_FAILED;
else
{
include_once(CLASS_FILE);
$path = $upload->getFilePath();

View File

@@ -24,7 +24,8 @@
if(!empty($_GET['search']))
{
include_once(CLASS_SEARCH);
if (!preg_match('/^'.Tools::pRegexp(realpath(dirname(__FILE__).'/'.$_GET['search_folder']), '/').'/i', _PS_ROOT_DIR_.'/img/cms'))
exit;
$search = new Search($_GET['search_folder']);
$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);

View File

@@ -32,7 +32,6 @@ if(!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] === false) {
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link type="text/css" href="theme/<?php echo CONFIG_THEME_NAME; ?>/css/login.css" rel="stylesheet" />
<title><?php echo LOGIN_PAGE_TITLE; ?></title>
</head>
<body>

View File

@@ -602,7 +602,8 @@
ob_start();
phpinfo();
$buffer = ob_get_contents();
ob_end_clean();
if (ob_get_level() && ob_get_length() > 0)
ob_end_clean();
foreach (explode("\n", $buffer) as $line) {
$line = array_map('trim', (explode('|', strip_tags(str_replace('</td>', '|', $line)))));
if (isset($gd[$line[0]])) {

View File

@@ -78,9 +78,9 @@
define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png');// //
define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png');// //
//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,png');
define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,jpeg,jpeg,png');
//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); //
define('CONFIG_UPLOAD_INVALID_EXTS', '');

View File

@@ -10,6 +10,9 @@
//FILESYSTEM CONFIG <br>
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.auth.php");
if (_PS_MODE_DEMO_)
die('This functionality has been disabled.');
define('CONFIG_QUERY_STRING_ENABLE', true); //Enable passed query string to setting the system configuration
if(!isset($_SESSION))
{

View File

@@ -73,9 +73,9 @@
define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); //
define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,txt'); //
//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); //
define('CONFIG_UPLOAD_INVALID_EXTS', '');

View File

@@ -64,7 +64,8 @@ if ($fp === false)
header('Content-Type: '.$contentType);
header('Content-Disposition: attachment; filename="'.Tools::getValue('filename'). '"');
ob_clean();
if (ob_get_level() && ob_get_length() > 0)
ob_clean();
$ret = @fpassthru($fp);
fclose($fp);

View File

@@ -37,7 +37,6 @@ $height = Tools::getValue('height');
$id_employee = Tools::getValue('id_employee');
$id_lang = Tools::getValue('id_lang');
if (!isset($cookie->id_employee) || !$cookie->id_employee || $cookie->id_employee != $id_employee)
die(Tools::displayError());
@@ -47,6 +46,51 @@ if (!Validate::isModuleName($module))
if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
die(Tools::displayError());
$shop_id = '';
Shop::setContext(Shop::CONTEXT_ALL);
if (Context::getContext()->cookie->shopContext)
{
$split = explode('-', Context::getContext()->cookie->shopContext);
if (count($split) == 2)
{
if ($split[0] == 'g')
{
if (Context::getContext()->employee->hasAuthOnShopGroup($split[1]))
Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
else
{
$shop_id = Context::getContext()->employee->getDefaultShopID();
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
}
else if (Shop::getShop($split[1]) && Context::getContext()->employee->hasAuthOnShop($split[1]))
{
$shop_id = $split[1];
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
else
{
$shop_id = Context::getContext()->employee->getDefaultShopID();
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
}
}
// Check multishop context and set right context if need
if (Shop::getContext())
{
if (Shop::getContext() == Shop::CONTEXT_SHOP && !Shop::CONTEXT_SHOP)
Shop::setContext(Shop::CONTEXT_GROUP, Shop::getContextShopGroupID());
if (Shop::getContext() == Shop::CONTEXT_GROUP && !Shop::CONTEXT_GROUP)
Shop::setContext(Shop::CONTEXT_ALL);
}
// Replace existing shop if necessary
if (!$shop_id)
Context::getContext()->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
elseif (Context::getContext()->shop->id != $shop_id)
Context::getContext()->shop = new Shop($shop_id);
require_once($module_path);
$graph = new $module();
@@ -57,4 +101,3 @@ if ($option)
$graph->create($render, $type, $width, $height, $layers);
$graph->draw();

View File

@@ -30,14 +30,14 @@ echo ' </div>
<div id="footer">
<div style="float:left;margin-left:10px;padding-top:6px">
<a href="http://www.prestashop.com/" target="_blank" style="font-weight:700;color:#666666">PrestaShop&trade; '._PS_VERSION_.'</a><br />
<span style="font-size:10px">'.translate('Load time:').' '.number_format(microtime(true) - $timerStart, 3, '.', '').'s</span>
<span style="font-size:10px">'.Translate::getAdminTranslation('Load time:').' '.number_format(microtime(true) - $timerStart, 3, '.', '').'s</span>
</div>
<div style="float:right;height:40px;margin-right:10px;line-height:38px;vertical-align:middle">';
if (strtoupper(Context::getContext()->language->iso_code) == 'FR') echo '<span style="color: #812143; font-weight: bold;">Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h ';
echo ' | <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.translate('Contact').'</a>
| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.translate('Bug Tracker').'</a>
| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.translate('Forum').'</a>
echo ' | <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Contact').'</a>
| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Bug Tracker').'</a>
| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Forum').'</a>
</div>
</div>
</div>

View File

@@ -78,20 +78,20 @@ function includeDatepicker($id, $time = false)
* @param string $theme Theme name (eg. default)
* @param array $arrayDB Parameters in order to connect to database
*/
function rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
function rewriteSettingsFile($baseUrls = null, $theme = null, $arrayDB = null)
{
$defines = array();
$defines['_MEDIA_SERVER_1_'] = ($baseUrls AND isset($baseUrls['_MEDIA_SERVER_1_'])) ? $baseUrls['_MEDIA_SERVER_1_'] : _MEDIA_SERVER_1_;
$defines['_MEDIA_SERVER_2_'] = ($baseUrls AND isset($baseUrls['_MEDIA_SERVER_2_'])) ? $baseUrls['_MEDIA_SERVER_2_'] : _MEDIA_SERVER_2_;
$defines['_MEDIA_SERVER_3_'] = ($baseUrls AND isset($baseUrls['_MEDIA_SERVER_3_'])) ? $baseUrls['_MEDIA_SERVER_3_'] : _MEDIA_SERVER_3_;
$defines['_MEDIA_SERVER_1_'] = ($baseUrls && isset($baseUrls['_MEDIA_SERVER_1_'])) ? $baseUrls['_MEDIA_SERVER_1_'] : _MEDIA_SERVER_1_;
$defines['_MEDIA_SERVER_2_'] = ($baseUrls && isset($baseUrls['_MEDIA_SERVER_2_'])) ? $baseUrls['_MEDIA_SERVER_2_'] : _MEDIA_SERVER_2_;
$defines['_MEDIA_SERVER_3_'] = ($baseUrls && isset($baseUrls['_MEDIA_SERVER_3_'])) ? $baseUrls['_MEDIA_SERVER_3_'] : _MEDIA_SERVER_3_;
$defines['_PS_CACHING_SYSTEM_'] = _PS_CACHING_SYSTEM_;
$defines['_PS_CACHE_ENABLED_'] = _PS_CACHE_ENABLED_;
$defines['_DB_NAME_'] = (($arrayDB AND isset($arrayDB['_DB_NAME_'])) ? $arrayDB['_DB_NAME_'] : _DB_NAME_);
$defines['_MYSQL_ENGINE_'] = (($arrayDB AND isset($arrayDB['_MYSQL_ENGINE_'])) ? $arrayDB['_MYSQL_ENGINE_'] : _MYSQL_ENGINE_);
$defines['_DB_SERVER_'] = (($arrayDB AND isset($arrayDB['_DB_SERVER_'])) ? $arrayDB['_DB_SERVER_'] : _DB_SERVER_);
$defines['_DB_USER_'] = (($arrayDB AND isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_);
$defines['_DB_PREFIX_'] = (($arrayDB AND isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_);
$defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
$defines['_DB_NAME_'] = (($arrayDB && isset($arrayDB['_DB_NAME_'])) ? $arrayDB['_DB_NAME_'] : _DB_NAME_);
$defines['_MYSQL_ENGINE_'] = (($arrayDB && isset($arrayDB['_MYSQL_ENGINE_'])) ? $arrayDB['_MYSQL_ENGINE_'] : _MYSQL_ENGINE_);
$defines['_DB_SERVER_'] = (($arrayDB && isset($arrayDB['_DB_SERVER_'])) ? $arrayDB['_DB_SERVER_'] : _DB_SERVER_);
$defines['_DB_USER_'] = (($arrayDB && isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_);
$defines['_DB_PREFIX_'] = (($arrayDB && isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_);
$defines['_DB_PASSWD_'] = (($arrayDB && isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
$defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_);
$defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_);
$defines['_PS_CREATION_DATE_'] = addslashes(_PS_CREATION_DATE_);
@@ -121,7 +121,7 @@ function rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
* @param boolean $withTime Display both date and time
* @todo Several formats (french : DD-MM-YYYY)
*/
function displayDate($sqlDate, $withTime = false)
function displayDate($sqlDate, $withTime = false)
{
return strftime('%Y-%m-%d'.($withTime ? ' %H:%M:%S' : ''), strtotime($sqlDate));
}
@@ -164,12 +164,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
foreach ($categories AS $category)
{
$link = Context::getContext()->link->getAdminLink('AdminCategories');
$edit = '<a href="'.$link.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1 || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
$edit = '<a href="'.$link.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'" title="'.($category['id_category'] == Category::getRootCategory()->id_category ? 'Home' : 'Modify').'"><i class="icon-'.(($category['id_category'] == Category::getRootCategory()->id_category || $home) ? 'home' : 'pencil').'"></i></a> ';
$fullPath .= $edit.
($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
(!empty($highlight) ? str_ireplace($highlight, '<span class="highlight">'.htmlentities($highlight, ENT_NOQUOTES, 'UTF-8').'</span>', $category['name']) : $category['name']).
($n < $nCategories ? '</a>' : '').
(($n++ != $nCategories OR !empty($path)) ? ' > ' : '');
(($n++ != $nCategories || !empty($path)) ? ' > ' : '');
}
return $fullPath.$path;
@@ -181,14 +181,14 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
if (!$category->id)
return $path;
$name = ($highlight != NULL) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name);
$name = ($highlight != null) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name);
$edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&addcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
<img src="../img/admin/edit.gif" alt="Modify" /></a> ';
<i class="icon-pencil"></i></a> ';
if ($category->id == 1)
$edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
<img src="../img/admin/home.gif" alt="Home" /></a> ';
$path = $edit.'<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
'.$name.'</a> > '.$path;
$edit = '<li><a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
<i class="icon-home"></i></a></li> ';
$path = $edit.'<li><a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
'.$name.'</a></li> > '.$path;
if ($category->id == 1)
return substr($path, 0, strlen($path) - 3);
return getPath($urlBase, $category->id_parent, $path, '', 'cms');
@@ -223,8 +223,16 @@ function checkPSVersion()
return $upgrader->checkPSVersion();
}
/**
* Deprecated since > 1.5.4.1
* Use Translate::getAdminTranslation($string) instead
*
* @param string $string
*/
function translate($string)
{
Tools::displayAsDeprecated();
global $_LANGADM;
if (!is_array($_LANGADM))
return str_replace('"', '&quot;', $string);
@@ -233,7 +241,6 @@ function translate($string)
return str_replace('"', '&quot;', stripslashes($str));
}
/**
* Returns a new Tab object
*
@@ -257,13 +264,13 @@ function checkingTab($tab)
}
// Class file is included in Dispatcher::dispatch() function
if (!class_exists($tab, false) OR !$row['id_tab'])
if (!class_exists($tab, false) || !$row['id_tab'])
{
echo sprintf(Tools::displayError('The class %s cannot be found.'),$tab);
return false;
}
$adminObj = new $tab;
if (!$adminObj->viewAccess() AND ($adminObj->table != 'employee' OR Context::getContext()->employee->id != Tools::getValue('id_employee') OR !Tools::isSubmit('updateemployee')))
if (!$adminObj->viewAccess() && ($adminObj->table != 'employee' || Context::getContext()->employee->id != Tools::getValue('id_employee') || !Tools::isSubmit('updateemployee')))
{
$adminObj->_errors = array(Tools::displayError('Access denied.'));
echo $adminObj->displayErrors();
@@ -277,9 +284,9 @@ function checkingTab($tab)
*/
function checkTabRights($id_tab)
{
static $tabAccesses = NULL;
static $tabAccesses = null;
if ($tabAccesses === NULL)
if ($tabAccesses === null)
$tabAccesses = Profile::getProfileAccesses(Context::getContext()->employee->id_profile);
if (isset($tabAccesses[(int)($id_tab)]['view']))
@@ -402,10 +409,10 @@ function runAdminTab($tab, $ajaxMode = false)
require_once(_PS_ADMIN_DIR_.'/init.php');
$cookie = Context::getContext()->cookie;
if (empty($tab) and !sizeof($_POST))
if (empty($tab) && !sizeof($_POST))
{
$tab = 'AdminHome';
$_POST['tab'] = 'AdminHome';
$tab = 'AdminDashboard';
$_POST['tab'] = $tab;
$_POST['token'] = Tools::getAdminTokenLite($tab);
}
// $tab = $_REQUEST['tab'];
@@ -461,7 +468,7 @@ function runAdminTab($tab, $ajaxMode = false)
echo '<div class="path_bar">
<div id="help-button" class="floatr" style="display: none; font-family: Verdana; font-size: 10px; margin-right: 4px; margin-top: 4px;">
</div>
<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.Translate::getAdminTranslation('Back Office').'</a>
'.$bread.'</div>';
if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
@@ -470,10 +477,10 @@ function runAdminTab($tab, $ajaxMode = false)
if (Shop::getContext() == Shop::CONTEXT_GROUP)
{
$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
printf(translate('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
printf(Translate::getAdminTranslation('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
}
elseif (Shop::getContext() == Shop::CONTEXT_SHOP)
printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
printf(Translate::getAdminTranslation('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
echo '</div>';
}
if (Validate::isLoadedObject($adminObj))
@@ -487,14 +494,14 @@ function runAdminTab($tab, $ajaxMode = false)
$action = Tools::getValue('action');
// no need to use displayConf() here
if (!empty($action) AND method_exists($adminObj, 'ajaxProcess'.Tools::toCamelCase($action)) )
if (!empty($action) && method_exists($adminObj, 'ajaxProcess'.Tools::toCamelCase($action)) )
$adminObj->{'ajaxProcess'.Tools::toCamelCase($action)}();
else
$adminObj->ajaxProcess();
// @TODO We should use a displayAjaxError
$adminObj->displayErrors();
if (!empty($action) AND method_exists($adminObj, 'displayAjax'.Tools::toCamelCase($action)) )
if (!empty($action) && method_exists($adminObj, 'displayAjax'.Tools::toCamelCase($action)) )
$adminObj->{'displayAjax'.$action}();
else
$adminObj->displayAjax();
@@ -504,26 +511,26 @@ function runAdminTab($tab, $ajaxMode = false)
else
{
/* Filter memorization */
if (isset($_POST) AND !empty($_POST) AND isset($adminObj->table))
if (isset($_POST) && !empty($_POST) && isset($adminObj->table))
foreach ($_POST AS $key => $value)
if (is_array($adminObj->table))
{
foreach ($adminObj->table AS $table)
if (strncmp($key, $table.'Filter_', 7) === 0 OR strncmp($key, 'submitFilter', 12) === 0)
if (strncmp($key, $table.'Filter_', 7) === 0 || strncmp($key, 'submitFilter', 12) === 0)
$cookie->$key = !is_array($value) ? $value : serialize($value);
}
elseif (strncmp($key, $adminObj->table.'Filter_', 7) === 0 OR strncmp($key, 'submitFilter', 12) === 0)
elseif (strncmp($key, $adminObj->table.'Filter_', 7) === 0 || strncmp($key, 'submitFilter', 12) === 0)
$cookie->$key = !is_array($value) ? $value : serialize($value);
if (isset($_GET) AND !empty($_GET) AND isset($adminObj->table))
if (isset($_GET) && !empty($_GET) && isset($adminObj->table))
foreach ($_GET AS $key => $value)
if (is_array($adminObj->table))
{
foreach ($adminObj->table AS $table)
if (strncmp($key, $table.'OrderBy', 7) === 0 OR strncmp($key, $table.'Orderway', 8) === 0)
if (strncmp($key, $table.'OrderBy', 7) === 0 || strncmp($key, $table.'Orderway', 8) === 0)
$cookie->$key = $value;
}
elseif (strncmp($key, $adminObj->table.'OrderBy', 7) === 0 OR strncmp($key, $adminObj->table.'Orderway', 12) === 0)
elseif (strncmp($key, $adminObj->table.'OrderBy', 7) === 0 || strncmp($key, $adminObj->table.'Orderway', 12) === 0)
$cookie->$key = $value;
$adminObj->displayConf();
$adminObj->postProcess();
@@ -537,39 +544,41 @@ function runAdminTab($tab, $ajaxMode = false)
if($ajaxMode)
{
// If this is an XSS attempt, then we should only display a simple, secure page
ob_clean();
if (ob_get_level() && ob_get_length() > 0)
ob_clean();
// ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17)
$url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$adminObj->token.'$2', $_SERVER['REQUEST_URI']);
if (false === strpos($url, '?token=') AND false === strpos($url, '&token='))
if (false === strpos($url, '?token=') && false === strpos($url, '&token='))
$url .= '&token='.$adminObj->token;
// we can display the correct url
// die(Tools::jsonEncode(array(translate('Invalid security token'),$url)));
die(Tools::jsonEncode(translate('Invalid security token')));
// die(Tools::jsonEncode(array(Translate::getAdminTranslation('Invalid security token'),$url)));
die(Tools::jsonEncode(Translate::getAdminTranslation('Invalid security token')));
}
else
{
// If this is an XSS attempt, then we should only display a simple, secure page
ob_clean();
if (ob_get_level() && ob_get_length() > 0)
ob_clean();
// ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17)
$url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$adminObj->token.'$2', $_SERVER['REQUEST_URI']);
if (false === strpos($url, '?token=') AND false === strpos($url, '&token='))
if (false === strpos($url, '?token=') && false === strpos($url, '&token='))
$url .= '&token='.$adminObj->token;
$message = translate('Invalid security token');
$message = Translate::getAdminTranslation('Invalid security token');
echo '<html><head><title>'.$message.'</title></head><body style="font-family:Arial,Verdana,Helvetica,sans-serif;background-color:#EC8686">
<div style="background-color:#FAE2E3;border:1px solid #000000;color:#383838;font-weight:700;line-height:20px;margin:0 0 10px;padding:10px 15px;width:500px">
<img src="../img/admin/error2.png" style="margin:-4px 5px 0 0;vertical-align:middle">
'.$message.'
</div>';
echo '<a href="'.htmlentities($url).'" method="get" style="float:left;margin:10px">
<input type="button" value="'.Tools::htmlentitiesUTF8(translate('I understand the risks and I really want to display this page')).'" style="height:30px;margin-top:5px" />
<input type="button" value="'.Tools::htmlentitiesUTF8(Translate::getAdminTranslation('I understand the risks and I really want to display this page')).'" style="height:30px;margin-top:5px" />
</a>
<a href="index.php" method="get" style="float:left;margin:10px">
<input type="button" value="'.Tools::htmlentitiesUTF8(translate('Take me out of here!')).'" style="height:40px" />
<input type="button" value="'.Tools::htmlentitiesUTF8(Translate::getAdminTranslation('Take me out of here!')).'" style="height:40px" />
</a>
</body></html>';
die;

View File

@@ -50,6 +50,53 @@ if (!Validate::isModuleName($module))
if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
die(Tools::displayError());
$shop_id = '';
Shop::setContext(Shop::CONTEXT_ALL);
if (Context::getContext()->cookie->shopContext)
{
$split = explode('-', Context::getContext()->cookie->shopContext);
if (count($split) == 2)
{
if ($split[0] == 'g')
{
if (Context::getContext()->employee->hasAuthOnShopGroup($split[1]))
Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
else
{
$shop_id = Context::getContext()->employee->getDefaultShopID();
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
}
else if (Shop::getShop($split[1]) && Context::getContext()->employee->hasAuthOnShop($split[1]))
{
$shop_id = $split[1];
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
else
{
$shop_id = Context::getContext()->employee->getDefaultShopID();
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
}
}
// Check multishop context and set right context if need
if (Shop::getContext())
{
if (Shop::getContext() == Shop::CONTEXT_SHOP && !Shop::CONTEXT_SHOP)
Shop::setContext(Shop::CONTEXT_GROUP, Shop::getContextShopGroupID());
if (Shop::getContext() == Shop::CONTEXT_GROUP && !Shop::CONTEXT_GROUP)
Shop::setContext(Shop::CONTEXT_ALL);
}
// Replace existing shop if necessary
if (!$shop_id)
Context::getContext()->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
elseif (Context::getContext()->shop->id != $shop_id)
Context::getContext()->shop = new Shop($shop_id);
require_once($module_path);
$grid = new $module();
@@ -60,5 +107,3 @@ if ($option)
$grid->create($render, $type, $width, $height, $start, $limit, $sort, $dir);
$grid->render();

View File

@@ -37,11 +37,10 @@ echo '
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="NOFOLLOW, NOINDEX" />
<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/ui/themes/base/jquery.ui.datepicker.css" />
<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.css" />
<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/backward/admin.css" />
<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
<title>PrestaShop&trade; - '.Translate::getAdminTranslation('Administration panel').'</title>
<script type="text/javascript">
var helpboxes = '.Configuration::get('PS_HELPBOX').';
var roundMode = '.Configuration::get('PS_PRICE_ROUND_MODE').';
@@ -56,9 +55,6 @@ echo '
<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.js"></script>
<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
'.Hook::exec('displayBackOfficeHeader').'
<!--[if IE]>
<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin-ie.css" />
<![endif]-->
<style type="text/css">
div#header_infos, div#header_infos a#header_shopname, div#header_infos a#header_logout, div#header_infos a#header_foaccess {
color:'.(Tools::getBrightness(empty(Context::getContext()->employee->bo_color) ? '#FFFFFF' : Context::getContext()->employee->bo_color) < 128 ? 'white' : '#383838').'
@@ -78,7 +74,7 @@ echo '
html = "";
nb_notifs = 0;
$.each(json.order, function(property, value) {
html += "<li>'.translate('A new order has been made on your shop.').'<br />'.translate('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.translate('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.translate('Click here to see that order').'</a></li>";
html += "<li>'.Translate::getAdminTranslation('A new order has been made on your shop.').'<br />'.Translate::getAdminTranslation('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.Translate::getAdminTranslation('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.Translate::getAdminTranslation('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.Translate::getAdminTranslation('Click here to see that order').'</a></li>";
});
if (html != "")
@@ -99,7 +95,7 @@ echo '
html = "";
nb_notifs = 0;
$.each(json.customer, function(property, value) {
html += "<li>'.translate('A new customer registered on your shop.').'<br />'.translate('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.translate('Click here to see that customer').'</a></li>";
html += "<li>'.Translate::getAdminTranslation('A new customer registered on your shop.').'<br />'.Translate::getAdminTranslation('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.Translate::getAdminTranslation('Click here to see that customer').'</a></li>";
});
if (html != "")
{
@@ -121,7 +117,7 @@ echo '
html = "";
nb_notifs = 0;
$.each(json.customer_message, function(property, value) {
html += "<li>'.translate('A new message posted on your shop.').'<br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.translate('Click here to see that message').'</a></li>";
html += "<li>'.Translate::getAdminTranslation('A new message posted on your shop.').'<br />'.Translate::getAdminTranslation('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.Translate::getAdminTranslation('Click here to see that message').'</a></li>";
});
if (html != "")
@@ -149,14 +145,14 @@ echo '
if (Shop::isFeatureActive())
{
if (Shop::getContext() == Shop::CONTEXT_ALL)
$youEditFieldFor = translate('A modification of this field will be applied for all shops');
$youEditFieldFor = Translate::getAdminTranslation('A modification of this field will be applied for all shops');
elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
{
$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
$youEditFieldFor = sprintf(Translate::getAdminTranslation('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
}
else
$youEditFieldFor = sprintf(translate('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
$youEditFieldFor = sprintf(Translate::getAdminTranslation('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
echo 'hints.html(hints.html()+\'<br /><span class="red">'.addslashes($youEditFieldFor).'</span>\');';
}
@@ -202,10 +198,10 @@ echo ' var html = "";
{
echo '<div id="orders_notif" class="notifs"><span id="orders_notif_number_wrapper" class="number_wrapper"><span id="orders_notif_value">0</span></span>
<div id="orders_notif_wrapper" class="notifs_wrapper">
<h3>'.translate('Last orders').'</h3>
<p class="no_notifs">'.translate('No new orders has been made on your shop').'</p>
<h3>'.Translate::getAdminTranslation('Last orders').'</h3>
<p class="no_notifs">'.Translate::getAdminTranslation('No new orders has been made on your shop').'</p>
<ul id="list_orders_notif"></ul>
<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.translate('Show all orders').'</a></p>
<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.Translate::getAdminTranslation('Show all orders').'</a></p>
</div>
</div>';
}
@@ -213,10 +209,10 @@ echo ' var html = "";
{
echo '<div id="customers_notif" class="notifs notifs_alternate"><span id="customers_notif_number_wrapper" class="number_wrapper"><span id="customers_notif_value">0</span></span>
<div id="customers_notif_wrapper" class="notifs_wrapper">
<h3>'.translate('Last customers').'</h3>
<p class="no_notifs">'.translate('No new customers registered on your shop').'</p>
<h3>'.Translate::getAdminTranslation('Last customers').'</h3>
<p class="no_notifs">'.Translate::getAdminTranslation('No new customers registered on your shop').'</p>
<ul id="list_customers_notif"></ul>
<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.translate('Show all customers').'</a></p>
<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.Translate::getAdminTranslation('Show all customers').'</a></p>
</div>
</div>';
}
@@ -224,26 +220,26 @@ echo ' var html = "";
{
echo '<div id="customer_messages_notif" class="notifs"><span id="customer_messages_notif_number_wrapper" class="number_wrapper"><span id="customer_messages_notif_value">0</span></span>
<div id="customer_messages_notif_wrapper" class="notifs_wrapper">
<h3>'.translate('Last messages').'</h3>
<p class="no_notifs">'.translate('No new messages posted on your shop').'</p>
<h3>'.Translate::getAdminTranslation('Last messages').'</h3>
<p class="no_notifs">'.Translate::getAdminTranslation('No new messages posted on your shop').'</p>
<ul id="list_customer_messages_notif"></ul>
<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.translate('Show all messages').'</a></p>
<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.Translate::getAdminTranslation('Show all messages').'</a></p>
</div>
</div>';
}
echo '</div>
echo '</div>
<div id="employee_box">
<div id="employee_infos">
<div class="employee_name">'.translate('Welcome,').' <strong>'.Context::getContext()->employee->firstname.'&nbsp'.Context::getContext()->employee->lastname.'</strong></div>
<div class="employee_name">'.Translate::getAdminTranslation('Welcome,').' <strong>'.Context::getContext()->employee->firstname.'&nbsp'.Context::getContext()->employee->lastname.'</strong></div>
<div class="clear"></div>
<ul id="employee_links">
<li><a href="'.htmlentities(Context::getContext()->link->getAdminLink('AdminEmployees'), ENT_COMPAT, 'UTF-8').'&id_employee={$employee->id}&amp;updateemployee">'.translate('My preferences').'</a></li>
<li><a href="'.htmlentities(Context::getContext()->link->getAdminLink('AdminEmployees'), ENT_COMPAT, 'UTF-8').'&id_employee={$employee->id}&amp;updateemployee">'.Translate::getAdminTranslation('My preferences').'</a></li>
<li class="separator">&nbsp;</li>
<li><a id="header_logout" href="index.php?logout">'.translate('logout').'</a></li>
<li><a id="header_logout" href="index.php?logout">'.Translate::getAdminTranslation('logout').'</a></li>
</ul>';
if (defined(_PS_BASE_URL_))
echo '<a href="'._PS_BASE_URL_.'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'">'.translate('View my shop').'</a>';
echo '<a href="'._PS_BASE_URL_.'" id="header_foaccess" target="_blank" title="'.Translate::getAdminTranslation('View my shop').'">'.Translate::getAdminTranslation('View my shop').'</a>';
echo '</div>
</div>
@@ -252,18 +248,18 @@ echo ' var html = "";
<form method="post" action="index.php?controller=AdminSearch&amp;token='.Tools::getAdminTokenLite('AdminSearch').'">
<input type="text" name="bo_query" id="bo_query" value="'.Tools::safeOutput(Tools::stripslashes(Tools::getValue('bo_query'))).'" />
<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
<option value="0">'.translate('everywhere').'</option>
<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.translate('catalog').'</option>
<optgroup label="'.translate('customers').':">
<option value="2" '.(Tools::getValue('bo_search_type') == 2 ? 'selected="selected"' : '').'>'.translate('by name').'</option>
<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.translate('by ip address').'</option>
<option value="0">'.Translate::getAdminTranslation('everywhere').'</option>
<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('catalog').'</option>
<optgroup label="'.Translate::getAdminTranslation('customers').':">
<option value="2" '.(Tools::getValue('bo_search_type') == 2 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('by name').'</option>
<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('by ip address').'</option>
</optgroup>
<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.translate('orders').'</option>
<option value="4" '.(Tools::getValue('bo_search_type') == 4 ? 'selected="selected"' : '').'>'.translate('invoices').'</option>
<option value="5" '.(Tools::getValue('bo_search_type') == 5 ? 'selected="selected"' : '').'>'.translate('carts').'</option>
<option value="7" '.(Tools::getValue('bo_search_type') == 7 ? 'selected="selected"' : '').'>'.translate('modules').'</option>
<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('orders').'</option>
<option value="4" '.(Tools::getValue('bo_search_type') == 4 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('invoices').'</option>
<option value="5" '.(Tools::getValue('bo_search_type') == 5 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('carts').'</option>
<option value="7" '.(Tools::getValue('bo_search_type') == 7 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('modules').'</option>
</select>
<input type="submit" id="bo_search_submit" class="button" value="'.translate('Search').'"/>
<input type="submit" id="bo_search_submit" class="button" value="'.Translate::getAdminTranslation('Search').'"/>
</form>
</div>
<div id="header_quick">
@@ -277,7 +273,7 @@ echo ' var html = "";
}
</script>
<select onchange="quickSelect(this);" id="quick_select">
<option value="0">'.translate('Quick Access').'</option>';
<option value="0">'.Translate::getAdminTranslation('Quick Access').'</option>';
foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $quick)
{
preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $adminTab);
@@ -342,8 +338,8 @@ echo '
<div id="main">
<div id="content">'
.(file_exists(_PS_ADMIN_DIR_.'/../install') ? '<div style="background-color: #FFEBCC;border: 1px solid #F90;line-height: 20px;margin: 0px 0px 10px;padding: 10px 20px;">'
.translate('For security reasons, you must also:').' '.
translate('delete the /install folder').
.Translate::getAdminTranslation('For security reasons, you must also:').' '.
Translate::getAdminTranslation('delete the /install folder').
'</div>' : '').'
';
if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
@@ -352,7 +348,7 @@ echo '
if (Shop::isFeatureActive() && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
{
echo '<div class="multishop_toolbar">
<span class="text_multishop">'.translate('Multistore configuration for').'</span>'.
<span class="text_multishop">'.Translate::getAdminTranslation('Multistore configuration for').'</span>'.
Helper::renderShopList();
echo '</div>';
}

View File

@@ -27,6 +27,9 @@
$timer_start = microtime(true);
define('_PS_ADMIN_DIR_', getcwd());
if (!defined('PS_ADMIN_DIR'))
define('PS_ADMIN_DIR', _PS_ADMIN_DIR_);
require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
require(_PS_ADMIN_DIR_.'/functions.php');

View File

@@ -49,9 +49,12 @@ try
AdminTab::$currentIndex = $currentIndex;
$iso = $context->language->iso_code;
include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'))
include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'))
include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'))
include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
/* Server Params */
$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';

View File

@@ -0,0 +1,10 @@
{
"name": "admin-theme",
"version": "0.0.0",
"dependencies": {
"font-awesome": "~3.2.1",
"sass-bootstrap": "~3.0.0",
"enquire": "2.1.0"
},
"devDependencies": {}
}

View File

@@ -0,0 +1,16 @@
# Require any additional compass plugins here.
http_path = "/"
css_dir = "css"
sass_dir = "scss"
images_dir = "img"
javascripts_dir = "js"
fonts_dir = "font"
output_style = :compact
environment = :production
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
line_comments = false
color_output = false
preferred_syntax = :sass

File diff suppressed because one or more lines are too long

View File

@@ -1,676 +0,0 @@
body {font-family: Arial, Helvetica, sans-serif;}
h1, h2, h3, h4 { font-family: Arial, Helvetica, sans-serif; margin-bottom:.5em; line-height:1.4em; }
h2 { font-size:1.7em; }
h3 { font-size:1.25em; }
h4 { font-size:1.05em; }
h6 { font-size:1em; }
/*LIST*/
ul,ol {list-style:none; margin: 0; padding: 0;}
ul li {color:#585A69;}
/*FORM*/
label {color:#585a69;text-shadow:0 1px 0#fff;}
fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font-size:1.1em;margin:0;padding:1em}
.Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc; background-color:#fff;}
input[type="text"]:disabled,input[type="password"]:disabled,input[type="file"]:disabled,textarea:disabled {border:1px solid #ccc; background-color:#dedede; color: #444444;}
select { border:1px solid #ccc; font-size: 12px;}
select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"], option[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
.header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
.double_select select{width:300px;height:160px;}
.double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
.icon {vertical-align:middle}
.icon-top {vertical-align:top}
/*BUTTON*/
.button{
background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0;outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
.button[disabled=disabled]{color:#8C8C8C}
.button.bt-icon { display:inline-block; margin-bottom:7px;}
.button.bt-icon span {padding-left:5px;}
input.button[disabled=disabled]:hover{background-color:#FFF6D3}
.button:hover{border:1px solid #939393;}
.button:active{border:1px solid #939393;}
.button.export-csv span{ background: transparent url('../img/export-csv.png') no-repeat scroll left top; padding:1px 0 1px 20px}
#top_container{margin:0;padding:0}
/*HEADER*/
#header { background-color: #394049; height:90px; }
/* Portrait orientation targeting */
@media screen and (orientation: portrait) {#header{min-width:1250px}}
/* Portrait orientation targeting */
@media screen and (orientation: landscape) {#header{min-width:1250px}}
#header #header_infos{ position:relative; margin: 0; padding:0; height:60px; }
#header #header_shopname {float: left; margin:10px 15px 0 10px;}
#header #employee_box {float: right; display:block;}
#header #employee_infos {display:block; margin:5px 15px 0 10px;}
#header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px}
#header #employee_infos a:hover {color:#fff;}
#header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;}
#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top;height: 19px; width: 16px; margin-right: 5px}
#header ul#employee_links {list-style: none;display: block;text-align: left;}
#header ul#employee_links li {display: inline;line-height: 20px;}
#header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; padding-left:20px; color:#bababa;}
#header #header_infos a#header_logout:hover {color:#fff;}
#header #header_infos #header_logout a span {color:#bababa}
#header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
#header #header_infos #header_foaccess a {color:#bababa !important;}
#header #header_infos a#header_foaccess:hover { color:#fff;}
#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 transparent; border:none; box-shadow:none; padding: 5px 0px 5px 4px; width: 160px; }
#header #header_search #bo_search_type_chzn{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:80px !important;height:27px; border:none;}
#header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;}
#header #header_search #bo_search_submit { background: url('../img/icon-search2.png') no-repeat scroll center; border:none; width:27px; height:25px; float:left; font-weight:normal; margin:0; padding:0; cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; border-left:1px solid #3079ED; border-radius:0px; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
#header #header_quick{float:right; display:block; margin-top:15px;}
#header #header_quick #quick_select_chzn{ font-size:13px; margin:0 10px 0 0; padding:0px 0 4px; }
#header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
.path_bar {display:none;}
#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:95px;}
.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
#customer_messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
#orders_notif.open_notifs,
#customers_notif.open_notifs,
#customer_messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
.number_wrapper {color: white;display: none;font-size: 13px;font-weight: bold;position: absolute; right: -8px;top: -10px;z-index: 101;padding: 2px 5px;}
.number_wrapper span {background-color: #F03D25; font-size:11px; display: block; padding: 1px 3px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;}
.notifs_wrapper {background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000; border-top:none;display: none; cursor:auto; position: absolute; top: 25px; left: -1px; width:300px; padding: 10px;color: black; z-index:9999;}
.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 1px solid #E5E5E5;}
.notifs_wrapper ul {padding:6px 0;margin:0;}
.notifs_wrapper ul li {text-decoration: none;list-style: none;font-size:12px;padding:5px 0;}
#header_infos .notifs_wrapper a {font-weight: bold; font-size:11px; color: black; float:right;}
.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 1px solid #E5E5E5;}
.notifs_wrapper p.no_notifs {border: none;}
/*MENU*/
#header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
#header #menu li.maintab{float:left;height:29px;list-style:none;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 3px 4px 0;font-weight:normal;font-size:12px;}
#header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
#header #menu li{_height:32px;_padding-top:3px}
#header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
#header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
#header #menu li.active a{}
#header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
#header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
#header #menu li.active a.title, #header #menu li:hover a.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
#header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;min-width:150px;}
#header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
#header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
#header #menu .submenu li.active a { color: #fff;}
#header #menu .submenu li.active a:hover { color:#666666}
/*SEPARATION*/
.separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;}
/*TABLE*/
.table_grid {width:100%;}
.table{ background-color:#fff;border:1px solid #ccc;padding:0: border-radius:3px; -moz-border-radius:3px;-webkit-border-radius:3px;}
.filter {background-color:#f1f9ff;}
.table .filter {margin:2px;}
.table th a{text-decoration:underline}
.table a:hover{text-decoration:none}
.table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
background: #ececec url('../img/bg-degrade-table.png') repeat-x scroll left top;
background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;
font-size:13px; text-align:left; color:#333;}
.table tr th.right { text-align:center;}
.table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;}
.table tr.row_hover:hover td{background:#fff1b5}
.table tr.row_hover.filter:hover td{background:#F1F9FF}
.table tr td.row_hover:hover table tr td{background:none}
.table tr.action_details td{background:#FAFAFA;}
.table tr.alt_row.action_details td{background:#E8E8E8;}
.table tr td.empty{border-bottom:none;background:white!important}
.table tr td.first{border-left:1px solid #DEDEDE}
.table tr td.last{border-right:1px solid #DEDEDE}
.table tr.small td{height:15px}
.table tr.last td{border-bottom:none}
.col-left {vertical-align:top; padding-right:10px;}
.col-right {padding-bottom:5px;}
#tabPane1 td.col-left { width:200px;}
#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');min-height:420px;position:absolute;width:96.5%;}
div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;}
td.col-left label { display:block; width:100%; text-align:right;}
.alt_row{background-color:#f8f8f8}
.path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
.path_bar a{font-weight:700}
.cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px}
.cat_bar a{font-weight:700}
.table tr#total_products,
.table tr#total_discounts,
.table tr#total_wrapping,
.table tr#total_shipping { height:35px;}
.table tr#total_order { height:50px;}
a.action_module{color: #268CCD;text-decoration: underline;}
a.header_module_toggle{font-weight: bold;color: #268CCD;display:block;}
a.module_toggle_all{color: #268CCD;}
.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;color: #268CCD;}
.autoupgradeSteps div { line-height: 30px; }
.upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
#upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
.processing {overflow: auto;}
/*UI ACCORDEON*/
.ui-accordion-header { background-color: #ccc; color:#000;}
/*BLOC*/
.Bloc { background: none repeat scroll 0 0 #EBEDF4;}
/*TABLE STATUS COMMANDE*/
.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
/*multishop toolbar*/
.multishop_toolbar { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; font-size: 18px;}
.multishop_toolbar span.text_multishop {vertical-align: 7px; padding-right: 5px; }
.multishop_toolbar select.shopList { width: 300px; }
.multishop_toolbar a.chzn-single { background: url('../img/icon-multishop.png') no-repeat 5px 5px; padding: 1px 2px 2px 25px; font-weight: bold; }
.multishop_toolbar .chzn-container .chzn-results .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
.multishop_toolbar .chzn-container .chzn-results .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
.multishop_toolbar .chzn-container .chzn-results .shop{padding-left: 30px;background-color: #EAF2FC;}
/*toolbarBox*/
.toolbar-placeholder {position:relative}
.toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
.toolbarBox .pageTitle h3 {font-size: 1.6em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
.toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
.toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;-moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;}
.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px; /*hacking ie7*/ margin:0 !ie; position:relative !ie;}
.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url('../img/process-icon-cancel.png');}
.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
.toolbarBox .process-icon-save { background-image: url('../img/process-icon-save.png');}
.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
.toolbarBox .process-icon-refresh-index { background-image: url('../img/process-icon-refresh-index.png');}
.toolbarBox .process-icon-refresh-cache { background-image: url('../img/process-icon-refresh-cache.png');}
.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
.toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');}
.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
.toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');}
.toolbarBox .process-icon-import { background-image: url('../img/process-icon-export-csv.png');}
.toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');}
.toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');}
.toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');}
.toolbarBox .process-icon-export-stock-state-prices-csv { background-image: url('../img/process-icon-export-csv-details.png');}
.toolbarBox .process-icon-export-csv-orders { background-image: url('../img/process-icon-export-csv.png');}
.toolbarBox .process-icon-export-csv-details { background-image: url('../img/process-icon-export-csv-details.png');}
.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url('../img/process-icon-export-csv.png');}
.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
.toolbarBox .process-icon-new.add_product{ background-image: url('../img/process-icon-addProduct.png');}
.toolbarBox .process-icon-partialRefund{ background-image: url('../img/process-icon-partial-refund.png');}
.toolbarBox .process-icon-standardRefund{ background-image: url('../img/process-icon-standard-refund.png');}
.toolbarBox .process-icon-help{ background-image: url('../img/process-icon-help.png');}
.toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');}
.toolbarBox .process-icon-modules-list{ background-image: url('../img/process-icon-modules-list.png');}
.toolbarReduced {margin-right:221px}
#modules_list_button {width:211px;height:63px;border:none;position:absolute;top:0;right:0;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px}
.toolbarBox #modules_list_container {
background: none repeat scroll 0 0 #FFF;
border: solid 1px #CCC;
display: block;
float: right;
height: auto;
width: 500px;
position: absolute;
right: 13px;
top: 63px;
z-index: 100;
box-shadow: 1px 5px 5px #CCCCCC;
-moz-box-shadow: 1px 5px 10px #CCCCCC;
-webkit-box-shadow: 1px 5px 10px #CCCCCC;
opacity: 1;
}
.toolbarBox #modules_list_container #modules_list_container_content
{
max-height: 500px;
overflow: auto;
}
.toolbarBox #modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; }
.toolbarBox #modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; }
.toolbarBox #modules_list_container #modules_list_container_tab tr { height: auto}
.toolbarBox #modules_list_container #modules_list_container_tab tr.rowalt {background-color: #F0F7FF}
.toolbarBox #modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;}
.toolbarBox #modules_list_container #modules_list_loader {margin-top: 10px}
.toolbarBox #modules_list_container .nav-tabs-modules:after {clear: both;}
.toolbarBox #modules_list_container .nav-tabs-modules > li {height: 19px;}
.toolbarBox #modules_list_container .nav-tabs-modules > li > a {
padding-right: 12px;
padding-left: 12px;
margin-right: 2px;
line-height: 14px;
}
.toolbarBox #modules_list_container .nav-tabs-modules > li > a {
padding-top: 8px;
padding-bottom: 7px;
border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
-o-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover {
border-color: #C0C0C0;
background-color: #ffffff;
}
.toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;}
.toolbarBox #modules_list_container .nav-tabs-modules > .active > a,
.toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover {
color: #555555;
cursor: default;
background-color: #F8F8F8;
border: 1px solid #ddd;
border-bottom-color: transparent;
}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;margin:auto}
/*button upload files*/
#content .qq-upload-button {
background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
color:#333;
width:180px;
text-shadow: 0 1px 0 #fff;
border-color: #CCCCCC #BBBBBB #A0A0A0;
border-left: 1px solid #BBBBBB;
border-radius: 3px 3px 3px 3px;
border-right: 1px solid #BBBBBB;
border-style: solid;
border-width: 1px;
color: #000000;
}
#content .qq-upload-button:hover { border:1px solid #939393;}
.file_upload_label {margin-top:5px;}
/*leadin*/
.leadin {}
.leadin .bloc-leadin{ padding:10px 3px;}
/*productBox*/
#productBox { position:relative; width:100%; float:left;}
/*tab-pane*/
form#product_form, form#access_form, form#cart_rule_form, #modules_tab_list { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;}
#modules_tab_list {min-height: inherit}
#content form.adminstockmanagement {margin-left:0px;}
form#product_form h3 { font-size:14px; font-weight:normal;}
form#product_form h4 { font-size:18px; font-weight:normal;}
.tab-row {}
.tab-row .tab {background:#EFEFEF;width:100px;}
.tab-row .tab-page.selected {}
.tab-row .tab-page {}
.productTabs{ background-color:#fafafa; border:1px solid #ccced7; border-right:none; float:left; width:140px;}
.productTabs ul{padding:0;margin:0;}
.productTabs ul li.tab-row { border:none; }
.productTabs ul li.tab-row:first-child a {border-top:none;}
.productTabs ul li.tab-row a { display:block; font-weight:normal; color:#666;padding: 7px 10px; border-top:1px solid #CCCED7; border-right:1px solid #CCCED7;}
.productTabs ul li.tab-row a.selected { background-color:#EBEDF4;font-weight:bold;color:#000; border-right:none;}
.product-tab-content h4.tab { display:none;}
#product_list {margin-bottom:0.5em}
#categories-treeview { }
#product-tab-content-3-Associations .Association td.col-left { width:200px;}
/*FILTER MODULE*/
.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; padding:10px; display:block; min-height:35px;}
.filter-module #filternameForm {float:left; margin-right:30px;}
.filter-module label {width:auto;}
.filter-module .select-filter { float:left;}
.filter-module .button-filter { float:right;}
/*FILTER STOCK*/
.filter-stock { background-color:#ebedf4; border:1px solid #c2c4d9; margin-bottom:15px; padding:10px; display:block; min-height:25px;}
.filter-stock #stock_instant_state {float:left; margin-right:30px;}
.filter-stock label {width:auto;}
.filter-stock .select-filter { float:left;}
.filter-stock .button-filter { float:right;}
.filter-stock-extended { background-color:#ebedf4; border:1px solid #c2c4d9; margin-bottom:15px; padding:10px; display:block; min-height:65px;}
.filter-stock-extended #stock_cover {float:left; margin-right:30px;}
.filter-stock-extended #supply_orders {float:left; margin-right:30px;}
.filter-stock-extended label {width:auto;}
.filter-stock-extended .select-filter { float:left;}
.filter-stock-extended .button-filter { float:right;}
/*ADDONS LOGIN*/
#addons_login_div { background: #EBEDF4 url('../img/lock.png') no-repeat scroll left 5px;}
#addons_login_div form#addons_login_form { float:right;}
#addons_login_div p {float:left; font-size:16px; color:#585A69; line-height:24px; text-shadow: 0 1px 0 #fff; margin:0; padding-left:25px;}
#addons_login_div label {}
#addons_login_div input { float:left; margin-right:10px;}
#addons_login_div input#addons_login_button { margin-right: 0px; }
/*SIDEBAR*/
.sidebar { position:relative; float:left; width:220px; display:inline;}
.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
.sidebar.navigation h3 {margin:0;}
.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;}
.sidebar ul.categorieList {}
.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
.sidebar ul.categorieList li:first-child { border-top:none;}
.sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;}
.sidebar ul.categorieList li a:hover { background-color: #EBEDF4;}
.sidebar ul.categorieList li div.categorieWidth { overflow:hidden;}
.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
.sidebar .categorieStatus { display:none;}
/*NAVIGATION ENGINE*/
.blocEngine { background-color:#eee;}
.blocEngine .rowForm { display: block;float: left;margin: 0; padding: 5px 0; }
.blocEngine .rowForm label { font-weight:normal;}
.blocEngine .rowForm label,
.blocEngine .rowForm select {width:220px; float:left; text-align:left;}
.blocEngine p { margin-top:10px;display:block; float:left;}
/*STATCONTAINER*/
#statsContainer {margin-left:220px; padding:0 0 0 20px;}
#statsContainer #calendar,
#referrersContainer #calendar{ background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;}
#statsContainer #calendar form,
#referrersContainer #calendar form {float:left;}
#statsContainer #calendar input, #statsContainer #calendar p,
#referrersContainer #calendar input, #referrersContainer #calendar p { float:left;}
#statsContainer #calendar input.submitDateDay, #referrersContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
#statsContainer #calendar input.submitDateMonth, #statsContainer #calendar input.submitDateMonth,
#referrersContainer #calendar input.submitDateMonth, #referrersContainer #calendar input.submitDateMonth { border-radius:0px;}
#statsContainer #calendar input.submitDateYear,
#referrersContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
#statsContainer #calendar input.submitDateDayPrev,
#referrersContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
#statsContainer #calendar input.submitDateMonthPrev,
#referrersContainer #calendar input.submitDateMonthPrev { border-radius:0px;}
#statsContainer #calendar input.submitDateYearPrev,
#referrersContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
#statsContainer #calendar p, #referrersContainer #calendar p { margin:2px;}
#statsContainer #calendar p span, #referrersContainer #calendar p span { float:left; display:block; padding:3px;}
#statsContainer .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
#statsContainer .blocStats h2 { font-weight:normal; margin:0; font-size:1.4em}
#statsContainer .blocStats h2.icon-statsproduct span,
#statsContainer .blocStats h2.icon-statsbestsuppliers span,
#statsContainer .blocStats h2.icon-statsforecast span,
#statsContainer .blocStats h2.icon-pagesnotfound span,
#statsContainer .blocStats h2.icon-sekeywords span,
#statsContainer .blocStats h2.icon-guide span,
#statsContainer .blocStats h2.icon-statsequipment span,
#statsContainer .blocStats h2.icon-statsvisits span,
#statsContainer .blocStats h2.icon-statssales span,
#statsContainer .blocStats h2.icon-statsregistrations span,
#statsContainer .blocStats h2.icon-statspersonalinfos span,
#statsContainer .blocStats h2.icon-statscatalog span,
#statsContainer .blocStats h2.icon-basket-delete span,
#statsContainer .blocStats h2.icon-statsbestcustomers span,
#statsContainer .blocStats h2.icon-statsorigin span,
#statsContainer .blocStats h2.icon-statsbestproducts span,
#statsContainer .blocStats h2.icon-statsbestvouchers span,
#statsContainer .blocStats h2.icon-statsbestcategories span,
#statsContainer .blocStats h2.icon-statscarrier span,
#statsContainer .blocStats h2.icon-statssearch span,
#statsContainer .blocStats h2.icon-statsstock span,
#statsContainer .blocStats h2.icon-conversion span,
#statsContainer .blocStats h2.icon-payment span,
#statsContainer .blocStats h2.icon-category span,
#statsContainer .blocStats h2.icon-currency span,
#statsContainer .blocStats h2.icon-language span,
#statsContainer .blocStats h2.icon-attribute span { background: transparent url('../img/icon-sprites-title.png') no-repeat scroll left top; width:16px; height:16px; padding-right:18px; margin-right:3px;}
#statsContainer .blocStats h2.icon-statsproduct span { background-position :2px 2px;}
#statsContainer .blocStats h2.icon-statsforecast span { background-position :-18px 2px;}
#statsContainer .blocStats h2.icon-guide span { background-position :-36px 2px;}
#statsContainer .blocStats h2.icon-statsbestsuppliers span { background-position :-54px 2px;}
#statsContainer .blocStats h2.icon-pagesnotfound span { background-position :-72px 2px;}
#statsContainer .blocStats h2.icon-sekeywords span { background-position :-90px 2px;}
#statsContainer .blocStats h2.icon-statsequipment span { background-position :-108px 2px;}
#statsContainer .blocStats h2.icon-statsvisits span { background-position :-126px 2px;}
#statsContainer .blocStats h2.icon-statsregistrations span { background-position :-147px 2px;}
#statsContainer .blocStats h2.icon-statssales span { background-position : 0 -16px;}
#statsContainer .blocStats h2.icon-statspersonalinfos span { background-position : -18px -16px;}
#statsContainer .blocStats h2.icon-statscatalog span { background-position : -36px -16px;}
#statsContainer .blocStats h2.icon-category span { background-position : -36px -16px;}
#statsContainer .blocStats h2.icon-basket-delete span { background-position : -54px -16px;}
#statsContainer .blocStats h2.icon-statsbestcustomers span { background-position : -72px -16px;}
#statsContainer .blocStats h2.icon-statsorigin span { background-position : -90px -16px;}
#statsContainer .blocStats h2.icon-statsbestproducts span { background-position : -108px -16px;}
#statsContainer .blocStats h2.icon-statsbestvouchers span { background-position : -126px -16px;}
#statsContainer .blocStats h2.icon-statsbestcategories span { background-position : -147px -17px;}
#statsContainer .blocStats h2.icon-statscarrier span { background-position : 2px -36px;}
#statsContainer .blocStats h2.icon-statssearch span { background-position : -18px -36px;}
#statsContainer .blocStats h2.icon-statsstock span { background-position : -36px -36px;}
#statsContainer .blocStats h2.icon-conversion span { background-position : -54px -36px;}
#statsContainer .blocStats h2.icon-payment span { background-position : -72px -36px;}
#statsContainer .blocStats h2.icon-currency span { background-position : -90px -36px;}
#statsContainer .blocStats h2.icon-language span { background-position : -106px -36px;}
#statsContainer .blocStats h2.icon-attribute span { background-position : -126px -36px;}
#statsContainer .blocStats form { position:absolute; top:10px; right:5px;}
#statsContainer .blocStats form.checkup { position:relative; top:0; left:0;}
#statsContainer .totalStats { font-size:16px; font-weight:bold;}
#statsContainer .blocStats .blocConversion { display:block; display:inline-table; min-height:80px !ie; }
/*MODULECONTAINER*/
#moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
#moduleContainer .table tr th { height:40px;}
#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
#moduleContainer .table tr:first-child {border-top:1px solid #ccc}
#moduleContainer .table tr td .imgm , #modules_list_container_tab .imgm {width:32px;}
#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
#moduleContainer .moduleDesc .metadata { float:left; display:block; margin:5px 0;}
#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;}
#moduleContainer .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
#moduleContainer .setup.non-install { background-color:#ec7000;}
#moduleContainer .setup.must-have { background-color: #ec7000;}
#moduleContainer .setup.off{ background-color:#ccc; color:#666666}
#moduleContainer .row-actions-module span {padding-right:5px;}
#moduleContainer .row-actions-module span a { font-size:12px;}
#moduleContainer .button.uninstalled,
#moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;}
#moduleContainer ul.listing-grid-module { position:relative; margin:0; padding:0;}
#moduleContainer ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:30px; margin:10px; padding:5px; border-radius:4px;}
#moduleContainer .moduleGridDesc { position:relative; display:block; height:30px;}
#moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
#moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
/*TAB MODULES LIST*/
#modules_list_container_tab #modules_list_container_content{
list-style-type:none;
padding:0;
margin:0;
white-space: nowrap;
overflow: auto;
height: 370px;
}
#modules_list_container_tab #modules_list_container_content li{display:inline-block;}
#modules_list_container_tab table tr th { height:40px;}
#modules_list_container_tab table tr td { font-size:12px; padding: 3px 3px 3px; border-top:1px solid #ccc; border-bottom:none;}
#modules_list_container_tab table tr td tr td {border: none}
#modules_list_container_tab table tr:first-child {border-top:1px solid #ccc}
#modules_list_container_tab .imgm {width:32px;}
#modules_list_container_tab .moduleDesc {font-size:12px}
#modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left;white-space: normal;}
#modules_list_container_tab .moduleDesc .metadata { float:left; display:block; margin:5px 0;}
#modules_list_container_tab .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
#modules_list_container_tab .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;}
#modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; text-align: left;white-space: normal;}
#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:0 10px; display: inline-block; border-radius:3px;}
#modules_list_container_tab .row-actions-module {float: right;}
#modules_list_container_tab .setup.non-install { background-color:#ec7000;}
#modules_list_container_tab .setup.must-have { background-color: #ec7000;}
#modules_list_container_tab .setup.off{ background-color:#ccc; color:#666666}
#modules_list_container_tab .row-actions-module span { padding-right:5px;}
#modules_list_container_tab .row-actions-module span a { font-size:12px;}
#modules_list_container_tab ul.listing-grid-module { position:relative; margin:0; padding:0;}
#modules_list_container_tab ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:30px; margin:10px; padding:5px; border-radius:4px;}
#modules_list_container_tab .moduleGridDesc { position:relative; display:block; height:30px;}
#modules_list_container_tab .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
#modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
.default_modules_list_display_type #modules_list_container_content li table tr td{border: none}
.default_modules_list_display_type #modules_list_container_content li table {border:solid 1px #ccc;height:105px;width:100%;margin-bottom:10px}
#modules_list_container_tab ul li {height:105px}
/******** ie7 ******/
.ie7 #modules_list_container_tab #modules_list_container_content li{zoom:1;display:inline;}
.ie7 #modules_list_container_content li table {width: 21%;}
.ie7 #modules_list_container_content li table td .btn_right{width:100%;float:right;}
.ie7 #modules_list_container_content li table td .btn_right select{float:left;}
.ie7 #modules_list_container_content li table td a.button{display:block;float:right;}
/*MODULE POSITION*/
.blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;}
.blocLiveEdit h2 { background: transparent url('../img/live_edit.png') no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
.blocLiveEdit p { padding: 0 10px;}
.blocLiveEdit a.button {float: left; margin:10px; display: inline-block;}
#modulePosition { width:100%; float:left; clear:left;}
#modulePosition .table tr th { height:40px;}
#modulePosition form{ margin-right:270px;}
#modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}
#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px; clear:both;}
#modulePosition .lab_modules_positions span { font-size:12px; padding-top:4px; padding-left:5px; float:left; }
select#show_modules { font-size:12px;}
label.text { padding:1px 12px 0 0;}
label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
.listForm {}
ul.listForm {}
ul.listForm li {padding-bottom:3px;}
/*FOOTER*/
#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
#footer .footerLeft { float:left; margin-left:10px;}
#footer .footerRight {float:right; margin-right:10px;}
#footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
/*DASHBOARD*/
.pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;}
.pageTitleHome h3 { font-weight: normal; margin:0;}
#dashboard { background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; min-width:1200px;}
#dashboard h2 {font-size: 1.4em; font-weight:normal; margin:0 0 15px 0;}
#iframe {}
#iframe #video-content { float:left;}
#iframe {position:relative; display:block; min-height:180px;}
#adminpresentation #video { float:left; padding-right:15px; min-height:150px;}
#adminpresentation #video a { position:relative; height:128px; width:220px; display:block; padding:6px; }
#adminpresentation #video a img { }
#adminpresentation #video a span {background: transparent url("../img/play.png") no-repeat scroll left top; height:128px; width:220px; position:absolute; top:0; left:0; z-index:1; display:block; border:6px solid #fff; border-radius:3px; }
#adminpresentation #video a span:hover {background-position:left bottom;border:6px solid #C2C4D9; transition:background 0.5s;}
#adminpresentation #video-content { padding-left:10px; min-height:150px; }
#adminpresentation #video-content p { font-size:20px; line-height: 26px; color:#585A69; text-shadow: 0 1px 0 #fff;}
.view-modules { float:right; margin: 10px 0;}
.view-modules li { float:left;}
.view-modules li img { padding-right:5px;}
.view-modules li.normal-view-disabled { background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-right-radius: 0; border-right: 1px solid #ccc; border-top-right-radius: 0; color:#999; }
.view-modules li.favorites-view-disabled { background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-left-radius: 0; border-left: 1px solid #fff; border-top-left-radius: 0; color:#999; }
.view-modules li.normal-view-disabled:hover,
.view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;}
.view-modules li.favorites-view {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;}
.view-modules li.normal-view {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;}
.margin-form select.chosen{width: 200px;}
.selected-line {background:#fff1b5;}
#changedFiles ul{list-style-type: square; padding-left: 40px;}
.tooltip { position: relative; }
.tooltip .tooltip_content {
z-index: 100;
text-align: left;
display: none;
white-space: nowrap;
position: absolute;
padding: 5px 5px;
background: black;
color: white;
box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.5);
margin-top: 5px;
}
.tooltip .tooltip_label { cursor: pointer; }
.tooltip .title { text-align: center; padding-bottom: 5px; display: block; font-weight: bold }
.tooltip:hover .tooltip_content { display: block; }
.tooltip_button {
border: 1px solid silver;
border-radius: 3px;
padding: 0 3px;
background: -moz-linear-gradient(top, #ddd, #aaa);
background: -o-linear-gradient(top, #ddd, #aaa);
background: -webkit-linear-gradient(top, #ddd, #aaa);
background: linear-gradient(top, #ddd, #aaa);
color: #666
}
/******** CREATE AN ORDER **************/
#carrier_form label{padding-top:0}
#carrier_form input{margin-top:3px}
/************** SCENE *****************/
#large_scene_image{clear:both;border:1px solid transparent;}

View File

@@ -0,0 +1,707 @@
#content.nobootstrap h1, #content.nobootstrap h2, #content.nobootstrap h3, #content.nobootstrap h4 { font-family: Arial, Helvetica, sans-serif; line-height: 1.4em; margin-bottom: .5em; }
#content.nobootstrap h2 { font-size: 1.7em; }
#content.nobootstrap h3 { font-size: 1.25em; }
#content.nobootstrap h4 { font-size: 1.05em; }
#content.nobootstrap h6 { font-size: 1em; }
#content.nobootstrap ul, #content.nobootstrap ol { list-style: none; margin: 0; padding: 0; }
#content.nobootstrap ul li { color: #585A69; }
#content.nobootstrap label { color: #585a69; }
#content.nobootstrap fieldset { background-color: #EBEDF4; border: 1px solid #CCCED7; color: #585A69; margin: 0; padding: 1em; }
#content.nobootstrap .Bloc { background: none repeat scroll 0 0 #EBEDF4; background-color: #EBEDF4; border: 1px solid #CCCED7; font-size: 1.1em; margin: 0; padding: 1em; }
#content.nobootstrap legend { background: #EBEDF4; border: 1px solid #CCCED7; font-weight: 700; margin: 0; padding: .2em .5em; text-align: left; }
#content.nobootstrap input[type=text], #content.nobootstrap input[type=password], #content.nobootstrap input[type=file], #content.nobootstrap textarea { background-color: #fff; border: 1px solid #ccc; }
#content.nobootstrap input[type=text]:disabled, #content.nobootstrap input[type=password]:disabled, #content.nobootstrap input[type=file]:disabled, #content.nobootstrap textarea:disabled { background-color: #dedede; border: 1px solid #ccc; color: #444; }
#content.nobootstrap select { border: 1px solid #ccc; font-size: 12px; }
#content.nobootstrap select[disabled=disabled], #content.nobootstrap input[disabled=disabled], #content.nobootstrap textarea[disabled=disabled], #content.nobootstrap option[disabled=disabled] { border: 1px solid #CCC; color: #AAA; }
#content.nobootstrap .header_module { background: url(../img/header_module.png); border: solid 1px #CCC; color: #812143; height: 20px; padding-left: .5em; padding-top: .8em; }
#content.nobootstrap .double_select select { height: 160px; width: 300px; }
#content.nobootstrap .double_select a { background-color: #fafafa; border: 1px solid #aaa; color: #123456; display: block; margin: 2px; padding: 2px; text-align: center; text-decoration: none; }
#content.nobootstrap .icon { vertical-align: middle; }
#content.nobootstrap .icon-top { vertical-align: top; }
#content.nobootstrap .button { background: #E3E3E3 repeat scroll 0 0 transparent; border-color: #CCC #BBB #A0A0A0; border-left: 1px solid #BBB; border-right: 1px solid #BBB; border-style: solid; border-width: 1px; color: #000; cursor: pointer; margin: 0; outline: medium none; padding: 3px 8px; text-align: center; vertical-align: middle; white-space: nowrap; }
#content.nobootstrap .button[disabled=disabled] { color: #8C8C8C; }
#content.nobootstrap .button.bt-icon { display: inline-block; margin-bottom: 7px; }
#content.nobootstrap .button.bt-icon span { padding-left: 5px; }
#content.nobootstrap input.button[disabled=disabled]:hover { background-color: #FFF6D3; }
#content.nobootstrap .button.export-csv span { background: transparent url(../img/export-csv.png) no-repeat scroll left top; padding: 1px 0 1px 20px; }
#content.nobootstrap #top_container { margin: 0; padding: 0; }
#content.nobootstrap #header { background-color: #394049; height: 90px; }
#content.nobootstrap #header #header_infos { height: 60px; margin: 0; padding: 0; position: relative; }
#content.nobootstrap #header #header_shopname { float: left; margin: 10px 15px 0 10px; }
#content.nobootstrap #header #employee_box { display: block; float: right; }
#content.nobootstrap #header #employee_infos { display: block; margin: 5px 15px 0 10px; }
#content.nobootstrap #header #employee_infos a { color: #BABABA; margin-right: 5px; text-transform: capitalize; }
#content.nobootstrap #header #employee_infos .employee_name { color: #fff; float: left; padding: 0 20px 0 0; }
#content.nobootstrap #header .separator { background: transparent url(../img/separator.png) no-repeat scroll center top; height: 19px; margin-right: 5px; width: 16px; }
#content.nobootstrap #header ul#employee_links { display: block; list-style: none; text-align: left; }
#content.nobootstrap #header ul#employee_links li { display: inline; line-height: 20px; }
#content.nobootstrap #header #header_infos #header_shopname span { color: #fff; display: block; font-size: 24px; height: 28px; margin: 0; overflow: hidden; }
#content.nobootstrap #header #header_infos a#header_logout { background: transparent url(../img/logout.png) no-repeat scroll left top; color: #bababa; padding-left: 20px; }
#content.nobootstrap #header #header_infos #header_logout a span { color: #bababa; }
#content.nobootstrap #header #header_infos #header_foaccess { color: #bababa; text-decoration: none; }
#content.nobootstrap #header #header_infos #header_foaccess a { color: #bababa !important; }
#content.nobootstrap #header #header_search { background-color: #fff; border: 2px solid #000; float: left; height: 25px; margin-top: 15px; position: relative; }
#content.nobootstrap #header #header_search #bo_query { background: none repeat scroll 0 0 transparent; border: none; float: left; font: 13px Arial,sans-serif; padding: 5px 0 5px 4px; width: 160px; }
#content.nobootstrap #header #header_search #bo_search_type_chzn { border: none; float: left; font-size: 13px; height: 27px; margin: 0 23px 0 0; padding: 0 4px; vertical-align: middle; width: 80px !important; }
#content.nobootstrap #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { border: none; border-left: 1px dotted #ccc; }
#content.nobootstrap #header #header_search #bo_search_submit { background: url(../img/icon-search2.png) no-repeat scroll center; border: none; border-left: 1px solid #3079ED; color: transparent; cursor: pointer; display: block; float: left; font-weight: 400; height: 25px; margin: 0; padding: 0; position: absolute; right: 0; text-indent: -9999em; width: 27px; }
#content.nobootstrap #header #header_quick { display: block; float: right; margin-top: 15px; }
#content.nobootstrap #header #header_quick #quick_select_chzn { font-size: 13px; margin: 0 10px 0 0; padding: 0 0 4px; }
#content.nobootstrap #header #header_myaccount { background: url(../img/bg-lang.png) no-repeat; display: block; float: right; height: 16px; margin: 8px 1px 0 0; width: 16px; }
#content.nobootstrap .path_bar { background-color: #E2EBEE; border: 1px solid #999; display: none; font-family: Trebuchet,Arial,Helvetica,sans-serif; font-size: 13px; margin-bottom: 20px; padding: 5px; }
#content.nobootstrap #notifs_icon_wrapper { float: left; margin: 15px 10px 0; position: relative; width: 95px; }
#content.nobootstrap .notifs { cursor: pointer; float: left; height: 16px; margin: 0; padding: 5px; position: relative; width: 18px; }
#content.nobootstrap #orders_notif { background: url(../img/notif_order.png) no-repeat center top; }
#content.nobootstrap #customers_notif { background: url(../img/notif_customer.png) no-repeat center top; }
#content.nobootstrap #customer_messages_notif { background: url(../img/notif_message.png) no-repeat center top; }
#content.nobootstrap #orders_notif.open_notifs, #content.nobootstrap #customers_notif.open_notifs, #content.nobootstrap #customer_messages_notif.open_notifs { background-color: #FFF; background-position: center bottom; border: 1px solid #000; display: block; position: relative; }
#content.nobootstrap .number_wrapper { color: #FFF; display: none; font-size: 13px; font-weight: 700; padding: 2px 5px; position: absolute; right: -8px; top: -10px; z-index: 101; }
#content.nobootstrap .number_wrapper span { background-color: #F03D25; border-color: 0 #DD3822 #DD3822; border-right: 1px solid #DD3822; border-style: none solid solid; border-width: 0; display: block; font-size: 11px; padding: 1px 3px; }
#content.nobootstrap .notifs_wrapper { background: none repeat scroll 0 0 #FFF; border: 1px solid #000; border-top: none; color: #000; cursor: auto; display: none; left: -1px; padding: 10px; position: absolute; top: 25px; width: 300px; z-index: 9999; }
#content.nobootstrap .notifs_wrapper h3 { border-bottom: 1px solid #E5E5E5; font-size: 14px; margin: 0; padding-bottom: 8px; }
#content.nobootstrap .notifs_wrapper ul { margin: 0; padding: 6px 0; }
#content.nobootstrap .notifs_wrapper ul li { font-size: 12px; list-style: none; padding: 5px 0; text-decoration: none; }
#content.nobootstrap #header_infos .notifs_wrapper a { color: #000; float: right; font-size: 11px; font-weight: 700; }
#content.nobootstrap .notifs_wrapper p { border-top: 1px solid #E5E5E5; font-size: 12px; margin: 0; padding-top: 8px; }
#content.nobootstrap #header #menu { background-color: #f8f8f8; border-bottom: 1px solid #e5e5e5; float: left; line-height: normal; margin: 0; padding: 0; width: 100%; }
#content.nobootstrap #header #menu li.maintab { border-left: 1px solid #fff; border-right: 1px solid #ccc; display: block; float: left; height: 29px; list-style: none; }
#content.nobootstrap #header #menu li.submenu_size .title { color: #000; cursor: default; display: block; font-size: 12px; font-weight: 400; padding: 8px 3px 4px 0; }
#content.nobootstrap #header #menu img { display: inline; height: 16px; margin-top: -4px; padding: 0 3px 0 6px; vertical-align: middle; width: 16px; }
#content.nobootstrap #header #menu li.active, #content.nobootstrap #header #menu li:hover { background-position: 0 -38px; white-space: nowrap; }
#content.nobootstrap #header #menu li:hover, #content.nobootstrap #header #menu li.active { background-color: #49B2FF; }
#content.nobootstrap #header #menu li.maintab:hover, #content.nobootstrap #header #menu li.active { border-left: 1px solid #49B2FF; border-right: 1px solid #49B2FF; }
#content.nobootstrap #header #menu .withLeftBorder { background: transparent url(../img/separator_subnav.png) no-repeat 0 5px; }
#content.nobootstrap #header #menu .submenu { background: #f8f8f8; border: 1px solid #d9d9d9; clear: both; margin: 0; padding: 0; z-index: 9999; }
#content.nobootstrap #header #menu .submenu li { display: block; list-style: none; margin: 0; min-width: 150px; padding: 0; }
#content.nobootstrap #header #menu .submenu li a { border-bottom: 1px solid #ccc; border-top: 1px solid #fff; color: #666; display: block; font-size: 12px; padding: 5px 15px 5px 10px; }
#content.nobootstrap #header #menu .submenu li.active a:hover { color: #666; }
#content.nobootstrap .separation { background-color: #ccc; border-bottom: 1px solid #fff; height: 1px; margin: 10px 0; width: 100%; }
#content.nobootstrap .table_grid { width: 100%; }
#content.nobootstrap .table { background-color: #fff; border: 1px solid #ccc; padding: 0; border-radius: 3px; }
#content.nobootstrap .filter { background-color: #f1f9ff; }
#content.nobootstrap .table th a { text-decoration: underline; }
#content.nobootstrap .table a:hover { text-decoration: none; }
#content.nobootstrap .table tr th { background-color: #F1F1F1; color: #333; font-size: 13px; padding: 4px 6px; text-align: left; }
#content.nobootstrap .table tr th.right { text-align: center; }
#content.nobootstrap .table tr td { border-bottom: 1px solid #ccc; color: #333; font-size: 12px; padding: 4px 4px 4px 6px; }
#content.nobootstrap .table tr.row_hover.filter:hover td { background: #F1F9FF; }
#content.nobootstrap .table tr td.row_hover:hover table tr td { background: none; }
#content.nobootstrap .table tr.action_details td { background: #FAFAFA; }
#content.nobootstrap .table tr.alt_row.action_details td { background: #E8E8E8; }
#content.nobootstrap .table tr td.empty { background: white !important; border-bottom: none; }
#content.nobootstrap .table tr td.first { border-left: 1px solid #DEDEDE; }
#content.nobootstrap .table tr td.last { border-right: 1px solid #DEDEDE; }
#content.nobootstrap .table tr.small td { height: 15px; }
#content.nobootstrap .table tr.last td { border-bottom: none; }
#content.nobootstrap .col-left { padding-right: 10px; vertical-align: top; }
#content.nobootstrap .col-right { padding-bottom: 5px; }
#content.nobootstrap #product-tab-content-wait { background: url(../img/bg_loaderSpace.png); display: block; min-height: 420px; position: absolute; width: 96.5%; }
#content.nobootstrap div#loading { background: url(../img/ajax-loader.gif); display: block; height: 128px; margin: 100px auto; text-indent: -9999px; width: 128px; }
#content.nobootstrap td.col-left label { display: block; text-align: right; width: 100%; }
#content.nobootstrap .alt_row { background-color: #f8f8f8; }
#content.nobootstrap .cat_bar { background-color: #F4E8CD; border: 1px solid #999; font-family: Trebuchet,Arial,Helvetica,sans-serif; font-size: 12px; font-weight: 700; margin-bottom: 20px; padding: 5px; }
#content.nobootstrap .table tr#total_products, #content.nobootstrap .table tr#total_discounts, #content.nobootstrap .table tr#total_wrapping, #content.nobootstrap .table tr#total_shipping { height: 35px; }
#content.nobootstrap .table tr#total_order { height: 50px; }
#content.nobootstrap a.action_module { color: #268CCD; text-decoration: underline; }
#content.nobootstrap a.header_module_toggle { color: #268CCD; display: block; font-weight: 700; }
#content.nobootstrap .nbr_module { color: #268CCD; float: right; font-size: 12px; font-style: italic; margin-right: 10px; }
#content.nobootstrap .autoupgradeSteps div { line-height: 30px; }
#content.nobootstrap .upgradestep { margin-right: 5px; padding-left: 10px; padding-right: 5px; }
#content.nobootstrap #upgradeNow.stepok, #content.nobootstrap .autoupgradeSteps a.stepok { background-image: url(../img/admin/enabled.gif); background-position: left center; background-repeat: no-repeat; padding-left: 15px; }
#content.nobootstrap .processing { overflow: auto; }
#content.nobootstrap .ui-accordion-header { background-color: #ccc; color: #000; }
#content.nobootstrap .table td span.color_field { color: #fff; font-size: 11px; padding: 2px 5px; text-transform: uppercase; }
#content.nobootstrap .multishop_toolbar { background-color: #F8F8F8; border: 1px solid #CCC; font-size: 18px; margin-bottom: 10px; padding: 10px; }
#content.nobootstrap .multishop_toolbar span.text_multishop { padding-right: 5px; vertical-align: 7px; }
#content.nobootstrap .multishop_toolbar select.shopList { width: 300px; }
#content.nobootstrap .multishop_toolbar a.chzn-single { background: url(../img/icon-multishop.png) no-repeat 5px 5px; font-weight: 700; padding: 1px 2px 2px 25px; }
#content.nobootstrap .multishop_toolbar .chzn-container .chzn-results .first { background-color: #408BD5; color: #fff; font-weight: 700; }
#content.nobootstrap .multishop_toolbar .chzn-container .chzn-results .group { background-color: #C6DEFC; font-style: italic; font-weight: 700; padding-left: 15px; }
#content.nobootstrap .multishop_toolbar .chzn-container .chzn-results .shop { background-color: #EAF2FC; padding-left: 30px; }
#content.nobootstrap .toolbarBox .process-icon-delete { background-image: url(../img/process-icon-delete.png); }
#content.nobootstrap .toolbarBox .process-icon-duplicate { background-image: url(../img/process-icon-duplicate.png); }
#content.nobootstrap .toolbarBox .process-icon-stats { background-image: url(../img/process-icon-stats.png); }
#content.nobootstrap .toolbarBox .process-icon-save-and-stay { background-image: url(../img/process-icon-save-and-stay.png); }
#content.nobootstrap .toolbarBox .process-icon-edit { background-image: url(../img/process-icon-edit.png); }
#content.nobootstrap .toolbarBox .process-icon-back { background-image: url(../img/process-icon-back.png); }
#content.nobootstrap .toolbarBox .process-icon-refresh-index { background-image: url(../img/process-icon-refresh-index.png); }
#content.nobootstrap .toolbarBox .process-icon-refresh-cache { background-image: url(../img/process-icon-refresh-cache.png); }
#content.nobootstrap .toolbarBox .process-icon-save-calendar { background-image: url(../img/process-icon-save-calendar.png); }
#content.nobootstrap .toolbarBox .process-icon-new-module { background-image: url(../img/process-icon-new-module.png); }
#content.nobootstrap .toolbarBox .process-icon-new-url { background-image: url(../img/process-icon-new-url.png); }
#content.nobootstrap .toolbarBox .process-icon-new-module-addon { background-image: url(../img/process-icon-new-module-addon.png); }
#content.nobootstrap .toolbarBox .process-icon-new.add_product { background-image: url(../img/process-icon-addProduct.png); }
#content.nobootstrap .toolbarBox .process-icon-partialRefund { background-image: url(../img/process-icon-partial-refund.png); }
#content.nobootstrap .toolbarBox .process-icon-standardRefund { background-image: url(../img/process-icon-standard-refund.png); }
#content.nobootstrap .toolbarBox .process-icon-help { background-image: url(../img/process-icon-help.png); }
#content.nobootstrap .toolbarBox .process-icon-help-new { background-image: url(../img/process-icon-help-new.png); }
#content.nobootstrap .toolbarBox .process-icon-modules-list { background-image: url(../img/process-icon-modules-list.png); }
#content.nobootstrap .toolbarReduced { margin-right: 221px; }
#content.nobootstrap #modules_list_button { background-image: url(../img/modules_list_button.png); border: none; cursor: pointer; font-size: 1.6em; height: 63px; padding-left: 45px; position: absolute; right: 0; top: 0; width: 211px; }
#content.nobootstrap .toolbarBox #modules_list_container { background: none repeat scroll 0 0 #FFF; border: solid 1px #CCC; display: block; float: right; height: auto; position: absolute; right: 13px; top: 63px; width: 500px; z-index: 100; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_container_content { max-height: 500px; overflow: auto; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_container_tab { height: auto; margin-top: 10px; width: auto; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_container_tab table { border-spacing: 0; width: 100%; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_container_tab tr { height: auto; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_container_tab tr.rowalt { background-color: #F0F7FF; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_container_tab #tab_module_switch { margin-bottom: 10px; }
#content.nobootstrap .toolbarBox #modules_list_container #modules_list_loader { margin-top: 10px; }
#content.nobootstrap .toolbarBox #modules_list_container .nav-tabs-modules:after { clear: both; }
#content.nobootstrap .toolbarBox #modules_list_container .nav-tabs-modules > li { height: 19px; }
#content.nobootstrap .toolbarBox #modules_list_container .nav-tabs-modules > li > a { border: 1px solid #ddd; border-bottom: none; line-height: 14px; margin-right: 2px; padding: 8px 12px 7px; }
#content.nobootstrap .toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover { background-color: #fff; border-color: silver; }
#content.nobootstrap .toolbarBox #modules_list_container .nav-tabs-modules > .active > a, #content.nobootstrap .toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover { background-color: #F8F8F8; border: 1px solid #ddd; border-bottom-color: transparent; color: #555; cursor: default; }
#content.nobootstrap div.fix-toolbar { border-bottom: 1px solid #E0E0E0; margin: auto; position: fixed; top: 0; z-index: 1; }
#content.nobootstrap #content .qq-upload-button { background: #E3E3E3; border-color: #CCC #BBB #A0A0A0; border-left: 1px solid #BBB; border-right: 1px solid #BBB; border-style: solid; border-width: 1px; color: #000; width: 180px; }
#content.nobootstrap .file_upload_label { margin-top: 5px; }
#content.nobootstrap .leadin .bloc-leadin { padding: 10px 3px; }
#content.nobootstrap #productBox { float: left; position: relative; width: 100%; }
#content.nobootstrap form#product_form, #content.nobootstrap form#access_form, #content.nobootstrap form#cart_rule_form, #content.nobootstrap #modules_tab_list { background-color: #ebedf4; border: 1px solid #ccced7; margin-left: 140px; min-height: 404px; padding: 5px 10px 10px; }
#content.nobootstrap #modules_tab_list { min-height: inherit; }
#content.nobootstrap #content form.adminstockmanagement { margin-left: 0; }
#content.nobootstrap form#product_form h3 { font-size: 14px; font-weight: 400; }
#content.nobootstrap form#product_form h4 { font-size: 18px; font-weight: 400; }
#content.nobootstrap .tab-row .tab { background: #EFEFEF; width: 100px; }
#content.nobootstrap .productTabs { background-color: #fafafa; border: 1px solid #ccced7; border-right: none; float: left; width: 140px; }
#content.nobootstrap .productTabs ul { margin: 0; padding: 0; }
#content.nobootstrap .productTabs ul li.tab-row a { border-right: 1px solid #CCCED7; border-top: 1px solid #CCCED7; color: #666; display: block; font-weight: 400; padding: 7px 10px; }
#content.nobootstrap .productTabs ul li.tab-row a.selected { background-color: #EBEDF4; border-right: none; color: #000; font-weight: 700; }
#content.nobootstrap #product_list { margin-bottom: .5em; }
#content.nobootstrap .filter-module { background-color: #ebedf4; border: 1px solid #c2c4d9; display: block; min-height: 35px; padding: 10px; }
#content.nobootstrap .filter-stock { background-color: #ebedf4; border: 1px solid #c2c4d9; display: block; margin-bottom: 15px; min-height: 25px; padding: 10px; }
#content.nobootstrap .filter-stock-extended { background-color: #ebedf4; border: 1px solid #c2c4d9; display: block; margin-bottom: 15px; min-height: 65px; padding: 10px; }
#content.nobootstrap #addons_login_div { background: #ebedf4 url(../img/lock.png) no-repeat scroll left 5px; }
#content.nobootstrap #addons_login_div p { color: #585A69; float: left; font-size: 16px; line-height: 24px; margin: 0; padding-left: 25px; }
#content.nobootstrap #addons_login_div input { float: left; margin-right: 10px; }
#content.nobootstrap #addons_login_div input#addons_login_button { margin-right: 0; }
#content.nobootstrap .sidebar { display: inline; float: left; position: relative; width: 220px; }
#content.nobootstrap .sidebar h3 { background-color: #ebedf4; display: block; font-weight: 700; padding: 5px; }
#content.nobootstrap .sidebar.navigation h3 { margin: 0; }
#content.nobootstrap .sidebar .subHeadline { float: right; font-weight: 700; margin-right: 5px; margin-top: -28px; }
#content.nobootstrap .sidebar ul.categorieList li { border-top: 1px solid #ccc; line-height: 20px; position: relative; }
#content.nobootstrap .sidebar ul.categorieList li a { color: #3a6ea7; display: block; padding-left: 5px; }
#content.nobootstrap .sidebar ul.categorieList li a:hover { background-color: #EBEDF4; }
#content.nobootstrap .sidebar ul.categorieList li div.categorieWidth { overflow: hidden; text-indent: 5px; }
#content.nobootstrap .sidebar ul.categorieList li div.count { position: absolute; right: 5px; top: 0; }
#content.nobootstrap .blocEngine .rowForm { display: block; float: left; margin: 0; padding: 5px 0; }
#content.nobootstrap .blocEngine .rowForm label { font-weight: 400; }
#content.nobootstrap .blocEngine .rowForm label, #content.nobootstrap .blocEngine .rowForm select { float: left; text-align: left; width: 220px; }
#content.nobootstrap .blocEngine p { display: block; float: left; margin-top: 10px; }
#content.nobootstrap #statsContainer { margin-left: 220px; padding: 0 0 0 20px; }
#content.nobootstrap #statsContainer #calendar, #content.nobootstrap #referrersContainer #calendar { background-color: #EEE; border-top: 1px solid #CCC; display: block; margin: 10px 0; min-height: 25px; padding: 5px; }
#content.nobootstrap #statsContainer #calendar p span, #content.nobootstrap #referrersContainer #calendar p span { display: block; float: left; padding: 3px; }
#content.nobootstrap #statsContainer .blocStats { background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; }
#content.nobootstrap #statsContainer .blocStats h2 { font-size: 1.4em; font-weight: 400; margin: 0; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsproduct span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsbestsuppliers span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsforecast span, #content.nobootstrap #statsContainer .blocStats h2.icon-pagesnotfound span, #content.nobootstrap #statsContainer .blocStats h2.icon-sekeywords span, #content.nobootstrap #statsContainer .blocStats h2.icon-guide span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsequipment span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsvisits span, #content.nobootstrap #statsContainer .blocStats h2.icon-statssales span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsregistrations span, #content.nobootstrap #statsContainer .blocStats h2.icon-statspersonalinfos span, #content.nobootstrap #statsContainer .blocStats h2.icon-statscatalog span, #content.nobootstrap #statsContainer .blocStats h2.icon-basket-delete span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsbestcustomers span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsorigin span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsbestproducts span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsbestvouchers span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsbestcategories span, #content.nobootstrap #statsContainer .blocStats h2.icon-statscarrier span, #content.nobootstrap #statsContainer .blocStats h2.icon-statssearch span, #content.nobootstrap #statsContainer .blocStats h2.icon-statsstock span, #content.nobootstrap #statsContainer .blocStats h2.icon-conversion span, #content.nobootstrap #statsContainer .blocStats h2.icon-payment span, #content.nobootstrap #statsContainer .blocStats h2.icon-category span, #content.nobootstrap #statsContainer .blocStats h2.icon-currency span, #content.nobootstrap #statsContainer .blocStats h2.icon-language span, #content.nobootstrap #statsContainer .blocStats h2.icon-attribute span { background: transparent url(../img/icon-sprites-title.png) no-repeat scroll left top; height: 16px; margin-right: 3px; padding-right: 18px; width: 16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsproduct span { background-position: 2px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsforecast span { background-position: -18px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-guide span { background-position: -36px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsbestsuppliers span { background-position: -54px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-pagesnotfound span { background-position: -72px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-sekeywords span { background-position: -90px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsequipment span { background-position: -108px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsvisits span { background-position: -126px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsregistrations span { background-position: -147px 2px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statssales span { background-position: 0 -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statspersonalinfos span { background-position: -18px -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-basket-delete span { background-position: -54px -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsbestcustomers span { background-position: -72px -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsorigin span { background-position: -90px -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsbestproducts span { background-position: -108px -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsbestvouchers span { background-position: -126px -16px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsbestcategories span { background-position: -147px -17px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statscarrier span { background-position: 2px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statssearch span { background-position: -18px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statsstock span { background-position: -36px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-conversion span { background-position: -54px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-payment span { background-position: -72px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-currency span { background-position: -90px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-language span { background-position: -106px -36px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-attribute span { background-position: -126px -36px; }
#content.nobootstrap #statsContainer .blocStats form { position: absolute; right: 5px; top: 10px; }
#content.nobootstrap #statsContainer .blocStats form.checkup { left: 0; position: relative; top: 0; }
#content.nobootstrap #statsContainer .totalStats { font-size: 16px; font-weight: 700; }
#content.nobootstrap #statsContainer .blocStats .blocConversion { display: inline-table; min-height: 80px; }
#content.nobootstrap #moduleContainer { margin-left: 220px; padding: 13px 0 0 20px; }
#content.nobootstrap #moduleContainer .table tr td { border-bottom: none; border-top: 1px solid #ccc; font-size: 12px; padding: 5px 7px 0; vertical-align: top; }
#content.nobootstrap #moduleContainer .moduleDesc { font-size: 12px; margin-bottom: 10px; position: relative; }
#content.nobootstrap #moduleContainer .moduleDesc p.desc { clear: both; color: #666; display: block; font-family: Georgia; font-size: 12px; font-style: italic; }
#content.nobootstrap #moduleContainer .setup { background-color: #6db300; color: #fff; display: inline-block; font-size: 10px; font-weight: 700; left: 10px; padding: 0 4px; position: relative; text-transform: uppercase; }
#content.nobootstrap #moduleContainer .setup.non-install { background-color: #ffedb1; border: solid 1px #ec7000; color: #ec7000; }
#content.nobootstrap #moduleContainer .setup.off { background-color: #ccc; color: #666; }
#content.nobootstrap #moduleContainer .button.uninstalled, #content.nobootstrap #moduleContainer .button.installed { clear: both; display: inline-block; float: right; font-size: 12px; margin-top: 15px; }
#content.nobootstrap #modules_list_container_tab #modules_list_container_content { height: 370px; list-style-type: none; margin: 0; overflow: auto; padding: 0; white-space: nowrap; }
#content.nobootstrap #modules_list_container_tab #modules_list_container_content li { display: inline-block; }
#content.nobootstrap #modules_list_container_tab table tr td { border-bottom: none; border-top: 1px solid #ccc; font-size: 12px; padding: 3px; }
#content.nobootstrap #modules_list_container_tab .moduleDesc h3 { color: #3A6EA7; font-size: 1.1em; margin: 0; text-align: left; white-space: normal; }
#content.nobootstrap #modules_list_container_tab .moduleDesc p.desc { color: #666; font-family: Georgia; font-size: 12px; font-style: italic; text-align: left; white-space: normal; }
#content.nobootstrap #modules_list_container_tab .setup { background-color: #6db300; color: #fff; display: inline-block; font-size: 10px; font-weight: 700; padding: 0 10px; text-transform: uppercase; }
#content.nobootstrap #modules_list_container_tab .setup.off { background-color: #ccc; color: #666; }
#content.nobootstrap .default_modules_list_display_type #modules_list_container_content li table { border: solid 1px #ccc; height: 105px; margin-bottom: 10px; width: 100%; }
#content.nobootstrap #modules_list_container_tab ul li { height: 105px; }
#content.nobootstrap .blocLiveEdit { background-color: #EBEDF4; border: 1px solid #C2C4D9; clear: right; display: block; float: right; width: 250px; }
#content.nobootstrap .blocLiveEdit h2 { background: transparent url(../img/live_edit.png) no-repeat scroll 10px 10px; height: 40px; line-height: 50px; margin: 0; padding: 0 10px; text-indent: 40px; }
#content.nobootstrap .blocLiveEdit p { padding: 0 10px; }
#content.nobootstrap .blocLiveEdit a.button { display: inline-block; float: left; margin: 10px; }
#content.nobootstrap #modulePosition { clear: left; float: left; width: 100%; }
#content.nobootstrap #modulePosition form { margin-right: 270px; }
#content.nobootstrap #modulePosition .lab_modules_positions h3 { color: #3A6EA7; float: left; margin: 0 0 0 10px; }
#content.nobootstrap #modulePosition .lab_modules_positions p { clear: both; font-family: Georgia; font-size: 12px; font-style: italic; padding-left: 40px; }
#content.nobootstrap #modulePosition .lab_modules_positions span { float: left; font-size: 12px; padding-left: 5px; padding-top: 4px; }
#content.nobootstrap label.text { padding: 1px 12px 0 0; }
#content.nobootstrap label.radioCheck { float: none; font-weight: 400; margin: 0 1em 0 .25em; padding: 0; }
#content.nobootstrap ul.listForm li { padding-bottom: 3px; }
#content.nobootstrap #footer { clear: both; color: #666; font-size: .9em; height: 40px; }
#content.nobootstrap #footer .footerLeft { float: left; margin-left: 10px; }
#content.nobootstrap #footer .footerRight { float: right; margin-right: 10px; }
#content.nobootstrap .pageTitleHome { font-size: 1.6em; font-weight: 400; margin: 0; padding: 10px 0; }
#content.nobootstrap .pageTitleHome h3 { font-weight: 400; margin: 0; }
#content.nobootstrap #dashboard { background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; min-width: 1200px; padding: 10px; position: relative; }
#content.nobootstrap #dashboard h2 { font-size: 1.4em; font-weight: 400; margin: 0 0 15px; }
#content.nobootstrap #iframe { display: block; min-height: 180px; position: relative; }
#content.nobootstrap #adminpresentation #video { float: left; min-height: 150px; padding-right: 15px; }
#content.nobootstrap #adminpresentation #video a { display: block; height: 128px; padding: 6px; position: relative; width: 220px; }
#content.nobootstrap #adminpresentation #video a span { background: transparent url(../img/play.png) no-repeat scroll left top; border: 6px solid #fff; display: block; height: 128px; left: 0; position: absolute; top: 0; width: 220px; z-index: 1; }
#content.nobootstrap #adminpresentation #video a span:hover { background-position: left bottom; border: 6px solid #C2C4D9; }
#content.nobootstrap #adminpresentation #video-content { min-height: 150px; padding-left: 10px; }
#content.nobootstrap #adminpresentation #video-content p { color: #585A69; font-size: 20px; line-height: 26px; }
#content.nobootstrap .view-modules { float: right; margin: 10px 0; }
#content.nobootstrap .view-modules li.normal-view-disabled { background: 0 repeat scroll 0 0 transparent; border-right: 1px solid #ccc; color: #999; }
#content.nobootstrap .view-modules li.favorites-view-disabled { background: 0 repeat scroll 0 0 transparent; border-left: 1px solid #fff; color: #999; }
#content.nobootstrap .view-modules li.normal-view-disabled:hover, #content.nobootstrap .view-modules li.favorites-view-disabled:hover { border-color: #CCC #BBB #A0A0A0; }
#content.nobootstrap .view-modules li.favorites-view { border-left: 1px solid #fff; }
#content.nobootstrap .view-modules li.normal-view { border-right: 1px solid #ccc; }
#content.nobootstrap #changedFiles ul { list-style-type: square; padding-left: 40px; }
#content.nobootstrap .tooltip .tooltip_content { background: #000; color: #FFF; display: none; margin-top: 5px; padding: 5px; position: absolute; text-align: left; white-space: nowrap; z-index: 100; }
#content.nobootstrap .tooltip .tooltip_label { cursor: pointer; }
#content.nobootstrap .tooltip .title { display: block; font-weight: 700; padding-bottom: 5px; text-align: center; }
#content.nobootstrap .tooltip:hover .tooltip_content { display: block; }
#content.nobootstrap .tooltip_button { background: linear-gradient(top, #dddddd, #aaaaaa); border: 1px solid silver; color: #666; padding: 0 3px; }
#content.nobootstrap #carrier_form label { padding-top: 0; }
#content.nobootstrap #carrier_form input { margin-top: 3px; }
#content.nobootstrap #large_scene_image { border: 1px solid transparent; clear: both; }
#content.nobootstrap #moduleContainer .table tr:hover { background-color: #FFF1B5; }
#content.nobootstrap #moduleContainer .button.updated { display: inline-block; font-size: 12px; margin-top: 15px; }
#content.nobootstrap #list-action-button { width: 175px; }
#content.nobootstrap #list-action-button li { display: inline; float: left; margin-left: 10px; }
#content.nobootstrap #moduleContainer .moduleName { color: #3A6EA7; font-size: 12px; font-weight: 700; }
#content.nobootstrap #moduleContainer .moduleFavDesc { color: #666; font-family: Georgia; font-style: italic; }
#content.nobootstrap .button:hover, #content.nobootstrap .button:active, #content.nobootstrap #content .qq-upload-button:hover { border: 1px solid #939393; }
#content.nobootstrap #header #employee_infos a:hover, #content.nobootstrap #header #header_infos a#header_logout:hover, #content.nobootstrap #header #header_infos a#header_foaccess:hover, #content.nobootstrap #header #menu li.active a.title, #content.nobootstrap #header #menu li:hover a.title, #content.nobootstrap #header #menu .submenu li.active a { color: #fff; }
#content.nobootstrap .notifs_wrapper p.no_notifs, #content.nobootstrap .productTabs ul li.tab-row, #content.nobootstrap #modules_list_container_tab table tr td tr td, #content.nobootstrap .default_modules_list_display_type #modules_list_container_content li table tr td { border: none; }
#content.nobootstrap #header #menu .submenu li a:hover, #content.nobootstrap .blocEngine { background-color: #eee; }
#content.nobootstrap .table .filter, #content.nobootstrap #statsContainer #calendar p, #content.nobootstrap #referrersContainer #calendar p { margin: 2px; }
#content.nobootstrap .table tr.row_hover:hover td, #content.nobootstrap .selected-line { background: #fff1b5; }
#content.nobootstrap #tabPane1 td.col-left, #content.nobootstrap #product-tab-content-3-Associations .Association td.col-left, #content.nobootstrap .margin-form select.chosen { width: 200px; }
#content.nobootstrap .path_bar a, #content.nobootstrap .cat_bar a { font-weight: 700; }
#content.nobootstrap a.module_toggle_all, #content.nobootstrap #footer .footer_link, #content.nobootstrap #footer .footer_link:hover { color: #268CCD; }
#content.nobootstrap #upgradeNow, #content.nobootstrap .button-autoupgrade { border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3; border-right: 1px solid #DFD5AF; border-style: solid; border-width: 1px; color: #268CCD; font-size: medium; padding: 5px; }
#content.nobootstrap .toolbar-placeholder, #content.nobootstrap .tooltip { position: relative; }
#content.nobootstrap .toolbarBox .process-icon-preview, #content.nobootstrap .toolbarBox .process-icon-save-and-preview { background-image: url(../img/process-icon-preview.png); }
#content.nobootstrap .toolbarBox .process-icon-cancel, #content.nobootstrap .toolbarBox .toolbar-cancel, #content.nobootstrap .toolbarBox .process-icon-cancel { background-image: url(../img/process-icon-cancel.png); }
#content.nobootstrap .toolbarBox .process-icon-new, #content.nobootstrap .toolbarBox .toolbar-new, #content.nobootstrap .toolbarBox .process-icon-newAttributes, #content.nobootstrap .toolbarBox .toolbar-new, #content.nobootstrap .toolbarBox .process-icon-new, #content.nobootstrap .toolbarBox .process-icon-newAttributes { background-image: url(../img/process-icon-new.png); }
#content.nobootstrap .toolbarBox .process-icon-save, #content.nobootstrap .toolbarBox .process-icon-save, #content.nobootstrap .toolbarBox .process-icon-save-settings { background-image: url(../img/process-icon-save.png); }
#content.nobootstrap .toolbarBox .process-icon-import, #content.nobootstrap .toolbarBox .process-icon-export, #content.nobootstrap .toolbarBox .process-icon-export-stock-state-quantities-csv, #content.nobootstrap .toolbarBox .process-icon-export-csv-orders, #content.nobootstrap .toolbarBox .process-icon-export-stock-mvt-csv { background-image: url(../img/process-icon-export-csv.png); }
#content.nobootstrap .toolbarBox .process-icon-export-all, #content.nobootstrap .toolbarBox .process-icon-export-stock-state-prices-csv, #content.nobootstrap .toolbarBox .process-icon-export-csv-details { background-image: url(../img/process-icon-export-csv-details.png); }
#content.nobootstrap .productTabs ul li.tab-row:first-child a, #content.nobootstrap .sidebar ul.categorieList li:first-child { border-top: none; }
#content.nobootstrap .product-tab-content h4.tab, #content.nobootstrap .sidebar .categorieStatus { display: none; }
#content.nobootstrap .filter-module #filternameForm, #content.nobootstrap .filter-stock #stock_instant_state, #content.nobootstrap .filter-stock-extended #stock_cover, #content.nobootstrap .filter-stock-extended #supply_orders { float: left; margin-right: 30px; }
#content.nobootstrap .filter-module label, #content.nobootstrap .filter-stock label, #content.nobootstrap .filter-stock-extended label { width: auto; }
#content.nobootstrap .filter-module .select-filter, #content.nobootstrap .filter-stock .select-filter, #content.nobootstrap .filter-stock-extended .select-filter, #content.nobootstrap #statsContainer #calendar form, #content.nobootstrap #referrersContainer #calendar form, #content.nobootstrap #statsContainer #calendar input, #content.nobootstrap #statsContainer #calendar p, #content.nobootstrap #referrersContainer #calendar input, #content.nobootstrap #referrersContainer #calendar p, #content.nobootstrap #iframe #video-content, #content.nobootstrap .view-modules li { float: left; }
#content.nobootstrap .filter-module .button-filter, #content.nobootstrap .filter-stock .button-filter, #content.nobootstrap .filter-stock-extended .button-filter, #content.nobootstrap #addons_login_div form#addons_login_form, #content.nobootstrap #modules_list_container_tab .row-actions-module { float: right; }
#content.nobootstrap #statsContainer #calendar input.submitDateDay, #content.nobootstrap #referrersContainer #calendar input.submitDateDay, #content.nobootstrap #statsContainer #calendar input.submitDateDayPrev, #content.nobootstrap #referrersContainer #calendar input.submitDateDayPrev { border-right: none; }
#content.nobootstrap #statsContainer #calendar input.submitDateYear, #content.nobootstrap #referrersContainer #calendar input.submitDateYear, #content.nobootstrap #statsContainer #calendar input.submitDateYearPrev, #content.nobootstrap #referrersContainer #calendar input.submitDateYearPrev { border-left: none; margin-right: 10px; }
#content.nobootstrap #statsContainer .blocStats h2.icon-statscatalog span, #content.nobootstrap #statsContainer .blocStats h2.icon-category span { background-position: -36px -16px; }
#content.nobootstrap #moduleContainer .table tr th, #content.nobootstrap #modules_list_container_tab table tr th, #content.nobootstrap #modulePosition .table tr th { height: 40px; }
#content.nobootstrap #moduleContainer .table tr:first-child, #content.nobootstrap #modules_list_container_tab table tr:first-child { border-top: 1px solid #ccc; }
#content.nobootstrap #moduleContainer .table tr td .imgm, #content.nobootstrap #modules_list_container_tab .imgm, #content.nobootstrap #modules_list_container_tab .imgm { width: 32px; }
#content.nobootstrap #moduleContainer .moduleDesc h3, #content.nobootstrap #moduleContainer .moduleGridDesc h3, #content.nobootstrap #modules_list_container_tab .moduleGridDesc h3 { color: #3A6EA7; margin: 0; }
#content.nobootstrap #moduleContainer .moduleDesc .metadata, #content.nobootstrap #modules_list_container_tab .moduleDesc .metadata { display: block; float: left; margin: 5px 0; }
#content.nobootstrap #moduleContainer .moduleDesc .metadata dl, #content.nobootstrap #modules_list_container_tab .moduleDesc .metadata dl { float: left; margin: 0; padding-right: 10px; }
#content.nobootstrap #moduleContainer .moduleDesc .metadata dl dt, #content.nobootstrap .moduleDesc .metadata dl dd, #content.nobootstrap #modules_list_container_tab .moduleDesc .metadata dl dt, #content.nobootstrap .moduleDesc .metadata dl dd { float: left; margin: 0; padding: 0; }
#content.nobootstrap #moduleContainer .moduleDesc .metadata dl dd, #content.nobootstrap #modules_list_container_tab .moduleDesc .metadata dl dd { padding-right: 10px; }
#content.nobootstrap #moduleContainer .moduleDesc .metadata dl dt, #content.nobootstrap #modules_list_container_tab .moduleDesc .metadata dl dt { font-weight: 700; padding-right: 5px; }
#content.nobootstrap #moduleContainer .setup.must-have, #content.nobootstrap #modules_list_container_tab .setup.non-install, #content.nobootstrap #modules_list_container_tab .setup.must-have { background-color: #ec7000; }
#content.nobootstrap #moduleContainer .row-actions-module span, #content.nobootstrap #modules_list_container_tab .row-actions-module span, #content.nobootstrap .view-modules li img { padding-right: 5px; }
#content.nobootstrap #moduleContainer .row-actions-module span a, #content.nobootstrap #modules_list_container_tab .moduleDesc, #content.nobootstrap #modules_list_container_tab .row-actions-module span a, #content.nobootstrap select#show_modules { font-size: 12px; }
#content.nobootstrap #moduleContainer ul.listing-grid-module, #content.nobootstrap #modules_list_container_tab ul.listing-grid-module { margin: 0; padding: 0; position: relative; }
#content.nobootstrap #moduleContainer ul.listing-grid-module li, #content.nobootstrap #modules_list_container_tab ul.listing-grid-module li { border: 1px solid #ccc; float: left; margin: 10px; min-height: 30px; padding: 5px; width: 400px; }
#content.nobootstrap #moduleContainer .moduleGridDesc, #content.nobootstrap #modules_list_container_tab .moduleGridDesc { display: block; height: 30px; position: relative; }
#content.nobootstrap #moduleContainer ul.listing-grid-module li select, #content.nobootstrap #modules_list_container_tab ul.listing-grid-module li select { position: absolute; right: 0; top: 0; }
#content.nobootstrap body { color: #000; font-size: 12px; margin: 0; padding: 0; }
#content.nobootstrap a img { border: 0; }
#content.nobootstrap a { color: #000; outline: 0; text-decoration: none; }
#content.nobootstrap a:hover { color: #222; text-decoration: none; }
#content.nobootstrap a.link, #content.nobootstrap a.link:hover { color: #999; }
#content.nobootstrap p { color: #585A69; margin: .5em 0; }
#content.nobootstrap hr { border: none; margin-bottom: 10px; margin-top: 10px; padding: 0; }
#content.nobootstrap .blue { color: #268CCD; }
#content.nobootstrap .red { color: red; }
#content.nobootstrap form p { margin: .5em 0 0; padding: 0 0 .5em; }
#content.nobootstrap form sup { color: #C00; font-weight: 700; vertical-align: text-top; }
#content.nobootstrap form .simulate-disable-input { background-color: #ddd; border: 1px solid #E0D0B1; color: #666; display: inline-block; font-size: 12px; min-width: 127px; padding: 3px; }
#content.nobootstrap .block-mail { margin: 0 0 20px; }
#content.nobootstrap .mail-form { color: #7F7F7F; font-size: .85em; margin: 0 0 0 220px; width: auto; }
#content.nobootstrap .label-subject { margin: 0 0 10px; padding: 0; text-align: left; }
#content.nobootstrap .mails_field { background: none repeat scroll 0 0 #FFF; border: 1px solid #CCC; font-size: 1.1em; margin: 20px 0; padding: 0; position: relative; }
#content.nobootstrap .mails_field h3 { background: 0 repeat-x scroll left top #ECECEC; color: #333; display: block; font-size: 1em; margin: 0; padding: 10px 5px; text-align: left; }
#content.nobootstrap .margin-form { color: #7F7F7F; font-size: .85em; padding: 0 0 1em 260px; }
#content.nobootstrap .margin-form .normal-text { color: #000; display: block; font-size: 1.2em; padding-top: .2em; }
#content.nobootstrap fieldset.width1 .margin-form { margin: 0 0 1em 130px; }
#content.nobootstrap fieldset img { padding: 0 4px 0 0; vertical-align: bottom; }
#content.nobootstrap label { float: left; font-weight: 700; padding: .2em .5em 0 0; text-align: right; width: 250px; }
#content.nobootstrap #preview_import label { float: left; font-weight: 700; padding: .2em 0 0; text-align: left; width: 320px; }
#content.nobootstrap label.t { clear: none; float: none; font-size: 12px; font-weight: 400; margin: 0; padding: 0 5px; }
#content.nobootstrap label.child { clear: none; float: none; font-size: 12px; font-weight: 400; margin: 0; padding: 0; }
#content.nobootstrap label.std { display: block; float: none; font-size: 12px; font-weight: 700; margin: 0; text-align: right; width: 170px; }
#content.nobootstrap form div.std { margin-top: -2em; }
#content.nobootstrap fieldset.width1 label { width: 110px; }
#content.nobootstrap input, #content.nobootstrap textarea, #content.nobootstrap option { color: #000; font-size: 12px; margin: 0; padding: 0; }
#content.nobootstrap input[type=text], #content.nobootstrap input[type=password], #content.nobootstrap input[type=file], #content.nobootstrap textarea { padding: 2px 4px; }
#content.nobootstrap input[type=radio], #content.nobootstrap input[type=checkbox] { background-color: transparent; }
#content.nobootstrap input:focus, #content.nobootstrap textarea:focus { border: 1px solid #3293D6; }
#content.nobootstrap select optgroup { background: #fff; color: #000; padding: 2px; }
#content.nobootstrap select optgroup option { color: #000; padding: 0 9px; }
#content.nobootstrap .lab_modules_positions { cursor: pointer; display: block; float: none; font-weight: 400; padding: 0; text-align: left; width: 500px; }
#content.nobootstrap .lab_modules { cursor: pointer; display: block; float: none; font-weight: 400; padding-left: 10px; text-align: left; width: 500px; }
#content.nobootstrap .lab_modules_positions img { float: left; height: 32px; width: 32px; }
#content.nobootstrap #container { margin: 0 auto 2em; text-align: left; }
#content.nobootstrap #main { background: #fff; clear: left; min-height: 600px; }
#content.nobootstrap #content { padding: 1.25em 1.25em .5em; position: relative; }
#content.nobootstrap #news { border: 1px solid #E0D0B1; width: 640px; }
#content.nobootstrap #help { border: 1px solid #DFD5C3; float: right; font-size: .9em; padding: 4px; width: 150px; }
#content.nobootstrap #image { background: #fff; border: 1px solid #DFD5C3; float: none; font-size: .9em; padding: 6px; text-align: center; }
#content.nobootstrap #product_link { clear: right; float: right; font-size: .9em; margin-top: 8px; padding: 4px; text-align: center; width: 240px; }
#content.nobootstrap #nav { float: right; font-size: 1.1em; font-weight: 700; margin: 1em 0; vertical-align: middle; }
#content.nobootstrap #nav li { display: inline; list-style: none; margin: 0 0 0 2em; }
#content.nobootstrap #nav img { vertical-align: bottom; }
#content.nobootstrap .warn .pico { margin: 0; padding: 0; vertical-align: middle; }
#content.nobootstrap #content .alert { background-color: #FFE6E6; border-bottom: 1px solid #DF7B7B; border-top: 1px solid #DF7B7B; margin: 0 0 15px; padding: 10px 15px; width: auto; }
#content.nobootstrap #content .warning { background-color: #FFEBCC; border-bottom: 1px solid #F90; border-top: 1px solid #F90; line-height: 20px; margin: 0 0 15px; padding: 10px 20px; }
#content.nobootstrap #unhook_button_position_bottom { overflow: hidden; padding-top: 10px; width: 100%; }
#content.nobootstrap #unhook_button_position_top { overflow: hidden; width: 100%; }
#content.nobootstrap #content .conf, #content.nobootstrap #content .warn, #content.nobootstrap #content .error { color: #383838; font-size: 12px; font-weight: 400; line-height: 20px; margin: 0 0 10px; min-height: 28px; padding: 13px 5px 5px 40px; }
#content.nobootstrap #content .conf img, #content.nobootstrap #content .warn img, #content.nobootstrap #content .error img { margin: 0 5px 0 0; }
#content.nobootstrap #content .error { background: #ffbaba url(../img/admin/icon-cancel.png) no-repeat scroll 6px 6px; border: 1px solid #C00; color: #D8000C; }
#content.nobootstrap #content .conf a, #content.nobootstrap #content .warn a, #content.nobootstrap #content .error a { color: #D8000C; font-weight: 700; }
#content.nobootstrap #ajax_confirmation .error { background: #ffbaba url(../img/admin/icon-cancel.png) no-repeat scroll 6px 6px; border: 1px solid #C00; bottom: 0; color: #D8000C; left: 0; padding: 20px 40px; position: fixed; width: 100%; }
#content.nobootstrap #ajax_confirmation .conf { background: #dff2bf url(../img/admin/icon-valid.png) no-repeat scroll 6px 6px; border: 1px solid #4F8A10; bottom: 0; color: #4F8A10; left: 0; padding: 20px 40px; position: fixed; width: 100%; }
#content.nobootstrap #content .warn { background: #feefb3 url(../img/admin/icon-attention.png) no-repeat scroll 6px 6px; border: 1px solid #9e6014; color: #9e6014; }
#content.nobootstrap #content .warn ul li, #content.nobootstrap #content .warn p, #content.nobootstrap #content .warn a { color: #9e6014; }
#content.nobootstrap #content .warn ul li label { color: #9e6014; font-weight: 400; }
#content.nobootstrap #content .error ol { clear: both; margin-top: 5px; padding-bottom: 0; }
#content.nobootstrap #content .error ol li { font-weight: 200; margin-left: 30px; }
#content.nobootstrap #content .confirm h3 { background: url(../img/admin/ok.gif) no-repeat 0 0; padding: 0 0 0 20px; }
#content.nobootstrap #blockNewVersionCheck .warn h3 { background: none; margin: 0; padding: 0 0 0 5px; }
#content.nobootstrap .column { float: left; margin: 0 50px 1.5em 0; padding: 10px; text-align: center; width: 173px; }
#content.nobootstrap #col_1 { background: #ff8c76 url(../img/admin/col_1.gif) no-repeat; color: #FFF; height: 235px; }
#content.nobootstrap #col_2 { background: #ffc44f url(../img/admin/col_2.gif) no-repeat; color: #FFF; height: 235px; }
#content.nobootstrap #col_3 { background: #8cff70 url(../img/admin/col_3.gif) no-repeat; color: #FFF; height: 235px; }
#content.nobootstrap #news img { padding: 0 6px 0 0; vertical-align: middle; }
#content.nobootstrap #news .infos, #content.nobootstrap #news .content { font-family: Arial,Helvetica,sans-serif; font-weight: 400; margin: 0; padding: 4px; }
#content.nobootstrap .table tr.last td { border-bottom: none; }
#content.nobootstrap .footer_link, #content.nobootstrap .footer_link:hover { color: #812143; font-weight: 700; text-decoration: underline; }
#content.nobootstrap h3.title { border: none; clear: both; margin: 0; padding: 4px 10px; }
#content.nobootstrap h3.subtitle { color: #FF8D42; font-size: 1.2em; }
#content.nobootstrap p.infos { float: right; font-size: .9em; line-height: 1em; margin: 0; padding: 0; vertical-align: top; }
#content.nobootstrap .width1 { width: 350px; }
#content.nobootstrap .width2 { width: 500px; }
#content.nobootstrap .width3 { width: 600px; }
#content.nobootstrap .width4 { width: 745px; }
#content.nobootstrap .width5 { width: 655px; }
#content.nobootstrap tr.deleted td { background-color: #EEE; }
#content.nobootstrap .contextnav { border: 1px solid #E0D0B1; line-height: 1.3em; margin: 10px 0; padding: 3px 6px; }
#content.nobootstrap .contextnav img { vertical-align: text-top; }
#content.nobootstrap .contextnavleft { float: left; width: 6em; }
#content.nobootstrap .contextnavcenter a, #content.nobootstrap .contextnavcenter b { letter-spacing: 6pt; }
#content.nobootstrap .contextnavright { float: right; text-align: right; width: 6em; }
#content.nobootstrap .hidden { border-color: #fff; border-style: solid; border-width: 1px 0 0; height: 1px; }
#content.nobootstrap .flatclear { clear: both; height: 0; line-height: 0; }
#content.nobootstrap .space { margin-top: 13px; }
#content.nobootstrap .pspace { padding-top: 1em; }
#content.nobootstrap .double-space { margin-top: 2em; }
#content.nobootstrap .space-bottom { margin-bottom: 1em; }
#content.nobootstrap .double-bottom-space { margin-bottom: 2em; }
#content.nobootstrap .center { text-align: center !important; }
#content.nobootstrap .right { text-align: right; }
#content.nobootstrap .small { font-size: .85em; }
#content.nobootstrap .uppercase { text-transform: uppercase; }
#content.nobootstrap .highlight { background-color: #FF6; font-weight: 700; }
#content.nobootstrap .discount_name { background: #FFEBCC; padding: 2px; text-transform: uppercase; }
#content.nobootstrap .displayed_flag { float: left; margin: 4px 0 0 4px; }
#content.nobootstrap .language_flags { background: #FFF; border: 1px solid #555; display: none; float: left; margin: 4px; padding: 8px; width: 80px; }
#content.nobootstrap .pointer { cursor: pointer; }
#content.nobootstrap .imgm { margin: 3px 0; }
#content.nobootstrap .green { color: #228B22; }
#content.nobootstrap .bullet { display: list-item; list-style: disc; margin-left: 30px; }
#content.nobootstrap #ajax_confirmation { padding-bottom: 6px; padding-top: 3px; }
#content.nobootstrap .hint { background: #bde5f8 url(../img/admin/icon-info.png) no-repeat 6px 5px; border: 1px solid #00529B; color: #00529B; display: none; margin-bottom: 2px; margin-top: 4px; min-height: 15px; padding: 15px 5px 15px 40px; position: absolute; z-index: 10; }
#content.nobootstrap .hint p { color: #00529B; }
#content.nobootstrap .hint .addImageDescription { font-size: 16px; font-weight: 700; }
#content.nobootstrap div.hint ul li { color: #00529B; padding-left: 5px; }
#content.nobootstrap table tr th .hint { background: #fffbe5 url(../img/admin/icon-info.png) no-repeat 6px 5px; border: 1px solid #ECE52F; color: #383838; display: none; margin: 30px 5px 5px; padding: 8px 6px 8px 34px; position: absolute; width: 400px; }
#content.nobootstrap .hintGroup { background: #dde9f7 url(../img/admin/help2.png) no-repeat 6px 5px; border: 1px solid #50B0EC; color: #383838; margin-bottom: 10px; margin-top: 10px; padding: 8px 6px 8px 40px; position: relative; }
#content.nobootstrap .hint .hint-pointer { height: 19px; left: -10px; position: absolute; top: 5px; width: 10px; }
#content.nobootstrap #flagsLanguage img { margin-bottom: -4px; padding: 3px; }
#content.nobootstrap #flagsLanguage .selected_language { border: 1px solid #BBB; margin-bottom: -4px; padding: 2px; }
#content.nobootstrap .disable, #content.nobootstrap .disable:hover { background-color: #CCC; color: #AAA; }
#content.nobootstrap .ajax-warning, #content.nobootstrap .ajax-success, #content.nobootstrap .ajax-error { border: 1px solid #CCC; margin: 5px; padding: 5px 20px; width: 70%; }
#content.nobootstrap .ajax-warning { background-color: #FFBD6F; }
#content.nobootstrap .ajax-success { background-color: #9FDF8B; }
#content.nobootstrap .ajax-error { background-color: #FF7F84; }
#content.nobootstrap .ajax-loader { margin: 5px 10px; }
#content.nobootstrap .productFieldComment { color: #7F7F7F; font-size: .8em; }
#content.nobootstrap a.confirm_yes, #content.nobootstrap a.confirm_no { border-style: solid; border-width: 1px; color: #FFF; font-weight: 700; margin-left: 60px; padding: 10px; text-align: center; width: 50px; }
#content.nobootstrap a.confirm_yes { background-color: red; border-color: red; }
#content.nobootstrap a.confirm_no { background-color: green; border-color: green; }
#content.nobootstrap form#import_form { margin-bottom: 20px; margin-left: 15px; padding-bottom: 22px; }
#content.nobootstrap .table_overflow { height: 500px; overflow: auto; width: 900px; }
#content.nobootstrap .new_message { background-color: #FFE35C; }
#content.nobootstrap .myDragClass { background-color: #FA5; }
#content.nobootstrap .dragHandle { cursor: move; }
#content.nobootstrap p#mailResultCheck { font-size: 12px; margin: 2px 0; padding-left: 18px; }
#content.nobootstrap p.ok { background: url(../img/admin/enabled.gif) no-repeat top left; color: green; }
#content.nobootstrap p.fail { background: url(../img/admin/disabled.gif) no-repeat top left; color: red; font-weight: 700; }
#content.nobootstrap #lang_pack_msg { border: 1px solid #DFD5C3; margin-bottom: 10px; padding: 10px; }
#content.nobootstrap span.defaultSkin .mceToolbar { height: auto; }
#content.nobootstrap table.permissions { border: 1px solid #DFD5C3; }
#content.nobootstrap table.permissions th { background: #FFF6D3; height: 20px; text-align: center; }
#content.nobootstrap table.permissions td { padding: 5px; text-align: center; }
#content.nobootstrap .path_bar { background-color: #EFEFEF; font-family: Arial; font-size: 13px; margin-bottom: 20px; padding: 5px; }
#content.nobootstrap .adminHeader h1 { color: #812143; font-family: Arial; font-size: 18pt; margin: 0; }
#content.nobootstrap #adminHeader hr { background-color: #812143; margin: 0; }
#content.nobootstrap #header_shoplist { background-image: url(../img/t/AdminShop.gif); background-position: 0 3px; background-repeat: no-repeat; height: 20px; padding-left: 17px; }
#content.nobootstrap #header_shoplist select.shopList option { padding: 2px; }
#content.nobootstrap #header_shoplist select.shopList .first { background-color: #408BD5; color: #fff; font-weight: 700; }
#content.nobootstrap #header_shoplist select.shopList .group { background-color: #C6DEFC; font-style: italic; font-weight: 700; padding-left: 10px; }
#content.nobootstrap #header_shoplist select.shopList .shop { background-color: #EAF2FC; padding-left: 20px; }
#content.nobootstrap .multishop_info { background: #bde5f8 url(../img/admin/icon-info.png) no-repeat 6px 5px; border: 1px solid #00529B; color: #00529B; margin-bottom: 10px; margin-top: 4px; min-height: 32px; padding: 13px 5px 0 40px; }
#content.nobootstrap .assoShop { max-height: 300px; max-width: 600px; overflow: auto; width: 100%; }
#content.nobootstrap .clearfix:after { clear: both; content: "."; display: block; height: 0; line-height: 0; visibility: hidden; }
#content.nobootstrap .clearfix { display: inline-block; }
#content.nobootstrap * html .clearfix { height: 1%; }
#content.nobootstrap #adminHeader #help_img { float: right; margin-top: 5px; }
#content.nobootstrap #adminpresentation { position: relative; width: 100%; }
#content.nobootstrap #listpresentation { float: left; width: 100px; }
#content.nobootstrap #iframe { background: #DDD; border: 1px solid #666; float: left; height: 220px; margin: 10px; width: 450px; }
#content.nobootstrap #list_video { float: left; width: 220px; }
#content.nobootstrap #list_video h3 { color: #882F4F; font-size: 12pt; margin: 0; padding-top: 25px; }
#content.nobootstrap #list_video ul { margin: 0; padding: 0; text-align: left; }
#content.nobootstrap #list_video ul li { float: left; margin-top: 5px; padding-left: 25px; text-decoration: underline; width: 195px; }
#content.nobootstrap #footer { padding-top: 5px; }
#content.nobootstrap #footer_iframe_home { position: absolute; right: 0; top: 0; }
#content.nobootstrap #footer_iframe_home label { color: #585A69; float: none; font-weight: 400; line-height: 15px; }
#content.nobootstrap #footer_iframe_home input { margin-left: 10px; }
#content.nobootstrap #footer_iframe_home a { color: #903E5B; float: right; margin: 0 15px 0 0; text-decoration: underline; }
#content.nobootstrap #column_left { float: left; padding-top: 5px; width: 49.1%; }
#content.nobootstrap #column_right { float: right; padding: 0; width: 49.1%; }
#content.nobootstrap #column_right .table_info { float: left; width: 48.1%; }
#content.nobootstrap #column_right #table_info_last.table_info { float: right; width: 48.1%; }
#content.nobootstrap .F_list { list-style: none; margin: 0; padding: 0; }
#content.nobootstrap #first_block a, #content.nobootstrap #second_block a, #content.nobootstrap #third_block a, #content.nobootstrap #fourth_block a, #content.nobootstrap #fifth_block a, #content.nobootstrap #sixth_block a, #content.nobootstrap #seventh_block a, #content.nobootstrap #eighth_block a { background: #F8F8F8 none no-repeat scroll center 25px; }
#content.nobootstrap #first_block a { background-image: url(../img/admin/package_go.png); }
#content.nobootstrap #second_block a { background-image: url(../img/admin/cart_add.png); }
#content.nobootstrap #third_block a { background-image: url(../img/admin/book.png); }
#content.nobootstrap #fourth_block a { background-image: url(../img/admin/package_add.png); }
#content.nobootstrap #fifth_block a { background-image: url(../img/admin/plugin_add.png); }
#content.nobootstrap #sixth_block a { background-image: url(../img/admin/cart_remove.png); }
#content.nobootstrap #seventh_block a { background-image: url(../img/admin/page_white_add.png); }
#content.nobootstrap #eighth_block a { background-image: url(../img/admin/abandonedcart.png); }
#content.nobootstrap .F_list li { display: block; float: left; margin-bottom: 15px; margin-right: 15px; }
#content.nobootstrap .F_list li h4 { font-size: 11px; font-weight: 400; line-height: 15px; margin-bottom: 0; margin-top: 55px; width: 95px; }
#content.nobootstrap .F_list a { border: 1px solid #ccc; color: #333; float: left; height: 95px; padding: 5px; text-align: center; width: 95px; }
#content.nobootstrap .F_list a:hover { border: 1px solid #666; }
#content.nobootstrap .F_list li p { display: none; font-size: 8pt; }
#content.nobootstrap .table_info { background-color: #fff; border: 1px solid #ccc; float: left; margin: 0; padding: 0; }
#content.nobootstrap .table_info h5 { background: #ECECEC; color: #000; display: block; font-size: 16px; font-weight: 400; margin: 0; padding: 6px; }
#content.nobootstrap .table_info h5 a, #content.nobootstrap .admin-box1 h5 a { color: #000; float: right; font-size: 8pt; font-weight: 400; padding-right: 10px; text-decoration: underline; }
#content.nobootstrap .admin-box2 h5 a { color: #FFF; float: right; font-size: 8pt; font-weight: 400; padding-right: 10px; text-decoration: underline; }
#content.nobootstrap .admin-box1 a#optimizationTipsFold img { padding: 5px 0; }
#content.nobootstrap #table_info_last { float: left; margin-left: 0; }
#content.nobootstrap .table_info_details { border: none; border-collapse: collapse; }
#content.nobootstrap .table_info_details tr { border: none; color: #000; font-weight: 700; height: 30px; padding-left: 5px; text-align: center; width: 100%; }
#content.nobootstrap .tr_odd { background-color: #eff4f9; }
#content.nobootstrap .table_info_details tr td.td_align_left { font-size: 13px; font-weight: 400; padding-left: 10px; text-align: left; }
#content.nobootstrap .table_info_details tr td { font-size: 16px; padding-right: 10px; text-align: right; white-space: nowrap; }
#content.nobootstrap #table_info_large { background-color: #fff; border: 1px solid #ccc; float: left; margin-bottom: 20px; margin-top: 20px; padding: 0; width: 100%; }
#content.nobootstrap #table_info_large h5 { background: #ECECEC; color: #000; display: block; font-size: 12pt; font-weight: 400; line-height: 29px; margin: 0; padding-left: 15px; }
#content.nobootstrap #table_info_large h5 a { color: #000; float: right; font-size: 8pt; font-weight: 400; padding-right: 8px; text-decoration: underline; }
#content.nobootstrap #stat_google { background-color: #fff; height: 175px; margin: 15px auto; text-align: center; width: 586px; }
#content.nobootstrap .admin-box1 { background-color: #F8F8F8; border: 1px solid #ccc; float: left; font-size: 8pt; margin-bottom: 20px; padding: 0; width: 48.1%; }
#content.nobootstrap .admin-box2 { background-color: #f2f2f2; border: 1px solid #CCC; float: right; font-size: 8pt; margin-bottom: 20px; padding: 0; width: 100%; }
#content.nobootstrap #discover_prestashop { float: right !important; width: 48.1% !important; }
#content.nobootstrap .admin-home-box-list li img { margin: 0 5px; }
#content.nobootstrap .admin-home-box-list { list-style: none; margin: 0; padding-left: 0; }
#content.nobootstrap #prestashop_link { background: transparent none no-repeat 0 0; }
#content.nobootstrap .admin-home-box-list li { margin: 1px; padding: 5px 0; }
#content.nobootstrap #prestashop_link li { height: 58px; margin: 0; }
#content.nobootstrap .admin-home-box-list li p { font-family: Georgia, 'Lucida Grande', Arial; font-size: 13px; font-style: italic; margin: 2px 0; padding: 0 5px 0 15px; }
#content.nobootstrap .admin-home-box-list li a { color: #812143; font-size: 12px; line-height: 18px; text-align: left; }
#content.nobootstrap #prestashop_link li a { color: #3A6EA7; float: left; font-size: 8.5pt; font-weight: 700; line-height: 18px; margin-left: 15px; text-align: left; text-decoration: underline; }
#content.nobootstrap #table_customer { background-color: #fff; border: 1px solid #ccc; border-spacing: 0; padding: 0; }
#content.nobootstrap #table_customer thead span { background: #ECECEC; border-left: none; border-right: none; color: #000; display: block; height: 39px; line-height: 35px; }
#content.nobootstrap #order_id { text-align: center; width: 52px; }
#content.nobootstrap #order_customer { width: 175px; }
#content.nobootstrap #order_status { width: 130px; }
#content.nobootstrap #order_total { width: 100px; }
#content.nobootstrap #table_customer tbody { font-size: 8pt; }
#content.nobootstrap #table_customer tbody tr td.order_td_first { height: 35px; padding: 0; text-align: center; }
#content.nobootstrap #table_customer tbody tr td { border: none; font-size: 12px; height: 35px; }
#content.nobootstrap #table_info_news { border: 1px solid #ccc; float: left; font-size: 8pt; margin-top: 20px; padding: 1px; width: 310px; }
#content.nobootstrap #table_info_news h5 { background-color: #7Ab51D; color: #FFF; font-size: 12pt; line-height: 29px; margin: 0; padding-left: 15px; }
#content.nobootstrap #table_info_news h5 a { color: #FFF; float: right; font-size: 8pt; font-weight: 400; padding-right: 10px; text-decoration: underline; }
#content.nobootstrap #table_info_news ul { list-style: none outside none; margin: 0; padding: 0; }
#content.nobootstrap #block_news_first { background-color: #E1EBD2; padding: 5px; }
#content.nobootstrap #block_news_first a { color: #812143; font-weight: 700; line-height: 18px; text-decoration: underline; }
#content.nobootstrap #block_news_first p { line-height: 12px; margin: 0; padding-left: 10px; }
#content.nobootstrap #block_news_first p a { color: #812143; font-weight: 700; margin-left: 200px; margin-right: 8px; }
#content.nobootstrap #table_info_news ul li a { line-height: 25px; margin: 0; padding-left: 10px; text-decoration: underline; }
#content.nobootstrap .block_news_odd { background-color: #DEDEDE; line-height: 25px; }
#content.nobootstrap #see_newsletter { background: url(../img/admin/email.gif) no-repeat left center; margin-left: 5px; }
#content.nobootstrap #follow_on_facebook { background: url(../img/admin/facebook.jpg) no-repeat left center; margin-left: 5px; }
#content.nobootstrap #follow_on_twitter { background: url(../img/admin/twitter.jpg) no-repeat left center; margin-left: 5px; }
#content.nobootstrap #block_news_last ul li a { color: #812143; padding-left: 20px; }
#content.nobootstrap .viewed { background: url(../img/admin/enabled.gif) no-repeat left center; }
#content.nobootstrap a.blue { color: blue; }
#content.nobootstrap a.blue:hover { color: #00A; }
#content.nobootstrap .cluetip-help-button { background: #f1f2f4 url(../img/admin/block_bg.jpg) repeat-x scroll left bottom; background-color: #FFF; border: 1px solid gray; padding: 10px; text-align: left; width: auto; }
#content.nobootstrap .ac_results ul { background: #FFF; list-style: none; padding: 0; text-align: left; }
#content.nobootstrap .ac_results li { padding: 5px; }
#content.nobootstrap .ac_even { background: #EFEFEF; }
#content.nobootstrap .ac_over { background: #ECEADE; color: #585A69; }
#content.nobootstrap .button-translate { cursor: pointer; height: 15px; margin: 0 0 0 10px; padding: 0; width: 15px; }
#content.nobootstrap #importList label { float: none; }
#content.nobootstrap #importList ul { list-style-type: none; }
#content.nobootstrap .multishop_config { margin-left: -10px; position: absolute; }
#content.nobootstrap .multishop_config div { background-color: #DFFAD3; border: 1px solid #DFD5C3; display: none; margin-top: 2px; padding: 5px; width: 200px; }
#content.nobootstrap .multishop_product_checkbox { position: absolute; }
#content.nobootstrap a.action_module_delete { color: #CB1C00; margin-right: 30px; text-decoration: underline; }
#content.nobootstrap .select_theme { border: 1px solid #FFFFF0; color: #000; cursor: pointer; float: left; font-weight: 700; margin: 10px; padding: 10px; text-align: center; width: 220px; }
#content.nobootstrap .select_theme_choice { background-color: #FAEEC2; border: 1px dotted #000; }
#content.nobootstrap fieldset .optionsDescription, #content.nobootstrap fieldset p.description, #content.nobootstrap .info { background: url(../img/admin/icon-info.png) no-repeat scroll 6px 6px #bde5f8; border: 1px solid #00529B; color: #00529B; font-family: Arial,Verdana,Helvetica,sans-serif; font-size: 12px; margin-bottom: 15px; min-height: 32px; padding: 10px 5px 5px 40px; }
#content.nobootstrap fieldset .optionsDescription ul li { color: #00529B; margin: 0; padding: 0; }
#content.nobootstrap p.product_description { clear: both; color: #7F7F7F; font-family: Georgia, Arial, sans-serif; font-style: italic; text-align: right; }
#content.nobootstrap p.preference_description { clear: both; color: #7F7F7F; font-family: Georgia, Arial, sans-serif; font-size: 11px; font-style: italic; text-align: left; width: 500px; }
#content.nobootstrap .preference_default_multishop { float: left; margin-top: 4px; padding-right: 5px; }
#content.nobootstrap .multishop_warning { background-image: url(../img/admin/warning.gif); background-repeat: no-repeat; color: #FE2744; font-weight: 700; padding-left: 22px; padding-top: 1px; }
#content.nobootstrap .warning_mod_rewrite { background: #feefb3 url(../img/admin/warning.gif) 2px 0 no-repeat; color: #9E6014; font-weight: 700; height: 20px; line-height: 20px; padding: 2px 5px 2px 22px; }
#content.nobootstrap label.conf_title { width: 235px; }
#content.nobootstrap input.disable_me[disabled=disabled] { background-color: red; }
#content.nobootstrap div.progressBarImage { float: left; height: 15px; margin-left: 3px; position: relative; width: 233px; }
#content.nobootstrap #showCounter { float: left; font-weight: 700; margin-left: 25px; margin-top: 1px; }
#content.nobootstrap #listImage { list-style: none outside none; margin-bottom: 10px; margin-top: 10px; }
#content.nobootstrap #listImage li { clear: both; float: left; font-weight: 700; margin-top: 10px; }
#content.nobootstrap #listImage li p.errorImg { background: none repeat scroll 0 0 #FAE2E3; border: 1px solid #EC9B9B; clear: both; display: none; margin-bottom: 18px; padding: 6px; }
#content.nobootstrap #progressBarImage div.ui-progressbar-value { height: 100%; }
#content.nobootstrap #createImageDescription ul.smallImage li { display: block; float: left; list-style-type: none; margin-bottom: 15px; margin-right: 20px; text-align: center; }
#content.nobootstrap #menu .submenu_size .submenu { display: none; position: absolute; }
#content.nobootstrap .submenu li { clear: left; float: none; }
#content.nobootstrap #customers { display: block; position: relative; }
#content.nobootstrap #customer_part #customers ul li { background-color: #fff; border: 1px solid #ccc; display: inline; float: left; list-style-type: none; margin: 10px; padding: 5px; width: 200px; }
#content.nobootstrap #customer_part #customers ul li div.customerName { background-color: #eee; font-size: 14px; padding: 2px; }
#content.nobootstrap #customer_part #customers ul li div.customerName .customerBirthday { float: right; font-size: 12px; }
#content.nobootstrap #customer_part #customers ul li div.customerEmail a { color: #666; display: block; font-size: 12px; line-height: 20px; }
#content.nobootstrap #address_part #address_delivery, #content.nobootstrap #address_part #address_invoice { float: left; width: 400px; }
#content.nobootstrap #address_part #address_delivery h3, #content.nobootstrap #address_part #address_invoice h3 { margin-top: 0; }
#content.nobootstrap #address_part #address_delivery { border-right: 1px solid #ccc; }
#content.nobootstrap #address_part #address_invoice { border-left: 1px solid #fff; padding-left: 20px; }
#content.nobootstrap #address_part #address_delivery_detail, #content.nobootstrap #address_invoice #address_invoice_detail { color: #585A69; font-size: 12px; line-height: 18px; padding: 10px 0; }
#content.nobootstrap #address_part a#new_address { clear: both; float: left; margin: 20px 0; }
#content.nobootstrap #summary_part b { border: 1px solid red; display: block; float: left; }
#content.nobootstrap #summary_part #total_products, #content.nobootstrap #summary_part #total_vouchers, #content.nobootstrap #summary_part #total_shipping, #content.nobootstrap #summary_part #total_without_taxes, #content.nobootstrap #summary_part #total_taxes, #content.nobootstrap #summary_part #total_with_taxes { color: #000; font-size: 20px; font-weight: 400; }
#content.nobootstrap #summary_part .currency_sign { font-weight: 400; }
#content.nobootstrap #summary_part .order_message_right { border-left: 1px solid #ccc; float: left; }
#content.nobootstrap #cart_summary { border-right: 1px solid #fff; float: left; width: 400px; }
#content.nobootstrap #cart_summary ul li { float: left; margin-bottom: 20px; padding: 5px; position: relative; width: 185px; }
#content.nobootstrap #cart_summary ul li .total_cart { display: block; font-size: 12px; }
#content.nobootstrap #loader_container { background: transparent url(../img/bg_loader.png) repeat 0 0; display: none; height: 100%; left: 0; position: absolute; top: 0; width: 100%; z-index: 100; }
#content.nobootstrap #loader { background: url(../img/loader.gif); color: #fff; display: none; height: 24px; margin: 0 auto; width: 24px; }
#content.nobootstrap ul.connectedSortable { padding-left: 0; }
#content.nobootstrap ul.connectedSortable li.module_list { background: #F6F6F6; border: 1px solid #CCC; color: #1C94C4; font-size: 1.2em; font-weight: 700; margin: 0 5px 5px; outline: none; padding: 5px; }
#content.nobootstrap .input-error { color: #D8000C; display: none; font-size: 12px; font-weight: 400; line-height: 20px; margin: 0 0 10px; padding: 10px 15px; }
#content.nobootstrap #CustomerThreadContacts div.blocSAV { background-color: #f8f8f8; border: 1px solid #ccc; float: left; margin: 0 10px 10px 0; min-height: 178px; width: 24%; }
#content.nobootstrap #CustomerThreadContacts p { border-bottom: 1px solid #ccc; border-top: 1px solid #fff; font-family: Georgia,Arial, Helvetica; font-size: 13px; font-style: italic; height: 45px; line-height: 18px; margin: 0 auto; overflow: hidden; padding: 10px; text-align: center; }
#content.nobootstrap #CustomerThreadContacts .message-mail { border-top: 1px solid #fff; display: block; margin: 0 auto; padding: 25px 10px; text-align: center; }
#content.nobootstrap #CustomerThreadContacts h3 { background: #ECECEC; border-bottom: 1px solid #ccc; font-size: 16px; font-weight: 400; height: 25px; line-height: 25px; margin: 0; overflow: hidden; padding: 5px 10px; }
#content.nobootstrap #CustomerThreadContacts a { border: 0; display: block; height: 23px; line-height: 23px; padding: 0 5px; }
#content.nobootstrap #CustomerThreadContacts h4 { border: 0; height: 23px; line-height: 23px; margin: 0; padding: 0 5px; }
#content.nobootstrap #CustomerThreadContacts div#CustomerService { background: none; border: none; float: left; width: 24%; }
#content.nobootstrap #CustomerThreadContacts div#CustomerService table.table thead { border: 0; font-weight: 700; height: 23px; line-height: 23px; margin: 0; padding: 0 5px; text-align: center; }
#content.nobootstrap #CustomerThreadContacts div#CustomerService table.table tr td span { font-size: 14px; font-weight: 700; }
#content.nobootstrap #ChangeStatus { float: right; margin: 20px 20px 0 0; right: 10px; }
#content.nobootstrap #CustomerService table { border-collapse: collapse; }
#content.nobootstrap #CustomerService .table tr.alt_row { background-color: #EFF4F9; }
#content.nobootstrap div#scrollTop a { background: url(../img/admin/scroll_top.png); bottom: 30px; display: none; height: 40px; position: fixed; right: 30px; width: 40px; }
#content.nobootstrap .loader { background-image: url(../img/loader.gif); color: #fff; display: none; height: 128px; margin: 450px 0 0 440px; width: 128px; }
#content.nobootstrap .category-filter { background-color: #dde0e9; min-height: 20px; padding: 5px 10px; }
#content.nobootstrap .category-filter span { color: #585A69; float: left; line-height: 18px; }
#content.nobootstrap .category-filter a { color: #585A69; float: left; line-height: 20px; padding: 0 5px; }
#content.nobootstrap .category-filter #filternameForm { color: #585A69; float: left; margin-left: 10px; }
#content.nobootstrap .current-edit { background-color: #E9F1F6; }
#content.nobootstrap .edit-note { height: 100px; width: 98%; }
#content.nobootstrap .payment_information { background-color: #BDE5F8; }
#content.nobootstrap #conditions .condition_separator { font-size: 16px; margin: 10px 0; }
#content.nobootstrap #conditions a#add_condition_group { font-size: 16px; }
#content.nobootstrap #conditions #condition_list .row { background-color: transparent; height: 25px; padding: 10px 0; position: relative; }
#content.nobootstrap #conditions #condition_list select { float: left; margin-right: 10px; width: 200px; }
#content.nobootstrap .container-command-top-spacing { margin-top: 25px; }
#content.nobootstrap .bloc-command { background-color: #EBEDF4; border: 1px solid #CCCED7; margin-bottom: 10px; }
#content.nobootstrap .button-command { float: right; padding: 10px; }
#content.nobootstrap .button-command-prev-next { float: right; margin-bottom: 10px; margin-right: 10px; }
#content.nobootstrap .history-status tr th { background: #eee none; }
#content.nobootstrap .metadata-command dl { float: left; margin-left: 10px; }
#content.nobootstrap .metadata-command dl dt, #content.nobootstrap .metadata-command dl dd { color: #585A69; float: left; margin: 0; padding-right: 10px; }
#content.nobootstrap #content #customers .warn { margin: 10px 0 0; }
#content.nobootstrap #customers li { background-color: #ABDFF7; border: 1px solid #ccc; float: left; margin: 5px; padding: 5px; }
#content.nobootstrap #customers li .button { display: block; margin-top: 5px; }
#content.nobootstrap #container-customer h2 { color: #000; font-weight: 400; margin: 0; }
#content.nobootstrap #container-customer h2 img { margin-right: 5px; }
#content.nobootstrap #container-customer .info-customer-left { border-right: 1px solid #fff; float: left; min-height: 120px; padding-right: 15px; width: 47%; }
#content.nobootstrap #container-customer .info-customer-right { border-left: 1px solid #ccc; float: left; min-height: 120px; padding-left: 15px; width: 49%; }
#content.nobootstrap #container-customer .info-customer-left h2, #content.nobootstrap #container-customer .info-customer-right h2 { margin-bottom: 7px; }
#content.nobootstrap .infoCustomer dl { margin: 7px 0; }
#content.nobootstrap .infoCustomer dl dt { float: left; font-weight: 700; padding-right: 5px; }
#content.nobootstrap #container-carts { background-color: #EBEDF4; border: 1px solid #CCCED7; padding: 10px; }
#content.nobootstrap #cart_rule_form h4 { font-size: 18px; font-weight: 400; margin-top: 0; }
#content.nobootstrap #ajax_running { background-color: #FFF1A8; border: 1px solid #FFD96F; color: #000; display: none; font-size: 14px; font-weight: 700; left: 40%; padding: 5px 20px; position: fixed; top: 0; width: 300px; z-index: 10000; }
#content.nobootstrap #container_category_tree { border: 1px solid #ccc; padding: 5px; }
#content.nobootstrap #container_category_tree a input { margin-right: 3px; }
#content.nobootstrap #block_discover { float: left; width: 48.1%; }
#content.nobootstrap .row-news { float: left; width: 100%; }
#content.nobootstrap .multishop-left { background-color: #F9F9F9; border: 1px solid #CCCED7; float: left; max-height: 400px; min-height: 200px; overflow: auto; padding: 3px; width: 250px; }
#content.nobootstrap .multishop-left .multishop-title { background-color: #F0F0F0; border-bottom: 1px solid #CCCED7; color: #333; font-size: 14px; font-weight: 700; padding: 2px; text-align: left; width: 247px; }
#content.nobootstrap .multishop-right { margin-left: 270px; }
#content.nobootstrap #multishop-tree { background-color: #F9F9F9; font-size: 13px; margin-top: 3px; }
#content.nobootstrap #multishop-tree a.selected { background-color: #49B2FF; color: #FFF; padding: 3px; }
#content.nobootstrap .datepicker { position: relative; z-index: 20; }
#content.nobootstrap #BoxUseSpecialSyntax { bottom: 50px; display: none; position: fixed; width: 100%; z-index: 10; }
#content.nobootstrap #BoxUseSpecialSyntax .warn { margin: 0 auto; width: 500px; }
#content.nobootstrap #BoxUseSpecialSyntax ul { list-style-type: disc; margin-left: 30px; }
#content.nobootstrap .id_customization .customization_field { min-width: 205px; width: 205px; }
#content.nobootstrap .float, #content.nobootstrap span.defaultSkin table.mceLayout tr.mceFirst td, #content.nobootstrap #customer_part #customers ul, #content.nobootstrap #MeaningStatus, #content.nobootstrap #CustomerThreadContacts div#MeaningStatus, #content.nobootstrap #conditions #condition_list a { float: left; }
#content.nobootstrap .floatr, #content.nobootstrap #customer_part #customers ul li a.id_customer.button { float: right; }
#content.nobootstrap a.link, #content.nobootstrap .warn a, #content.nobootstrap #content .conf a:hover, #content.nobootstrap #content .warn a:hover, #content.nobootstrap #content .error a:hover { text-decoration: underline; }
#content.nobootstrap img, #content.nobootstrap input { vertical-align: middle; }
#content.nobootstrap .block, #content.nobootstrap html[xmlns] .clearfix, #content.nobootstrap #menu .submenu_size:hover > .submenu { display: block; }
#content.nobootstrap .bold, #content.nobootstrap .path_bar a, #content.nobootstrap #customer_part #customers ul li div.customerName a, #content.nobootstrap .metadata-command dl dd, #content.nobootstrap #container_category_tree a { font-weight: 700; }
#content.nobootstrap legend, #content.nobootstrap th, #content.nobootstrap h1, #content.nobootstrap h2, #content.nobootstrap h3, #content.nobootstrap h4, #content.nobootstrap h5, #content.nobootstrap h6 { font-family: Arial,Helvetica,sans-serif; }
#content.nobootstrap form, #content.nobootstrap #image img, #content.nobootstrap .infoCustomer dl dd { margin: 0; padding: 0; }
#content.nobootstrap .label-subject input, #content.nobootstrap .mail-label table { width: 555px; }
#content.nobootstrap .style-themeModuleMail, #content.nobootstrap .style-themeModuleName { background: #FFF6D3; border: 1px solid #DFD5C3; cursor: pointer; font-size: 12px; font-weight: 700; margin: 0; padding: .2em .5em; text-align: left; }
#content.nobootstrap label:after, #content.nobootstrap #help:after, #content.nobootstrap #image:after, #content.nobootstrap .clear { clear: both; }
#content.nobootstrap #id_image_attr, #content.nobootstrap #adminpresentation ul li { list-style: none; }
#content.nobootstrap #content .error-inline, #content.nobootstrap p.preference_description .light-warning { color: red; font-weight: 700; }
#content.nobootstrap #content .conf, #content.nobootstrap #content .confirm { background: #dff2bf url(../img/admin/icon-valid.png) no-repeat scroll 6px 6px; border: 1px solid #4F8A10; color: #4F8A10; }
#content.nobootstrap #content .warn h2, #content.nobootstrap #table_customer thead th { margin: 0; }
#content.nobootstrap #content .warn h3, #content.nobootstrap #content .error h3 { background: url(../img/admin/warning.gif) no-repeat 0 0; padding: 0 0 0 20px; }
#content.nobootstrap .widthfull, #content.nobootstrap #CustomerThreadContacts div#CustomerService table.table, #content.nobootstrap .container-command { width: 100%; }
#content.nobootstrap .contextnavcenter, #content.nobootstrap #table_customer thead span.first, #content.nobootstrap .order_action, #content.nobootstrap #carrier_wizard table td.center { text-align: center; }
#content.nobootstrap .left, #content.nobootstrap #fancybox-content, #content.nobootstrap #customer_form #fieldset_0 { text-align: left; }
#content.nobootstrap .noborder, #content.nobootstrap #CustomerService .table tr td { border: none; }
#content.nobootstrap span.hint, #content.nobootstrap div.hint { position: relative; }
#content.nobootstrap .admin-box1 h5, #content.nobootstrap .admin-box2 h5 { background: #ECECEC; color: #333; font-size: 12pt; font-weight: 400; line-height: 29px; margin: 0; padding: 0 0 0 15px; }
#content.nobootstrap #order_line1, #content.nobootstrap #block_news_last { background-color: #EFEFEF; }
#content.nobootstrap #products_part #products_found, #content.nobootstrap #vouchers_part #voucher_list, #content.nobootstrap #vouchers_part #vouchers_err { display: none; }
#content.nobootstrap #conditions .condition_group h3, #content.nobootstrap #conditions #condition_list h4 { margin: 0 0 10px; }
#content.nobootstrap #container-customer, #content.nobootstrap #container-multishop { background-color: #EBEDF4; border: 1px solid #CCCED7; color: #585A69; padding: 10px; }
#content.nobootstrap #block_tips, #content.nobootstrap #block_partner_tips { float: right; width: 48.1%; }

View File

@@ -1,84 +0,0 @@
.path_bar {display:none;}
#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
#messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
#orders_notif.open_notifs,
#customers_notif.open_notifs,
#messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
/*toolbarBox*/
.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: bold; line-height: 48px; margin: 0; padding: 0}
.toolbarBox ul.cc_button {float:right;margin:0;padding:0}
.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center}
.toolbarBox a.toolbar_btn { border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff}
.toolbarBox a.toolbar_btn:hover {}
.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px}
.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png')}
.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png')}
.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png')}
.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png')}
.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png')}
.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png')}
.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png')}
.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png')}
.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png')}
.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png')}
.toolbarBox .process-icon-refresh-index { background-image: url('../img/process-icon-refresh-index.png')}
.toolbarBox .process-icon-refresh-cache { background-image: url('../img/process-icon-refresh-cache.png')}
.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png')}
.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png')}
.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png')}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1}
/*FILTER MODULE*/
.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; padding:10px; display:block; min-height:35px;}
.filter-module #filternameForm {float:left; margin-right:30px;}
.filter-module label {width:auto;}
.filter-module .select-filter { float:left;}
.filter-module .button-filter { float:right;}
/*SIDEBAR*/
.sidebar { position:relative; float:left; width:220px; display:inline;}
.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;}
.sidebar ul.categorieList {}
.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
.sidebar ul.categorieList li:first-child { border-top:none;}
.sidebar ul.categorieList li a {color:#3a6ea7;}
.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;}
.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
/*MODULECONTAINER*/
#moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
#moduleContainer .table tr th { height:40px;}
#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
#moduleContainer .table tr:first-child {border-top:1px solid #ccc}
#moduleContainer .table tr:hover { background-color:#FFF1B5;}
#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
#moduleContainer .moduleDesc .metadata { float:left; display:block; margin:5px 0;}
#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#moduleContainer .moduleDesc p.desc { color:#666; font-size:12px; display:block; clear:both;}
#moduleContainer .setup {background-color:#6db300; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
#moduleContainer .setup.non-install { border: solid 1px #ec7000; background-color: #ffedb1; color: #ec7000}
#moduleContainer .setup.must-have { background-color: #ec7000;}
#moduleContainer .setup.off{ background-color:#ccc;}
#moduleContainer .row-actions-module span { padding-right:5px;}
#moduleContainer .row-actions-module span a { font-size:12px;}
#moduleContainer .button.uninstalled,
#moduleContainer .button.installed { float:right; display: inline-block; margin-top:15px; font-size:12px;}
#moduleContainer .button.updated { margin-top:15px; display: inline-block; font-size:12px;}
#list-action-button{width:175px}
#list-action-button li{margin-left:10px;display: inline;float: left;}
#moduleContainer .moduleName {font-size:12px; color:#3A6EA7;font-weight:bold;}
#moduleContainer .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;}

35
admin-dev/themes/default/css/vendor/index.php vendored Executable file
View File

@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

769
admin-dev/themes/default/css/vendor/nv.d3.css vendored Executable file
View File

@@ -0,0 +1,769 @@
/********************
* HTML CSS
*/
.chartWrap {
margin: 0;
padding: 0;
overflow: hidden;
}
/********************
Box shadow and border radius styling
*/
.nvtooltip.with-3d-shadow, .with-3d-shadow .nvtooltip {
-moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
box-shadow: 0 5px 10px rgba(0,0,0,.2);
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
/********************
* TOOLTIP CSS
*/
.nvtooltip {
position: absolute;
background-color: rgba(255,255,255,1.0);
padding: 1px;
border: 1px solid rgba(0,0,0,.2);
z-index: 10000;
font-family: Arial;
font-size: 13px;
text-align: left;
pointer-events: none;
white-space: nowrap;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
/*Give tooltips that old fade in transition by
putting a "with-transitions" class on the container div.
*/
.nvtooltip.with-transitions, .with-transitions .nvtooltip {
transition: opacity 250ms linear;
-moz-transition: opacity 250ms linear;
-webkit-transition: opacity 250ms linear;
transition-delay: 250ms;
-moz-transition-delay: 250ms;
-webkit-transition-delay: 250ms;
}
.nvtooltip.x-nvtooltip,
.nvtooltip.y-nvtooltip {
padding: 8px;
}
.nvtooltip h3 {
margin: 0;
padding: 4px 14px;
line-height: 18px;
font-weight: normal;
background-color: rgba(247,247,247,0.75);
text-align: center;
border-bottom: 1px solid #ebebeb;
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}
.nvtooltip p {
margin: 0;
padding: 5px 14px;
text-align: center;
}
.nvtooltip span {
display: inline-block;
margin: 2px 0;
}
.nvtooltip table {
margin: 6px;
border-spacing:0;
}
.nvtooltip table td {
padding: 2px 9px 2px 0;
vertical-align: middle;
}
.nvtooltip table td.key {
font-weight:normal;
}
.nvtooltip table td.value {
text-align: right;
font-weight: bold;
}
.nvtooltip table tr.highlight td {
padding: 1px 9px 1px 0;
border-bottom-style: solid;
border-bottom-width: 1px;
border-top-style: solid;
border-top-width: 1px;
}
.nvtooltip table td.legend-color-guide div {
width: 8px;
height: 8px;
vertical-align: middle;
}
.nvtooltip .footer {
padding: 3px;
text-align: center;
}
.nvtooltip-pending-removal {
position: absolute;
pointer-events: none;
}
/********************
* SVG CSS
*/
svg {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
/* Trying to get SVG to act like a greedy block in all browsers */
display: block;
width:100%;
height:100%;
}
svg text {
font: normal 12px Arial;
}
svg .title {
font: bold 14px Arial;
}
.nvd3 .nv-background {
fill: white;
fill-opacity: 0;
/*
pointer-events: none;
*/
}
.nvd3.nv-noData {
font-size: 18px;
font-weight: bold;
}
/**********
* Brush
*/
.nv-brush .extent {
fill-opacity: .125;
shape-rendering: crispEdges;
}
/**********
* Legend
*/
.nvd3 .nv-legend .nv-series {
cursor: pointer;
}
.nvd3 .nv-legend .disabled circle {
fill-opacity: 0;
}
/**********
* Axes
*/
.nvd3 .nv-axis {
pointer-events:none;
}
.nvd3 .nv-axis path {
fill: none;
stroke: #000;
stroke-opacity: .75;
shape-rendering: crispEdges;
}
.nvd3 .nv-axis path.domain {
stroke-opacity: .75;
}
.nvd3 .nv-axis.nv-x path.domain {
stroke-opacity: 0;
}
.nvd3 .nv-axis line {
fill: none;
stroke: #e5e5e5;
shape-rendering: crispEdges;
}
.nvd3 .nv-axis .zero line,
/*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
stroke-opacity: .75;
}
.nvd3 .nv-axis .nv-axisMaxMin text {
font-weight: bold;
}
.nvd3 .x .nv-axis .nv-axisMaxMin text,
.nvd3 .x2 .nv-axis .nv-axisMaxMin text,
.nvd3 .x3 .nv-axis .nv-axisMaxMin text {
text-anchor: middle
}
/**********
* Brush
*/
.nv-brush .resize path {
fill: #eee;
stroke: #666;
}
/**********
* Bars
*/
.nvd3 .nv-bars .negative rect {
zfill: brown;
}
.nvd3 .nv-bars rect {
zfill: steelblue;
fill-opacity: .75;
transition: fill-opacity 250ms linear;
-moz-transition: fill-opacity 250ms linear;
-webkit-transition: fill-opacity 250ms linear;
}
.nvd3 .nv-bars rect.hover {
fill-opacity: 1;
}
.nvd3 .nv-bars .hover rect {
fill: lightblue;
}
.nvd3 .nv-bars text {
fill: rgba(0,0,0,0);
}
.nvd3 .nv-bars .hover text {
fill: rgba(0,0,0,1);
}
/**********
* Bars
*/
.nvd3 .nv-multibar .nv-groups rect,
.nvd3 .nv-multibarHorizontal .nv-groups rect,
.nvd3 .nv-discretebar .nv-groups rect {
stroke-opacity: 0;
transition: fill-opacity 250ms linear;
-moz-transition: fill-opacity 250ms linear;
-webkit-transition: fill-opacity 250ms linear;
}
.nvd3 .nv-multibar .nv-groups rect:hover,
.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,
.nvd3 .nv-discretebar .nv-groups rect:hover {
fill-opacity: 1;
}
.nvd3 .nv-discretebar .nv-groups text,
.nvd3 .nv-multibarHorizontal .nv-groups text {
font-weight: bold;
fill: rgba(0,0,0,1);
stroke: rgba(0,0,0,0);
}
/***********
* Pie Chart
*/
.nvd3.nv-pie path {
stroke-opacity: 0;
transition: fill-opacity 250ms linear, stroke-width 250ms linear, stroke-opacity 250ms linear;
-moz-transition: fill-opacity 250ms linear, stroke-width 250ms linear, stroke-opacity 250ms linear;
-webkit-transition: fill-opacity 250ms linear, stroke-width 250ms linear, stroke-opacity 250ms linear;
}
.nvd3.nv-pie .nv-slice text {
stroke: #000;
stroke-width: 0;
}
.nvd3.nv-pie path {
stroke: #fff;
stroke-width: 1px;
stroke-opacity: 1;
}
.nvd3.nv-pie .hover path {
fill-opacity: .7;
}
.nvd3.nv-pie .nv-label {
pointer-events: none;
}
.nvd3.nv-pie .nv-label rect {
fill-opacity: 0;
stroke-opacity: 0;
}
/**********
* Lines
*/
.nvd3 .nv-groups path.nv-line {
fill: none;
stroke-width: 1.5px;
/*
stroke-linecap: round;
shape-rendering: geometricPrecision;
transition: stroke-width 250ms linear;
-moz-transition: stroke-width 250ms linear;
-webkit-transition: stroke-width 250ms linear;
transition-delay: 250ms
-moz-transition-delay: 250ms;
-webkit-transition-delay: 250ms;
*/
}
.nvd3 .nv-groups path.nv-line.nv-thin-line {
stroke-width: 1px;
}
.nvd3 .nv-groups path.nv-area {
stroke: none;
/*
stroke-linecap: round;
shape-rendering: geometricPrecision;
stroke-width: 2.5px;
transition: stroke-width 250ms linear;
-moz-transition: stroke-width 250ms linear;
-webkit-transition: stroke-width 250ms linear;
transition-delay: 250ms
-moz-transition-delay: 250ms;
-webkit-transition-delay: 250ms;
*/
}
.nvd3 .nv-line.hover path {
stroke-width: 6px;
}
/*
.nvd3.scatter .groups .point {
fill-opacity: 0.1;
stroke-opacity: 0.1;
}
*/
.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point {
fill-opacity: 0;
stroke-opacity: 0;
}
.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point {
fill-opacity: .5 !important;
stroke-opacity: .5 !important;
}
.with-transitions .nvd3 .nv-groups .nv-point {
transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-moz-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-webkit-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
}
.nvd3.nv-scatter .nv-groups .nv-point.hover,
.nvd3 .nv-groups .nv-point.hover {
stroke-width: 7px;
fill-opacity: .95 !important;
stroke-opacity: .95 !important;
}
.nvd3 .nv-point-paths path {
stroke: #aaa;
stroke-opacity: 0;
fill: #eee;
fill-opacity: 0;
}
.nvd3 .nv-indexLine {
cursor: ew-resize;
}
/**********
* Distribution
*/
.nvd3 .nv-distribution {
pointer-events: none;
}
/**********
* Scatter
*/
/* **Attempting to remove this for useVoronoi(false), need to see if it's required anywhere
.nvd3 .nv-groups .nv-point {
pointer-events: none;
}
*/
.nvd3 .nv-groups .nv-point.hover {
stroke-width: 20px;
stroke-opacity: .5;
}
.nvd3 .nv-scatter .nv-point.hover {
fill-opacity: 1;
}
/*
.nv-group.hover .nv-point {
fill-opacity: 1;
}
*/
/**********
* Stacked Area
*/
.nvd3.nv-stackedarea path.nv-area {
fill-opacity: .7;
/*
stroke-opacity: .65;
fill-opacity: 1;
*/
stroke-opacity: 0;
transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
-moz-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
-webkit-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
/*
transition-delay: 500ms;
-moz-transition-delay: 500ms;
-webkit-transition-delay: 500ms;
*/
}
.nvd3.nv-stackedarea path.nv-area.hover {
fill-opacity: .9;
/*
stroke-opacity: .85;
*/
}
/*
.d3stackedarea .groups path {
stroke-opacity: 0;
}
*/
.nvd3.nv-stackedarea .nv-groups .nv-point {
stroke-opacity: 0;
fill-opacity: 0;
}
/*
.nvd3.nv-stackedarea .nv-groups .nv-point.hover {
stroke-width: 20px;
stroke-opacity: .75;
fill-opacity: 1;
}*/
/**********
* Line Plus Bar
*/
.nvd3.nv-linePlusBar .nv-bar rect {
fill-opacity: .75;
}
.nvd3.nv-linePlusBar .nv-bar rect:hover {
fill-opacity: 1;
}
/**********
* Bullet
*/
.nvd3.nv-bullet { font: 10px sans-serif; }
.nvd3.nv-bullet .nv-measure { fill-opacity: .8; }
.nvd3.nv-bullet .nv-measure:hover { fill-opacity: 1; }
.nvd3.nv-bullet .nv-marker { stroke: #000; stroke-width: 2px; }
.nvd3.nv-bullet .nv-markerTriangle { stroke: #000; fill: #fff; stroke-width: 1.5px; }
.nvd3.nv-bullet .nv-tick line { stroke: #666; stroke-width: .5px; }
.nvd3.nv-bullet .nv-range.nv-s0 { fill: #eee; }
.nvd3.nv-bullet .nv-range.nv-s1 { fill: #ddd; }
.nvd3.nv-bullet .nv-range.nv-s2 { fill: #ccc; }
.nvd3.nv-bullet .nv-title { font-size: 14px; font-weight: bold; }
.nvd3.nv-bullet .nv-subtitle { fill: #999; }
.nvd3.nv-bullet .nv-range {
fill: #bababa;
fill-opacity: .4;
}
.nvd3.nv-bullet .nv-range:hover {
fill-opacity: .7;
}
/**********
* Sparkline
*/
.nvd3.nv-sparkline path {
fill: none;
}
.nvd3.nv-sparklineplus g.nv-hoverValue {
pointer-events: none;
}
.nvd3.nv-sparklineplus .nv-hoverValue line {
stroke: #333;
stroke-width: 1.5px;
}
.nvd3.nv-sparklineplus,
.nvd3.nv-sparklineplus g {
pointer-events: all;
}
.nvd3 .nv-hoverArea {
fill-opacity: 0;
stroke-opacity: 0;
}
.nvd3.nv-sparklineplus .nv-xValue,
.nvd3.nv-sparklineplus .nv-yValue {
/*
stroke: #666;
*/
stroke-width: 0;
font-size: .9em;
font-weight: normal;
}
.nvd3.nv-sparklineplus .nv-yValue {
stroke: #f66;
}
.nvd3.nv-sparklineplus .nv-maxValue {
stroke: #2ca02c;
fill: #2ca02c;
}
.nvd3.nv-sparklineplus .nv-minValue {
stroke: #d62728;
fill: #d62728;
}
.nvd3.nv-sparklineplus .nv-currentValue {
/*
stroke: #444;
fill: #000;
*/
font-weight: bold;
font-size: 1.1em;
}
/**********
* historical stock
*/
.nvd3.nv-ohlcBar .nv-ticks .nv-tick {
stroke-width: 2px;
}
.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover {
stroke-width: 4px;
}
.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive {
stroke: #2ca02c;
}
.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative {
stroke: #d62728;
}
.nvd3.nv-historicalStockChart .nv-axis .nv-axislabel {
font-weight: bold;
}
.nvd3.nv-historicalStockChart .nv-dragTarget {
fill-opacity: 0;
stroke: none;
cursor: move;
}
.nvd3 .nv-brush .extent {
/*
cursor: ew-resize !important;
*/
fill-opacity: 0 !important;
}
.nvd3 .nv-brushBackground rect {
stroke: #000;
stroke-width: .4;
fill: #fff;
fill-opacity: .7;
}
/**********
* Indented Tree
*/
/**
* TODO: the following 3 selectors are based on classes used in the example. I should either make them standard and leave them here, or move to a CSS file not included in the library
*/
.nvd3.nv-indentedtree .name {
margin-left: 5px;
}
.nvd3.nv-indentedtree .clickable {
color: #08C;
cursor: pointer;
}
.nvd3.nv-indentedtree span.clickable:hover {
color: #005580;
text-decoration: underline;
}
.nvd3.nv-indentedtree .nv-childrenCount {
display: inline-block;
margin-left: 5px;
}
.nvd3.nv-indentedtree .nv-treeicon {
cursor: pointer;
/*
cursor: n-resize;
*/
}
.nvd3.nv-indentedtree .nv-treeicon.nv-folded {
cursor: pointer;
/*
cursor: s-resize;
*/
}
/**********
* Parallel Coordinates
*/
.nvd3 .background path {
fill: none;
stroke: #ccc;
stroke-opacity: .4;
shape-rendering: crispEdges;
}
.nvd3 .foreground path {
fill: none;
stroke: steelblue;
stroke-opacity: .7;
}
.nvd3 .brush .extent {
fill-opacity: .3;
stroke: #fff;
shape-rendering: crispEdges;
}
.nvd3 .axis line, .axis path {
fill: none;
stroke: #000;
shape-rendering: crispEdges;
}
.nvd3 .axis text {
text-shadow: 0 1px 0 #fff;
}
/****
Interactive Layer
*/
.nvd3 .nv-interactiveGuideLine {
pointer-events:none;
}
.nvd3 line.nv-guideline {
stroke: #ccc;
}

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,399 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="fontawesomeregular" horiz-adv-x="1536" >
<font-face units-per-em="1792" ascent="1536" descent="-256" />
<missing-glyph horiz-adv-x="448" />
<glyph unicode=" " horiz-adv-x="448" />
<glyph unicode="&#x09;" horiz-adv-x="448" />
<glyph unicode="&#xa0;" horiz-adv-x="448" />
<glyph unicode="&#xa8;" horiz-adv-x="1792" />
<glyph unicode="&#xa9;" horiz-adv-x="1792" />
<glyph unicode="&#xae;" horiz-adv-x="1792" />
<glyph unicode="&#xb4;" horiz-adv-x="1792" />
<glyph unicode="&#xc6;" horiz-adv-x="1792" />
<glyph unicode="&#x2000;" horiz-adv-x="768" />
<glyph unicode="&#x2001;" />
<glyph unicode="&#x2002;" horiz-adv-x="768" />
<glyph unicode="&#x2003;" />
<glyph unicode="&#x2004;" horiz-adv-x="512" />
<glyph unicode="&#x2005;" horiz-adv-x="384" />
<glyph unicode="&#x2006;" horiz-adv-x="256" />
<glyph unicode="&#x2007;" horiz-adv-x="256" />
<glyph unicode="&#x2008;" horiz-adv-x="192" />
<glyph unicode="&#x2009;" horiz-adv-x="307" />
<glyph unicode="&#x200a;" horiz-adv-x="85" />
<glyph unicode="&#x202f;" horiz-adv-x="307" />
<glyph unicode="&#x205f;" horiz-adv-x="384" />
<glyph unicode="&#x2122;" horiz-adv-x="1792" />
<glyph unicode="&#x221e;" horiz-adv-x="1792" />
<glyph unicode="&#x2260;" horiz-adv-x="1792" />
<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" />
<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
<glyph unicode="&#xf500;" horiz-adv-x="1792" />
</font>
</defs></svg>

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 723 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

@@ -0,0 +1,221 @@
/*
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
$( document ).ready(function() {
//nav side bar
function navSidebar(){
//$('body.page-topbar').removeClass('page-topbar').addClass('page-sidebar');
//$('#nav-topbar').attr('id','nav-sidebar');
var sidebar = $('#nav-sidebar');
sidebar.off();
$('.expanded').removeClass('expanded');
$('.maintab').not('.active').closest('.submenu').hide();
sidebar.find('li.maintab.has_submenu').append('<span class="submenu_expand"></span>');
sidebar.on('click','.submenu_expand', function(){
var $navId = $(this).parent();
$('.submenu-collapse').remove();
if($('.expanded').length ){
$('.expanded > ul').slideUp('fast', function(){
var $target = $('.expanded');
$target.removeClass('expanded');
$($navId).not($target).not('.active').addClass('expanded');
$($navId).not($target).not('.active').children('ul:first').hide().slideDown();
});
}
else {
$($navId).not('.active').addClass('expanded');
$($navId).not('.active').children('ul:first').hide().slideDown();
}
});
//sidebar menu collapse
sidebar.find('.menu-collapse').on('click',function(){
$('body').toggleClass('page-sidebar-closed');
$('.expanded').removeClass('expanded');
});
}
//nav top bar
function navTopbar(){
//$('body').removeClass('page-sidebar').addClass('page-topbar').removeClass('page-sidebar-closed');
$('#nav-sidebar').attr('id','nav-topbar');
var topbar = $('#nav-topbar');
topbar.off();
$('span.submenu_expand').remove();
$('.expanded').removeClass('expanded');
// expand elements with submenu
topbar.on('mouseenter', 'li.has_submenu', function(){
$(this).addClass('expanded');
});
topbar.on('mouseleave', 'li.has_submenu', function(){
$(this).removeClass('expanded');
});
// hide element over menu width on load
topbar.find('li.maintab').each(function(){
navEllipsis();
});
//hide element over menu width on resize
$(window).on('resize', function() {
navEllipsis();
});
}
function navEllipsis() {
var ellipsed = [];
$('#ellipsistab').remove();
$('#nav-topbar ul.menu').find('li.maintab').each(function(){
$(this).removeClass('hide');
if ($(this).position().top > 0) {
ellipsed.push($(this));
$(this).addClass('hide');
}
});
if (ellipsed.length > 0) {
$('#nav-topbar ul.menu').append('<li id="ellipsistab" class="subtab has_submenu"><a href="#"><i class="icon-ellipsis-horizontal"></i></a><ul id="ellipsis_submenu" class="submenu"></ul></li>');
for (var i = 0; i < ellipsed.length; i++) {
$('#ellipsis_submenu').append('<li class="subtab has_submenu">'+ellipsed[i].html()+'</li>');
}
}
}
function mobileNav() {
//clean actual menu type
// get it in navigation whatever type it is.
var navigation = $('#nav-sidebar,#nav-topbar');
var submenu = "";
// clean trigger
navigation.off().attr('id','nav-mobile');
$('span.menu-collapse').off();
navigation.on('click.collapse','span.menu-collapse',function(){
if ($(this).hasClass('expanded')){
$(this).html('<i class="icon-align-justify"></i>');
navigation.find('ul.menu').hide();
navigation.removeClass('expanded');
$(this).removeClass('expanded');
//remove submenu when closing nav
$('#nav-mobile-submenu').remove();
}
else {
$(this).html('<i class="icon-remove"></i>');
navigation.find('ul.menu').removeClass('menu-close').show();
navigation.addClass('expanded');
$(this).addClass('expanded');
}
});
//get click for item which has submenu
navigation.on('click.submenu','.maintab.has_submenu a.title', function(e){
e.preventDefault();
navigation.find('.menu').addClass('menu-close');
$('#nav-mobile-submenu').remove();
//create submenu
submenu = $('<ul id="nav-mobile-submenu" class="menu"><li><a href="#" id="nav-mobile-submenu-back"><i class="icon-arrow-left"></i>'+ $(this).html() +'</a></li></ul>');
submenu.append($(this).closest('.maintab').find('.submenu').html());
//show submenu
navigation.append(submenu);
submenu.show();
});
navigation.on('click.back','#nav-mobile-submenu-back',function(e){
e.preventDefault();
submenu.remove();
navigation.find('.menu').removeClass('menu-close').show();
});
}
function removeMobileNav(){
navigation = $('#nav-mobile');
$('#nav-mobile-submenu').remove();
$('span.menu-collapse').html('<i class="icon-align-justify"></i>');
navigation.off();
if ($('body').hasClass('page-sidebar')){
navigation.attr('id',"nav-sidebar");
navSidebar();
} else if ($('body').hasClass('page-sidebar')){
navigation.attr('id',"nav-topbar");
navTopbar();
}
}
//nav switch - not used for now
function navSwitch(){
if ($('body').hasClass('page-sidebar')){
navTopbar();
} else {
navSidebar();
}
}
//init menu
function initNav(){
if ($('body').hasClass('page-sidebar')){
navSidebar();
}
else if ($('body').hasClass('page-topbar')) {
navTopbar();
}
}
initNav();
//tooltip
$('.label-tooltip').tooltip();
//scroll top
function animateGoTop() {
if ($(window).scrollTop())
{
$('#go-top:hidden').stop(true, true).fadeIn();
$('#go-top:hidden').removeClass('hide');
} else {
$('#go-top').stop(true, true).fadeOut();
}
}
$("#go-top").on('click',function() {
$("html, body").animate({ scrollTop: 0 }, "slow");
return false;
});
$(window).scroll(function() {
animateGoTop();
});
//media queries - depends of enquire.js
enquire.register("screen and (max-width: 992px)", {
match : function() {
$('body.page-sidebar').addClass('page-sidebar-closed');
},
unmatch : function() {
$('body.page-sidebar').removeClass('page-sidebar-closed');
}
});
enquire.register("screen and (max-width: 480px)", {
match : function() {
mobileNav();
},
unmatch : function() {
removeMobileNav();
}
});
//show time elapsed
$("abbr.timeago").timeago();
});

View File

@@ -0,0 +1,427 @@
Date.prototype.addDays = function(value) {
this.setDate(this.getDate() + value);
return this;
};
Date.prototype.addMonths = function(value) {
var date = this.getDate();
this.setMonth(this.getMonth() + value);
if (this.getDate() < date) {
this.setDate(0);
}
return this;
};
Date.prototype.addWeeks = function(value) {
this.addDays(value * 7);
return this;
};
Date.prototype.addYears = function(value) {
var month = this.getMonth();
this.setFullYear(this.getFullYear() + value);
if (month < this.getMonth()) {
this.setDate(0);
}
return this;
};
Date.parseDate = function(date, format) {
if (format === undefined)
format = 'Y-m-d';
var formatSeparator = format.match(/[.\/\-\s].*?/);
var formatParts = format.split(/\W+/);
var parts = date.split(formatSeparator);
var date = new Date();
if (parts.length === formatParts.length) {
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
date.setMilliseconds(0);
for (var i=0; i<=formatParts.length; i++) {
switch(formatParts[i]) {
case 'dd':
case 'd':
case 'j':
date.setDate(parseInt(parts[i], 10)||1);
break;
case 'mm':
case 'm':
date.setMonth((parseInt(parts[i], 10)||1) - 1);
break;
case 'yy':
case 'y':
date.setFullYear(2000 + (parseInt(parts[i], 10)||1));
break;
case 'yyyy':
case 'Y':
date.setFullYear(parseInt(parts[i], 10)||1);
break;
}
}
}
return date;
};
Date.prototype.subDays = function(value) {
this.setDate(this.getDate() - value);
return this;
};
Date.prototype.subMonths = function(value) {
var date = this.getDate();
this.setMonth(this.getMonth() - value);
if (this.getDate() < date) {
this.setDate(0);
}
return this;
};
Date.prototype.subWeeks = function(value) {
this.subDays(value * 7);
return this;
};
Date.prototype.subYears = function(value) {
var month = this.getMonth();
this.setFullYear(this.getFullYear() - value);
if (month < this.getMonth()) {
this.setDate(0);
}
return this;
};
Date.prototype.format = function(format) {
if (format === undefined)
return this.toString();
var formatSeparator = format.match(/[.\/\-\s].*?/);
var formatParts = format.split(/\W+/);
var result = '';
for (var i=0; i<=formatParts.length; i++) {
switch(formatParts[i]) {
case 'dd':
case 'd':
case 'j':
result += this.getDate() + formatSeparator;
break;
case 'mm':
case 'm':
result += (this.getMonth() + 1) + formatSeparator;
break;
case 'yy':
case 'y':
result += this.getFullYear() + formatSeparator;
break;
case 'yyyy':
case 'Y':
result += this.getFullYear() + formatSeparator;
break;
}
}
return result.slice(0, -1);
}
function updatePickerFromInput() {
datepickerStart.setStart($("#date-start").val());
datepickerStart.setEnd($("#date-end").val());
datepickerStart.update();
datepickerEnd.setStart($("#date-start").val());
datepickerEnd.setEnd($("#date-end").val());
datepickerEnd.update();
$('#date-start').trigger('change');
if ($('#datepicker-compare').attr("checked")) {
if ($('#compare-options').val() == 1)
setPreviousPeriod();
if ($('#compare-options').val() == 2)
setPreviousYear();
datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
}
}
function setDayPeriod() {
date = new Date();
$("#date-start").val(date.format($("#date-start").data('date-format')));
$("#date-end").val(date.format($("#date-end").data('date-format')));
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
function setPreviousDayPeriod() {
date = new Date();
date = date.subDays(1);
$("#date-start").val(date.format($("#date-start").data('date-format')));
$("#date-end").val(date.format($("#date-end").data('date-format')));
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
function setMonthPeriod() {
date = new Date();
$("#date-end").val(date.format($("#date-end").data('date-format')));
date = new Date(date.setDate(1));
$("#date-start").val(date.format($("#date-start").data('date-format')));
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
function setPreviousMonthPeriod() {
date = new Date();
date = new Date(date.getFullYear(), date.getMonth(), 0);
$("#date-end").val(date.format($("#date-end").data('date-format')));
date = new Date(date.setDate(1));
$("#date-start").val(date.format($("#date-start").data('date-format')));
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
function setYearPeriod() {
date = new Date();
$("#date-end").val(date.format($("#date-end").data('date-format')));
date = new Date(date.getFullYear(), 0, 1);
$("#date-start").val(date.format($("#date-start").data('date-format')));
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
function setPreviousYearPeriod() {
date = new Date();
date = date.subYears(1);
$("#date-end").val(date.format($("#date-end").data('date-format')));
date = new Date(date.getFullYear(), 0, 1);
$("#date-start").val(date.format($("#date-start").data('date-format')));
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
function setPreviousPeriod() {
startDate = Date.parseDate($("#date-start").val(), $("#date-start").data('date-format')).subDays(1);
endDate = Date.parseDate($("#date-end").val(), $("#date-end").data('date-format')).subDays(1);
diff = endDate - startDate;
startDateCompare = new Date(startDate-diff);
$("#date-end-compare").val(startDate.format($("#date-end-compare").data('date-format')));
$("#date-start-compare").val(startDateCompare.format($("#date-start-compare").data('date-format')));
}
function setPreviousYear() {
startDate = Date.parseDate($("#date-start").val(), $("#date-start").data('date-format')).subYears(1);
endDate = Date.parseDate($("#date-end").val(), $("#date-end").data('date-format')).subYears(1);
$("#date-start-compare").val(startDate.format($("#date-start").data('date-format')));
$("#date-end-compare").val(endDate.format($("#date-start").data('date-format')));
}
$( document ).ready(function() {
//Instanciate datepickers
datepickerStart = $('.datepicker1').daterangepicker({
"dates": translated_dates,
"weekStart": 1,
"start": $("#date-start").val(),
"end": $("#date-end").val()
}).on('changeDate', function(ev){
if (ev.date.valueOf() >= datepickerEnd.date.valueOf()){
datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1));
}
}).data('daterangepicker');
datepickerEnd = $('.datepicker2').daterangepicker({
"dates": translated_dates,
"weekStart": 1,
"start": $("#date-start").val(),
"end": $("#date-end").val()
}).on('changeDate', function(ev){
if (ev.date.valueOf() <= datepickerStart.date.valueOf()){
datepickerStart.setValue(ev.date.setMonth(ev.date.getMonth()-1));
}
}).data('daterangepicker');
//Set first date picker to month -1 if same month
startDate = Date.parseDate($("#date-start").val(), $("#date-start").data('date-format'));
endDate = Date.parseDate($("#date-end").val(), $("#date-end").data('date-format'));
if (startDate.getFullYear() == endDate.getFullYear() && startDate.getMonth() == endDate.getMonth())
datepickerStart.setValue(startDate.subMonths(1));
//Events binding
$("#date-start").focus(function() {
datepickerStart.setCompare(false);
datepickerEnd.setCompare(false);
$(".date-input").removeClass("input-selected");
$(this).addClass("input-selected");
});
$("#date-end").focus(function() {
datepickerStart.setCompare(false);
datepickerEnd.setCompare(false);
$(".date-input").removeClass("input-selected");
$(this).addClass("input-selected");
});
$("#date-start-compare").focus(function() {
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
$('#compare-options').val(3);
$(".date-input").removeClass("input-selected");
$(this).addClass("input-selected");
});
$("#date-end-compare").focus(function() {
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
$('#compare-options').val(3);
$(".date-input").removeClass("input-selected");
$(this).addClass("input-selected");
});
$('#datepicker-cancel').click(function() {
$('#datepicker').addClass('hide');
});
$('#datepicker').show(function() {
$('#date-start').focus();
$('#date-start').trigger('change');
});
$('#datepicker-compare').click(function() {
if ($(this).attr("checked")) {
$('#compare-options').trigger('change');
$('#form-date-body-compare').show();
$('#compare-options').prop('disabled', false);
} else {
datepickerStart.setStartCompare(null);
datepickerStart.setEndCompare(null);
datepickerEnd.setStartCompare(null);
datepickerEnd.setEndCompare(null);
$('#form-date-body-compare').hide();
$('#compare-options').prop('disabled', true);
$('#date-start').focus();
}
})
$('#compare-options').change(function() {
if (this.value == 1)
setPreviousPeriod();
if (this.value == 2)
setPreviousYear();
datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
if (this.value == 3)
$('#date-start-compare').focus();
});
if ($('#datepicker-compare').attr("checked"))
{
if ($("#date-start-compare").val().replace(/^\s+|\s+$/g, '').length == 0)
$('#compare-options').trigger('change');
datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
}
$('#datepickerExpand').on('click',function() {
if ($('#datepicker').hasClass('hide'))
{
$('#datepicker').removeClass('hide');
$('#date-start').focus();
}
else
$('#datepicker').addClass('hide');
});
$('.submitDateDay').on('click',function(e){
e.preventDefault;
setDayPeriod();
});
$('.submitDateMonth').on('click',function(e){
e.preventDefault;
setMonthPeriod()
});
$('.submitDateYear').on('click',function(e){
e.preventDefault;
setYearPeriod();
});
$('.submitDateDayPrev').on('click',function(e){
e.preventDefault;
setPreviousDayPeriod();
});
$('.submitDateMonthPrev').on('click',function(e){
e.preventDefault;
setPreviousMonthPeriod();
});
$('.submitDateYearPrev').on('click',function(e){
e.preventDefault;
setPreviousYearPeriod();
});
});

View File

@@ -0,0 +1,745 @@
/* =========================================================
* bootstrap-datepicker.js
* http://www.eyecon.ro/bootstrap-datepicker
* =========================================================
* Copyright 2012 Stefan Petre
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================= */
//click action
!function( $ ) {
var click, switched, val, start, end, over, compare, startCompare, endCompare;
// Picker object
var DateRangePicker = function(element, options){
this.element = $(element);
compare = false;
if (typeof options.dates !== 'undefined'){
DPGlobal.dates = options.dates;
}
if (typeof options.start !== 'undefined'){
if (options.start.constructor === String){
start = DPGlobal.parseDate(options.start, DPGlobal.parseFormat('Y-m-d')).getTime();
} else if (options.start.constructor === Number){
start = options.start;
} else if (options.start.constructor === Date){
start = options.start.getTime();
}
}
if (typeof options.end !== 'undefined'){
if (options.end.constructor === String){
end = DPGlobal.parseDate(options.end, DPGlobal.parseFormat('Y-m-d')).getTime();
} else if (options.end.constructor === Number) {
end = options.end;
} else if (options.end.constructor === Date) {
end = options.end.getTime();
}
}
if (typeof options.compare !== 'undefined'){
compare = options.compare;
}
this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'Y-m-d');
this.picker = $(DPGlobal.template).appendTo(this.element).show()
.on({
click: $.proxy(this.click, this),
mouseover: $.proxy(this.mouseover, this),
mouseout: $.proxy(this.mouseout, this)
});
this.minViewMode = options.minViewMode||this.element.data('date-minviewmode')||0;
if (typeof this.minViewMode === 'string') {
switch (this.minViewMode) {
case 'months':
this.minViewMode = 1;
break;
case 'years':
this.minViewMode = 2;
break;
default:
this.minViewMode = 0;
break;
}
}
this.viewMode = options.viewMode||this.element.data('date-viewmode')||0;
if (typeof this.viewMode === 'string') {
switch (this.viewMode) {
case 'months':
this.viewMode = 1;
break;
case 'years':
this.viewMode = 2;
break;
default:
this.viewMode = 0;
break;
}
}
this.startViewMode = this.viewMode;
this.weekStart = options.weekStart||this.element.data('date-weekstart')||0;
this.weekEnd = this.weekStart === 0 ? 6 : this.weekStart - 1;
this.onRender = options.onRender;
this.fillDow();
this.fillMonths();
this.update();
this.showMode();
};
DateRangePicker.prototype = {
constructor: DateRangePicker,
show: function(e) {
this.picker.show();
if (e ) {
e.stopPropagation();
e.preventDefault();
}
var that = this;
$(document).on('mousedown', function(ev){
if ($(ev.target).closest('.daterangepicker').length === 0) {
that.hide();
}
});
this.element.trigger({
type: 'show',
date: this.date
});
},
set: function() {
var formated = DPGlobal.formatDate(this.date, this.format);
this.element.data('date', formated);
},
setCompare: function(value) {
compare = value;
this.updateRange();
},
setStart: function(date) {
if (date.constructor === String) {
start = DPGlobal.parseDate(date, DPGlobal.parseFormat('Y-m-d')).getTime();
} else if (date.constructor === Number){
start = date;
} else if (date.constructor === Date){
start = date.getTime();
}
},
setEnd: function(date) {
if (date.constructor === String){
end = DPGlobal.parseDate(date, DPGlobal.parseFormat('Y-m-d')).getTime();
} else if (date.constructor === Number){
end = date;
} else if (date.constructor === Date){
end = date.getTime();
}
},
setStartCompare: function(date) {
if (date === null){
startCompare = date;
}
else if (date.constructor === String){
startCompare = DPGlobal.parseDate(date, DPGlobal.parseFormat('Y-m-d')).getTime();
}
else if (date.constructor === Number){
startCompare = date;
}
else if (date.constructor === Date){
startCompare = date.getTime();
}
},
setEndCompare: function(date) {
if (date === null){
endCompare = date;
} else if (date.constructor === String){
endCompare = DPGlobal.parseDate(date, DPGlobal.parseFormat('Y-m-d')).getTime();
} else if (date.constructor === Number){
endCompare = date;
} else if (date.constructor === Date){
endCompare = date.getTime();
}
},
setValue: function(newDate) {
if (typeof newDate === 'string') {
this.date = DPGlobal.parseDate(newDate, this.format);
} else {
this.date = new Date(newDate);
}
this.set();
this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0);
this.fill();
},
update: function(newDate){
this.date = DPGlobal.parseDate(
typeof newDate === 'string' ? newDate : (this.isInput ? this.element.prop('value') : this.element.data('date')),
this.format
);
this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0);
this.fill();
},
fillDow: function(){
var dowCnt = this.weekStart;
var html = '<tr>';
while (dowCnt < this.weekStart + 7) {
html += '<th class="dow">'+DPGlobal.dates.daysMin[(dowCnt++)%7]+'</th>';
}
html += '</tr>';
this.picker.find('.daterangepicker-days thead').append(html);
},
fillMonths: function(){
var html = '';
var i = 0;
while (i < 12) {
html += '<span class="month">'+DPGlobal.dates.monthsShort[i++]+'</span>';
}
this.picker.find('.daterangepicker-months td').append(html);
},
fill: function() {
var d = new Date(this.viewDate),
year = d.getFullYear(),
month = d.getMonth(),
currentDate = this.date.valueOf();
this.picker.find('.daterangepicker-days th:eq(1)')
.text(year+' / '+DPGlobal.dates.months[month]).append('&nbsp;<small><i class="icon-angle-down"></i><small>');
var prevMonth = new Date(year, month-1, 28,0,0,0,0),
day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth());
prevMonth.setDate(day);
prevMonth.setDate(day - (prevMonth.getDay() - this.weekStart + 7)%7);
var nextMonth = new Date(prevMonth);
nextMonth.setDate(nextMonth.getDate() + 42);
nextMonth = nextMonth.valueOf();
var html = [];
var clsName, prevY, prevM;
while(prevMonth.valueOf() < nextMonth) {
if (prevMonth.getDay() === this.weekStart) {
html.push('<tr>');
}
clsName = this.onRender(prevMonth);
prevY = prevMonth.getFullYear();
prevM = prevMonth.getMonth();
if ((prevM < month && prevY === year) || prevY < year) {
clsName += ' old';
} else if ((prevM > month && prevY === year) || prevY > year) {
clsName += ' new';
}
if (!clsName){
html.push('<td class="day" data-val="'+prevMonth.getTime()+'">' + prevMonth.getDate() + '</td>');
} else {
html.push('<td class="'+clsName+'"></td>');
}
if (prevMonth.getDay() === this.weekEnd) {
html.push('</tr>');
}
prevMonth.setDate(prevMonth.getDate()+1);
}
this.picker.find('.daterangepicker-days tbody').empty().append(html.join(''));
var currentYear = this.date.getFullYear();
var months = this.picker.find('.daterangepicker-months')
.find('th:eq(1)')
.text(year)
.end()
.find('span').removeClass('active');
if (currentYear === year) {
months.eq(this.date.getMonth()).addClass('active');
}
html = '';
year = parseInt(year/10, 10) * 10;
var yearCont = this.picker.find('.daterangepicker-years')
.find('th:eq(1)')
.text(year + '-' + (year + 9))
.end()
.find('td');
year -= 1;
for (var i = -1; i < 11; i++) {
html += '<span class="year'+(i === -1 || i === 10 ? ' old' : '')+(currentYear === year ? ' active' : '')+'">'+year+'</span>';
year += 1;
}
yearCont.html(html);
this.updateRange();
//click = 2;
},
click: function(e) {
e.stopPropagation();
e.preventDefault();
var target = $(e.target).closest('span, td, th');
if (target.length === 1) {
switch(target[0].nodeName.toLowerCase()) {
case 'th':
switch(target[0].className) {
case 'month-switch':
this.showMode(1);
break;
case 'prev':
case 'next':
this.viewDate['set'+DPGlobal.modes[this.viewMode].navFnc].call(
this.viewDate,
this.viewDate['get'+DPGlobal.modes[this.viewMode].navFnc].call(this.viewDate) +
DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1)
);
this.date = new Date(this.viewDate);
this.element.trigger({
type: 'changeDate',
date: this.date,
viewMode: DPGlobal.modes[this.viewMode].clsName
});
this.fill();
this.set();
break;
}
break;
case 'span':
if (target.is('.month')) {
var month = target.parent().find('span').index(target);
this.viewDate.setMonth(month);
} else {
var year = parseInt(target.text(), 10)||0;
this.viewDate.setFullYear(year);
}
if (this.viewMode !== 0) {
this.date = new Date(this.viewDate);
this.element.trigger({
type: 'changeDate',
date: this.date,
viewMode: DPGlobal.modes[this.viewMode].clsName
});
}
this.showMode(-1);
this.fill();
this.set();
break;
case 'td':
//reset
if (target.is('.day') && !target.is('.disabled')){
// reset process for a new range
if (start && end) {
if (!compare) {
click = 2 ;
$(".range").removeClass('range');
$(".start-selected").removeClass("start-selected");
$(".end-selected").removeClass("end-selected");
}
}
if(click === 2) {
if (compare) {
startCompare = null;
endCompare = null;
}
else {
start = null;
end = null;
}
click = null;
switched = false;
if (compare) {
$("td.day").removeClass("start-selected-compare").removeClass("end-selected-compare");
$(".date-input").removeClass("input-selected").removeClass("input-complete");
$(".range-compare").removeClass("range-compare");
} else {
$("td.day").removeClass("start-selected").removeClass("end-selected");
$(".date-input").removeClass("input-selected").removeClass("input-complete");
$(".range").removeClass("range");
}
}
//define start with first click or switched one
if (!click || switched === true) {
if (compare) {
$(".start-selected-compare").removeClass("start-selected-compare");
target.addClass("start-selected-compare");
startCompare = target.data("val");
$("#date-start-compare").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d')));
} else {
$(".start-selected").removeClass("start-selected");
target.addClass("start-selected");
start = target.data("val");
$("#date-start").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d')));
$('#date-start').trigger('change');
}
if(!switched) {click = 1;} else {click = 2;}
if(!switched) {
if (compare) {
$("#date-end-compare").val(null).focus().addClass("input-selected");
target.addClass("start-selected-compare").addClass("end-selected-compare");
} else {
$("#date-end").val(null).focus().addClass("input-selected");
target.addClass("start-selected").addClass("end-selected");
}
}
if (compare) {
$("#date-start-compare").removeClass("input-selected").addClass("input-complete");
}
else {
$("#date-start").removeClass("input-selected").addClass("input-complete");
}
}
//define end
else {
if (compare) {
$(".end-selected-compare").removeClass("end-selected-compare");
target.addClass("end-selected-compare");
endCompare = target.data("val");
$("#date-end-compare").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d')));
click = 2;
$("#date-end-compare").removeClass("input-selected").addClass("input-complete");
} else {
$(".end-selected").removeClass("end-selected");
target.addClass("end-selected");
end = target.data("val");
$("#date-end").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d')));
click = 2;
$("#date-end").removeClass("input-selected").addClass("input-complete");
$('#date-end').trigger('change');
}
}
}
break;
}
}
},
updateRange: function() {
$("#datepicker .day").each(function(){
var date_val = parseInt($(this).data('val'),10);
if (end && start) {
if(date_val > start && date_val < end) {
$(this).addClass("range");
}
if(date_val === start) {
$(this).addClass("start-selected");
}
if(date_val === end) {
$(this).addClass("end-selected");
}
}
if (endCompare && startCompare) {
$(this).removeClass("range-compare").removeClass("start-selected-compare").removeClass("end-selected-compare");
if(date_val > startCompare && date_val < endCompare) {
$(this).addClass("range-compare");
}
if(date_val === startCompare) {
$(this).addClass("start-selected-compare");
}
if(date_val === endCompare) {
$(this).addClass("end-selected-compare");
}
} else {
$(this).removeClass("range-compare").removeClass("start-selected-compare").removeClass("end-selected-compare");
}
});
},
mouseoverRange: function(){
//range
$("#datepicker .day").each(function(){
var date_val = parseInt($(this).data('val'),10);
if (compare) {
if (!endCompare && date_val > startCompare && date_val < over) {
$(this).not(".old").not(".new").addClass("range-compare");
}
else if (!startCompare && date_val > over && date_val < endCompare) {
$(this).not(".old").not(".new").addClass("range-compare");
}
else if (startCompare && endCompare) {
$(this).addClass("range-compare");
}
}
else {
if (!end && date_val > start && date_val < over) {
$(this).not(".old").not(".new").addClass("range");
}
else if (!start && date_val > over && date_val < end) {
$(this).not(".old").not(".new").addClass("range");
}
}
});
},
mouseover: function(e){
//data-val from day overed
over = $(e.target).data("val");
//action when one of two dates has been set
if(click === 1 && over){
if (compare) {
$("#datepicker .range-compare").removeClass("range-compare");
if (startCompare && over < startCompare) {
endCompare = startCompare;
$("#date-end-compare").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$("#date-start-compare").val(null).focus().addClass("input-selected");
$("#datepicker .start-selected-compare").removeClass("start-selected-compare").addClass("end-selected-compare");
startCompare = null;
switched = true;
}
else if (endCompare && over > endCompare) {
startCompare = endCompare;
$("#date-start-compare").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$("#date-end-compare").val(null).focus().addClass("input-selected");
$("#datepicker .end-selected-compare").removeClass("end-selected-compare").addClass("start-selected-compare");
endCompare = null;
switched = false;
}
if (startCompare) {
$(".end-selected-compare").removeClass("end-selected-compare");
$(e.target).addClass("end-selected-compare");
}
else if (endCompare) {
$(".start-selected-compare").removeClass("start-selected-compare");
$(e.target).addClass("start-selected-compare");
}
}
else {
$("#datepicker .range").removeClass("range");
if (start && over < start) {
end = start;
$("#date-end").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$('#date-end').trigger('change');
$("#date-start").val(null).focus().addClass("input-selected");
$("#datepicker .start-selected").removeClass("start-selected").addClass("end-selected");
start = null;
switched = true;
}
else if (end && over > end) {
start = end;
$("#date-start").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$('#date-start').trigger('change');
$("#date-end").val(null).focus().addClass("input-selected");
$("#datepicker .end-selected").removeClass("end-selected").addClass("start-selected");
end = null;
switched = false;
}
if (start) {
$(".end-selected").removeClass("end-selected");
$(e.target).addClass("end-selected");
}
else if (end) {
$(".start-selected").removeClass("start-selected");
$(e.target).addClass("start-selected");
}
}
//switch
$(".date-input").removeClass("input-complete");
this.mouseoverRange();
}
},
mouseout: function(){
if (compare) {
if (!startCompare||!endCompare) {
$("#datepicker .range-compare").removeClass("range-compare");
}
if (!endCompare) {
$(".end-selected-compare").removeClass("end-selected-compare");
}
else if (!startCompare)
$(".start-selected-compare").removeClass("start-selected-compare");
}
else {
if (!start||!end) {
$("#datepicker .range").removeClass("range");
}
if (!end) {
$(".end-selected").removeClass("end-selected");
}
else if (!start) {
$(".start-selected").removeClass("start-selected");
}
}
},
mousedown: function(e){
e.stopPropagation();
e.preventDefault();
},
showMode: function(dir) {
if (dir)
this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir));
this.picker.find('>div').hide().filter('.daterangepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
}
};
$.fn.daterangepicker = function ( option, val ) {
return this.each(function () {
var $this = $(this),
data = $this.data('daterangepicker'),
options = typeof option === 'object' && option;
if (!data) {
$this.data('daterangepicker', (data = new DateRangePicker(this, $.extend({}, $.fn.daterangepicker.defaults,options))));
}
if (typeof option === 'string') { data[option](val);}
});
};
$.fn.daterangepicker.defaults = {
onRender: function() {
return '';
}
};
$.fn.daterangepicker.Constructor = DateRangePicker;
var DPGlobal = {
modes: [
{
clsName: 'days',
navFnc: 'Month',
navStep: 1
},
{
clsName: 'months',
navFnc: 'FullYear',
navStep: 1
},
{
clsName: 'years',
navFnc: 'FullYear',
navStep: 10
}],
dates:{
days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
},
isLeapYear: function (year) {
return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0));
},
getDaysInMonth: function (year, month) {
return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
},
parseFormat: function(format){
var separator = format.match(/[.\/\-\s].*?/),
parts = format.split(/\W+/);
if (!separator || !parts || parts.length === 0){
throw new Error("Invalid date format.");
}
return {separator: separator, parts: parts};
},
parseDate: function(date, format) {
var parts = date.split(format.separator),
date = new Date(),
val;
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
date.setMilliseconds(0);
if (parts.length === format.parts.length) {
var year = date.getFullYear(), day = date.getDate(), month = date.getMonth();
for (var i=0, cnt = format.parts.length; i < cnt; i++) {
val = parseInt(parts[i], 10)||1;
switch(format.parts[i]) {
case 'dd':
case 'd':
day = val;
date.setDate(val);
break;
case 'mm':
case 'm':
month = val - 1;
date.setMonth(val - 1);
break;
case 'yy':
case 'y':
year = 2000 + val;
date.setFullYear(2000 + val);
break;
case 'yyyy':
case 'Y':
year = val;
date.setFullYear(val);
break;
}
}
date = new Date(year, month, day, 0 ,0 ,0);
}
return date;
},
formatDate: function(date, format){
var val = {
d: date.getDate(),
m: date.getMonth() + 1,
yy: date.getFullYear().toString().substring(2),
y: date.getFullYear().toString().substring(2),
yyyy: date.getFullYear(),
Y: date.getFullYear()
};
val.d = (val.d < 10 ? '0' : '') + val.d;
val.m = (val.m < 10 ? '0' : '') + val.m;
var date = [];
for (var i=0, cnt = format.parts.length; i < cnt; i++) {
date.push(val[format.parts[i]]);
}
return date.join(format.separator);
},
headTemplate: '<thead>'+
'<tr>'+
'<th class="prev"><i class="icon-angle-left"></i></th>'+
'<th colspan="5" class="month-switch"></th>'+
'<th class="next"><i class="icon-angle-right"</th>'+
'</tr>'+
'</thead>',
contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>'
};
DPGlobal.template = '<div class="daterangepicker">'+
'<div class="daterangepicker-days">'+
'<table class=" table-condensed">'+
DPGlobal.headTemplate+
'<tbody></tbody>'+
'</table>'+
'</div>'+
'<div class="daterangepicker-months">'+
'<table class="table-condensed">'+
DPGlobal.headTemplate+
DPGlobal.contTemplate+
'</table>'+
'</div>'+
'<div class="daterangepicker-years">'+
'<table class="table-condensed">'+
DPGlobal.headTemplate+
DPGlobal.contTemplate+
'</table>'+
'</div>'+
'</div>';
}( window.jQuery );

View File

@@ -0,0 +1,294 @@
/*
* jQuery File Upload Image Preview & Resize Plugin 1.3.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint nomen: true, unparam: true, regexp: true */
/*global define, window, document, DataView, Blob, Uint8Array */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define([
'jquery',
'load-image',
'load-image-meta',
'load-image-exif',
'load-image-ios',
'canvas-to-blob',
'./jquery.fileupload-process'
], factory);
} else {
// Browser globals:
factory(
window.jQuery,
window.loadImage
);
}
}(function ($, loadImage) {
'use strict';
// Prepend to the default processQueue:
$.blueimp.fileupload.prototype.options.processQueue.unshift(
{
action: 'loadImageMetaData',
disableImageHead: '@',
disableExif: '@',
disableExifThumbnail: '@',
disableExifSub: '@',
disableExifGps: '@',
disabled: '@disableImageMetaDataLoad'
},
{
action: 'loadImage',
// Use the action as prefix for the "@" options:
prefix: true,
fileTypes: '@',
maxFileSize: '@',
noRevoke: '@',
disabled: '@disableImageLoad'
},
{
action: 'resizeImage',
// Use "image" as prefix for the "@" options:
prefix: 'image',
maxWidth: '@',
maxHeight: '@',
minWidth: '@',
minHeight: '@',
crop: '@',
orientation: '@',
disabled: '@disableImageResize'
},
{
action: 'saveImage',
disabled: '@disableImageResize'
},
{
action: 'saveImageMetaData',
disabled: '@disableImageMetaDataSave'
},
{
action: 'resizeImage',
// Use "preview" as prefix for the "@" options:
prefix: 'preview',
maxWidth: '@',
maxHeight: '@',
minWidth: '@',
minHeight: '@',
crop: '@',
orientation: '@',
thumbnail: '@',
canvas: '@',
disabled: '@disableImagePreview'
},
{
action: 'setImage',
name: '@imagePreviewName',
disabled: '@disableImagePreview'
}
);
// The File Upload Resize plugin extends the fileupload widget
// with image resize functionality:
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
options: {
// The regular expression for the types of images to load:
// matched against the file type:
loadImageFileTypes: /^image\/(gif|jpeg|png)$/,
// The maximum file size of images to load:
loadImageMaxFileSize: 10000000, // 10MB
// The maximum width of resized images:
imageMaxWidth: 1920,
// The maximum height of resized images:
imageMaxHeight: 1080,
// Defines the image orientation (1-8) or takes the orientation
// value from Exif data if set to true:
imageOrientation: false,
// Define if resized images should be cropped or only scaled:
imageCrop: false,
// Disable the resize image functionality by default:
disableImageResize: true,
// The maximum width of the preview images:
previewMaxWidth: 80,
// The maximum height of the preview images:
previewMaxHeight: 80,
// Defines the preview orientation (1-8) or takes the orientation
// value from Exif data if set to true:
previewOrientation: true,
// Create the preview using the Exif data thumbnail:
previewThumbnail: true,
// Define if preview images should be cropped or only scaled:
previewCrop: false,
// Define if preview images should be resized as canvas elements:
previewCanvas: true
},
processActions: {
// Loads the image given via data.files and data.index
// as img element, if the browser supports the File API.
// Accepts the options fileTypes (regular expression)
// and maxFileSize (integer) to limit the files to load:
loadImage: function (data, options) {
if (options.disabled) {
return data;
}
var that = this,
file = data.files[data.index],
dfd = $.Deferred();
if (($.type(options.maxFileSize) === 'number' &&
file.size > options.maxFileSize) ||
(options.fileTypes &&
!options.fileTypes.test(file.type)) ||
!loadImage(
file,
function (img) {
if (img.src) {
data.img = img;
}
dfd.resolveWith(that, [data]);
},
options
)) {
return data;
}
return dfd.promise();
},
// Resizes the image given as data.canvas or data.img
// and updates data.canvas or data.img with the resized image.
// Also stores the resized image as preview property.
// Accepts the options maxWidth, maxHeight, minWidth,
// minHeight, canvas and crop:
resizeImage: function (data, options) {
if (options.disabled || !(data.canvas || data.img)) {
return data;
}
options = $.extend({canvas: true}, options);
var that = this,
dfd = $.Deferred(),
img = (options.canvas && data.canvas) || data.img,
resolve = function (newImg) {
if (newImg && (newImg.width !== img.width ||
newImg.height !== img.height)) {
data[newImg.getContext ? 'canvas' : 'img'] = newImg;
}
data.preview = newImg;
dfd.resolveWith(that, [data]);
},
thumbnail;
if (data.exif) {
if (options.orientation === true) {
options.orientation = data.exif.get('Orientation');
}
if (options.thumbnail) {
thumbnail = data.exif.get('Thumbnail');
if (thumbnail) {
loadImage(thumbnail, resolve, options);
return dfd.promise();
}
}
}
if (img) {
resolve(loadImage.scale(img, options));
return dfd.promise();
}
return data;
},
// Saves the processed image given as data.canvas
// inplace at data.index of data.files:
saveImage: function (data, options) {
if (!data.canvas || options.disabled) {
return data;
}
var that = this,
file = data.files[data.index],
name = file.name,
dfd = $.Deferred(),
callback = function (blob) {
if (!blob.name) {
if (file.type === blob.type) {
blob.name = file.name;
} else if (file.name) {
blob.name = file.name.replace(
/\..+$/,
'.' + blob.type.substr(6)
);
}
}
// Store the created blob at the position
// of the original file in the files list:
data.files[data.index] = blob;
dfd.resolveWith(that, [data]);
};
// Use canvas.mozGetAsFile directly, to retain the filename, as
// Gecko doesn't support the filename option for FormData.append:
if (data.canvas.mozGetAsFile) {
callback(data.canvas.mozGetAsFile(
(/^image\/(jpeg|png)$/.test(file.type) && name) ||
((name && name.replace(/\..+$/, '')) ||
'blob') + '.png',
file.type
));
} else if (data.canvas.toBlob) {
data.canvas.toBlob(callback, file.type);
} else {
return data;
}
return dfd.promise();
},
loadImageMetaData: function (data, options) {
if (options.disabled) {
return data;
}
var that = this,
dfd = $.Deferred();
loadImage.parseMetaData(data.files[data.index], function (result) {
$.extend(data, result);
dfd.resolveWith(that, [data]);
}, options);
return dfd.promise();
},
saveImageMetaData: function (data, options) {
if (!(data.imageHead && data.canvas &&
data.canvas.toBlob && !options.disabled)) {
return data;
}
var file = data.files[data.index],
blob = new Blob([
data.imageHead,
// Resized images always have a head size of 20 bytes,
// including the JPEG marker and a minimal JFIF header:
this._blobSlice.call(file, 20)
], {type: file.type});
blob.name = file.name;
data.files[data.index] = blob;
return data;
},
// Sets the resized version of the image as a property of the
// file object, must be called after "saveImage":
setImage: function (data, options) {
if (data.preview && !options.disabled) {
data.files[data.index][options.name || 'preview'] = data.preview;
}
return data;
}
}
});
}));

View File

@@ -0,0 +1,164 @@
/*
* jQuery File Upload Processing Plugin 1.2.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2012, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint nomen: true, unparam: true */
/*global define, window */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define([
'jquery',
'./jquery.fileupload'
], factory);
} else {
// Browser globals:
factory(
window.jQuery
);
}
}(function ($) {
'use strict';
var originalAdd = $.blueimp.fileupload.prototype.options.add;
// The File Upload Processing plugin extends the fileupload widget
// with file processing functionality:
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
options: {
// The list of processing actions:
processQueue: [
/*
{
action: 'log',
type: 'debug'
}
*/
],
add: function (e, data) {
var $this = $(this);
data.process(function () {
return $this.fileupload('process', data);
});
originalAdd.call(this, e, data);
}
},
processActions: {
/*
log: function (data, options) {
console[options.type](
'Processing "' + data.files[data.index].name + '"'
);
}
*/
},
_processFile: function (data) {
var that = this,
dfd = $.Deferred().resolveWith(that, [data]),
chain = dfd.promise();
this._trigger('process', null, data);
$.each(data.processQueue, function (i, settings) {
var func = function (data) {
return that.processActions[settings.action].call(
that,
data,
settings
);
};
chain = chain.pipe(func, settings.always && func);
});
chain
.done(function () {
that._trigger('processdone', null, data);
that._trigger('processalways', null, data);
})
.fail(function () {
that._trigger('processfail', null, data);
that._trigger('processalways', null, data);
});
return chain;
},
// Replaces the settings of each processQueue item that
// are strings starting with an "@", using the remaining
// substring as key for the option map,
// e.g. "@autoUpload" is replaced with options.autoUpload:
_transformProcessQueue: function (options) {
var processQueue = [];
$.each(options.processQueue, function () {
var settings = {},
action = this.action,
prefix = this.prefix === true ? action : this.prefix;
$.each(this, function (key, value) {
if ($.type(value) === 'string' &&
value.charAt(0) === '@') {
settings[key] = options[
value.slice(1) || (prefix ? prefix +
key.charAt(0).toUpperCase() + key.slice(1) : key)
];
} else {
settings[key] = value;
}
});
processQueue.push(settings);
});
options.processQueue = processQueue;
},
// Returns the number of files currently in the processsing queue:
processing: function () {
return this._processing;
},
// Processes the files given as files property of the data parameter,
// returns a Promise object that allows to bind callbacks:
process: function (data) {
var that = this,
options = $.extend({}, this.options, data);
if (options.processQueue && options.processQueue.length) {
this._transformProcessQueue(options);
if (this._processing === 0) {
this._trigger('processstart');
}
$.each(data.files, function (index) {
var opts = index ? $.extend({}, options) : options,
func = function () {
return that._processFile(opts);
};
opts.index = index;
that._processing += 1;
that._processingQueue = that._processingQueue.pipe(func, func)
.always(function () {
that._processing -= 1;
if (that._processing === 0) {
that._trigger('processstop');
}
});
});
}
return this._processingQueue;
},
_create: function () {
this._super();
this._processing = 0;
this._processingQueue = $.Deferred().resolveWith(this)
.promise();
}
});
}));

View File

@@ -0,0 +1,117 @@
/*
* jQuery File Upload Validation Plugin 1.1.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint nomen: true, unparam: true, regexp: true */
/*global define, window */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define([
'jquery',
'./jquery.fileupload-process'
], factory);
} else {
// Browser globals:
factory(
window.jQuery
);
}
}(function ($) {
'use strict';
// Append to the default processQueue:
$.blueimp.fileupload.prototype.options.processQueue.push(
{
action: 'validate',
// Always trigger this action,
// even if the previous action was rejected:
always: true,
// Options taken from the global options map:
acceptFileTypes: '@',
maxFileSize: '@',
minFileSize: '@',
maxNumberOfFiles: '@',
disabled: '@disableValidation'
}
);
// The File Upload Validation plugin extends the fileupload widget
// with file validation functionality:
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
options: {
/*
// The regular expression for allowed file types, matches
// against either file type or file name:
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
// The maximum allowed file size in bytes:
maxFileSize: 10000000, // 10 MB
// The minimum allowed file size in bytes:
minFileSize: undefined, // No minimal file size
// The limit of files to be uploaded:
maxNumberOfFiles: 10,
*/
// Function returning the current number of files,
// has to be overriden for maxNumberOfFiles validation:
getNumberOfFiles: $.noop,
// Error and info messages:
messages: {
maxNumberOfFiles: 'Maximum number of files exceeded',
acceptFileTypes: 'File type not allowed',
maxFileSize: 'File is too large',
minFileSize: 'File is too small'
}
},
processActions: {
validate: function (data, options) {
if (options.disabled) {
return data;
}
var dfd = $.Deferred(),
settings = this.options,
file = data.files[data.index];
if ($.type(options.maxNumberOfFiles) === 'number' &&
(settings.getNumberOfFiles() || 0) + data.files.length >
options.maxNumberOfFiles) {
file.error = settings.i18n('maxNumberOfFiles');
} else if (options.acceptFileTypes &&
!(options.acceptFileTypes.test(file.type) ||
options.acceptFileTypes.test(file.name))) {
file.error = settings.i18n('acceptFileTypes');
} else if (options.maxFileSize && file.size >
options.maxFileSize) {
file.error = settings.i18n('maxFileSize');
} else if ($.type(file.size) === 'number' &&
file.size < options.minFileSize) {
file.error = settings.i18n('minFileSize');
} else {
delete file.error;
}
if (file.error || data.files.error) {
data.files.error = true;
dfd.rejectWith(this, [data]);
} else {
dfd.resolveWith(this, [data]);
}
return dfd.promise();
}
}
});
}));

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,208 @@
/*
* jQuery Iframe Transport Plugin 1.8.0
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint unparam: true, nomen: true */
/*global define, window, document */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['jquery'], factory);
} else {
// Browser globals:
factory(window.jQuery);
}
}(function ($) {
'use strict';
// Helper variable to create unique names for the transport iframes:
var counter = 0;
// The iframe transport accepts four additional options:
// options.fileInput: a jQuery collection of file input fields
// options.paramName: the parameter name for the file form data,
// overrides the name property of the file input field(s),
// can be a string or an array of strings.
// options.formData: an array of objects with name and value properties,
// equivalent to the return data of .serializeArray(), e.g.:
// [{name: 'a', value: 1}, {name: 'b', value: 2}]
// options.initialIframeSrc: the URL of the initial iframe src,
// by default set to "javascript:false;"
$.ajaxTransport('iframe', function (options) {
if (options.async) {
// javascript:false as initial iframe src
// prevents warning popups on HTTPS in IE6:
var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
form,
iframe,
addParamChar;
return {
send: function (_, completeCallback) {
form = $('<form style="display:none;"></form>');
form.attr('accept-charset', options.formAcceptCharset);
addParamChar = /\?/.test(options.url) ? '&' : '?';
// XDomainRequest only supports GET and POST:
if (options.type === 'DELETE') {
options.url = options.url + addParamChar + '_method=DELETE';
options.type = 'POST';
} else if (options.type === 'PUT') {
options.url = options.url + addParamChar + '_method=PUT';
options.type = 'POST';
} else if (options.type === 'PATCH') {
options.url = options.url + addParamChar + '_method=PATCH';
options.type = 'POST';
}
// IE versions below IE8 cannot set the name property of
// elements that have already been added to the DOM,
// so we set the name along with the iframe HTML markup:
counter += 1;
iframe = $(
'<iframe src="' + initialIframeSrc +
'" name="iframe-transport-' + counter + '"></iframe>'
).bind('load', function () {
var fileInputClones,
paramNames = $.isArray(options.paramName) ?
options.paramName : [options.paramName];
iframe
.unbind('load')
.bind('load', function () {
var response;
// Wrap in a try/catch block to catch exceptions thrown
// when trying to access cross-domain iframe contents:
try {
response = iframe.contents();
// Google Chrome and Firefox do not throw an
// exception when calling iframe.contents() on
// cross-domain requests, so we unify the response:
if (!response.length || !response[0].firstChild) {
throw new Error();
}
} catch (e) {
response = undefined;
}
// The complete callback returns the
// iframe content document as response object:
completeCallback(
200,
'success',
{'iframe': response}
);
// Fix for IE endless progress bar activity bug
// (happens on form submits to iframe targets):
$('<iframe src="' + initialIframeSrc + '"></iframe>')
.appendTo(form);
window.setTimeout(function () {
// Removing the form in a setTimeout call
// allows Chrome's developer tools to display
// the response result
form.remove();
}, 0);
});
form
.prop('target', iframe.prop('name'))
.prop('action', options.url)
.prop('method', options.type);
if (options.formData) {
$.each(options.formData, function (index, field) {
$('<input type="hidden"/>')
.prop('name', field.name)
.val(field.value)
.appendTo(form);
});
}
if (options.fileInput && options.fileInput.length &&
options.type === 'POST') {
fileInputClones = options.fileInput.clone();
// Insert a clone for each file input field:
options.fileInput.after(function (index) {
return fileInputClones[index];
});
if (options.paramName) {
options.fileInput.each(function (index) {
$(this).prop(
'name',
paramNames[index] || options.paramName
);
});
}
// Appending the file input fields to the hidden form
// removes them from their original location:
form
.append(options.fileInput)
.prop('enctype', 'multipart/form-data')
// enctype must be set as encoding for IE:
.prop('encoding', 'multipart/form-data');
}
form.submit();
// Insert the file input fields at their original location
// by replacing the clones with the originals:
if (fileInputClones && fileInputClones.length) {
options.fileInput.each(function (index, input) {
var clone = $(fileInputClones[index]);
$(input).prop('name', clone.prop('name'));
clone.replaceWith(input);
});
}
});
form.append(iframe).appendTo(document.body);
},
abort: function () {
if (iframe) {
// javascript:false as iframe src aborts the request
// and prevents warning popups on HTTPS in IE6.
// concat is used to avoid the "Script URL" JSLint error:
iframe
.unbind('load')
.prop('src', initialIframeSrc);
}
if (form) {
form.remove();
}
}
};
}
});
// The iframe transport returns the iframe content document as response.
// The following adds converters from iframe to text, json, html, xml
// and script.
// Please note that the Content-Type for JSON responses has to be text/plain
// or text/html, if the browser doesn't include application/json in the
// Accept header, else IE will show a download dialog.
// The Content-Type for XML responses on the other hand has to be always
// application/xml or text/xml, so IE properly parses the XML response.
// See also
// https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
$.ajaxSetup({
converters: {
'iframe text': function (iframe) {
return iframe && $(iframe[0].body).text();
},
'iframe json': function (iframe) {
return iframe && $.parseJSON($(iframe[0].body).text());
},
'iframe html': function (iframe) {
return iframe && $(iframe[0].body).html();
},
'iframe xml': function (iframe) {
var xmlDoc = iframe && iframe[0];
return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
$.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
$(xmlDoc.body).html());
},
'iframe script': function (iframe) {
return iframe && $.globalEval($(iframe[0].body).text());
}
}
});
}));

View File

@@ -0,0 +1,8 @@
Modernizr.load([
{
test: window.matchMedia,
nope: ["themes/default/js/vendor/matchMedia.js", "themes/default/js/vendor/matchMedia.addListener.js"]
},
"themes/default/js/vendor/enquire.js",
"themes/default/js/admin-theme.js"
]);

View File

@@ -0,0 +1,102 @@
var Tree = function (element, options)
{
this.$element = $(element);
this.options = $.extend({}, $.fn.tree.defaults, options);
this.init();
};
Tree.prototype =
{
constructor: Tree,
init: function ()
{
var that = $(this);
this.$element.find("label.tree-toggler, .icon-folder-close, .icon-folder-open").click(
function ()
{
if ($(this).parent().parent().children("ul.tree").is(":visible"))
{
$(this).parent().children(".icon-folder-open")
.removeClass("icon-folder-open")
.addClass("icon-folder-close");
that.trigger('collapse');
}
else
{
$(this).parent().children(".icon-folder-close")
.removeClass("icon-folder-close")
.addClass("icon-folder-open");
that.trigger('expand');
}
$(this).parent().parent().children("ul.tree").toggle(300);
}
);
this.$element.find("li").click(
function ()
{
$('.tree-selected').removeClass("tree-selected");
$('li input:checked').parent().addClass("tree-selected");
}
);
return $(this);
},
collapseAll : function($speed)
{
this.$element.find("label.tree-toggler").each(
function()
{
$(this).parent().children(".icon-folder-open")
.removeClass("icon-folder-open")
.addClass("icon-folder-close");
$(this).parent().parent().children("ul.tree").hide($speed);
}
);
return $(this);
},
expandAll : function($speed)
{
this.$element.find("label.tree-toggler").each(
function()
{
$(this).parent().children(".icon-folder-close")
.removeClass("icon-folder-close")
.addClass("icon-folder-open");
$(this).parent().parent().children("ul.tree").show($speed);
}
);
return $(this);
},
};
$.fn.tree = function (option, value)
{
var methodReturn;
var $set = this.each(
function ()
{
var $this = $(this);
var data = $this.data('tree');
var options = typeof option === 'object' && option;
if (!data){
$this.data('tree', (data = new Tree(this, options)));
}
if (typeof option === 'string') {
methodReturn = data[option](value);
}
}
);
return (methodReturn === undefined) ? $set : methodReturn;
};
$.fn.tree.Constructor = Tree;

1999
admin-dev/themes/default/js/vendor/bootstrap.js vendored Executable file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,293 @@
/*!
* enquire.js v2.1.0 - Awesome Media Queries in JavaScript
* Copyright (c) 2013 Nick Williams - http://wicky.nillia.ms/enquire.js
* License: MIT (http://www.opensource.org/licenses/mit-license.php)
*/
;(function (name, context, factory) {
var matchMedia = context.matchMedia;
if (typeof module !== 'undefined' && module.exports) {
module.exports = factory(matchMedia);
}
else if (typeof define === 'function' && define.amd) {
define(function() {
return (context[name] = factory(matchMedia));
});
}
else {
context[name] = factory(matchMedia);
}
}('enquire', this, function (matchMedia) {
'use strict';
/*jshint unused:false */
/**
* Helper function for iterating over a collection
*
* @param collection
* @param fn
*/
function each(collection, fn) {
var i = 0,
length = collection.length,
cont;
for(i; i < length; i++) {
cont = fn(collection[i], i);
if(cont === false) {
break; //allow early exit
}
}
}
/**
* Helper function for determining whether target object is an array
*
* @param target the object under test
* @return {Boolean} true if array, false otherwise
*/
function isArray(target) {
return Object.prototype.toString.apply(target) === '[object Array]';
}
/**
* Helper function for determining whether target object is a function
*
* @param target the object under test
* @return {Boolean} true if function, false otherwise
*/
function isFunction(target) {
return typeof target === 'function';
}
/**
* Delegate to handle a media query being matched and unmatched.
*
* @param {object} options
* @param {function} options.match callback for when the media query is matched
* @param {function} [options.unmatch] callback for when the media query is unmatched
* @param {function} [options.setup] one-time callback triggered the first time a query is matched
* @param {boolean} [options.deferSetup=false] should the setup callback be run immediately, rather than first time query is matched?
* @constructor
*/
function QueryHandler(options) {
this.options = options;
!options.deferSetup && this.setup();
}
QueryHandler.prototype = {
/**
* coordinates setup of the handler
*
* @function
*/
setup : function() {
if(this.options.setup) {
this.options.setup();
}
this.initialised = true;
},
/**
* coordinates setup and triggering of the handler
*
* @function
*/
on : function() {
!this.initialised && this.setup();
this.options.match && this.options.match();
},
/**
* coordinates the unmatch event for the handler
*
* @function
*/
off : function() {
this.options.unmatch && this.options.unmatch();
},
/**
* called when a handler is to be destroyed.
* delegates to the destroy or unmatch callbacks, depending on availability.
*
* @function
*/
destroy : function() {
this.options.destroy ? this.options.destroy() : this.off();
},
/**
* determines equality by reference.
* if object is supplied compare options, if function, compare match callback
*
* @function
* @param {object || function} [target] the target for comparison
*/
equals : function(target) {
return this.options === target || this.options.match === target;
}
};
/**
* Represents a single media query, manages it's state and registered handlers for this query
*
* @constructor
* @param {string} query the media query string
* @param {boolean} [isUnconditional=false] whether the media query should run regardless of whether the conditions are met. Primarily for helping older browsers deal with mobile-first design
*/
function MediaQuery(query, isUnconditional) {
this.query = query;
this.isUnconditional = isUnconditional;
this.handlers = [];
this.mql = matchMedia(query);
var self = this;
this.listener = function(mql) {
self.mql = mql;
self.assess();
};
this.mql.addListener(this.listener);
}
MediaQuery.prototype = {
/**
* add a handler for this query, triggering if already active
*
* @param {object} handler
* @param {function} handler.match callback for when query is activated
* @param {function} [handler.unmatch] callback for when query is deactivated
* @param {function} [handler.setup] callback for immediate execution when a query handler is registered
* @param {boolean} [handler.deferSetup=false] should the setup callback be deferred until the first time the handler is matched?
*/
addHandler : function(handler) {
var qh = new QueryHandler(handler);
this.handlers.push(qh);
this.matches() && qh.on();
},
/**
* removes the given handler from the collection, and calls it's destroy methods
*
* @param {object || function} handler the handler to remove
*/
removeHandler : function(handler) {
var handlers = this.handlers;
each(handlers, function(h, i) {
if(h.equals(handler)) {
h.destroy();
return !handlers.splice(i,1); //remove from array and exit each early
}
});
},
/**
* Determine whether the media query should be considered a match
*
* @return {Boolean} true if media query can be considered a match, false otherwise
*/
matches : function() {
return this.mql.matches || this.isUnconditional;
},
/**
* Clears all handlers and unbinds events
*/
clear : function() {
each(this.handlers, function(handler) {
handler.destroy();
});
this.mql.removeListener(this.listener);
this.handlers.length = 0; //clear array
},
/*
* Assesses the query, turning on all handlers if it matches, turning them off if it doesn't match
*/
assess : function() {
var action = this.matches() ? 'on' : 'off';
each(this.handlers, function(handler) {
handler[action]();
});
}
};
/**
* Allows for registration of query handlers.
* Manages the query handler's state and is responsible for wiring up browser events
*
* @constructor
*/
function MediaQueryDispatch () {
if(!matchMedia) {
throw new Error('matchMedia not present, legacy browsers require a polyfill');
}
this.queries = {};
this.browserIsIncapable = !matchMedia('only all').matches;
}
MediaQueryDispatch.prototype = {
/**
* Registers a handler for the given media query
*
* @param {string} q the media query
* @param {object || Array || Function} options either a single query handler object, a function, or an array of query handlers
* @param {function} options.match fired when query matched
* @param {function} [options.unmatch] fired when a query is no longer matched
* @param {function} [options.setup] fired when handler first triggered
* @param {boolean} [options.deferSetup=false] whether setup should be run immediately or deferred until query is first matched
* @param {boolean} [shouldDegrade=false] whether this particular media query should always run on incapable browsers
*/
register : function(q, options, shouldDegrade) {
var queries = this.queries,
isUnconditional = shouldDegrade && this.browserIsIncapable;
if(!queries[q]) {
queries[q] = new MediaQuery(q, isUnconditional);
}
//normalise to object in an array
if(isFunction(options)) {
options = { match : options };
}
if(!isArray(options)) {
options = [options];
}
each(options, function(handler) {
queries[q].addHandler(handler);
});
return this;
},
/**
* unregisters a query and all it's handlers, or a specific handler for a query
*
* @param {string} q the media query to target
* @param {object || function} [handler] specific handler to unregister
*/
unregister : function(q, handler) {
var query = this.queries[q];
if(query) {
if(handler) {
query.removeHandler(handler);
}
else {
query.clear();
delete this.queries[q];
}
}
return this;
}
};
return new MediaQueryDispatch();
}));

View File

@@ -0,0 +1,201 @@
/**
* Timeago is a jQuery plugin that makes it easy to support automatically
* updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
*
* @name timeago
* @version 1.3.0
* @requires jQuery v1.2.3+
* @author Ryan McGeary
* @license MIT License - http://www.opensource.org/licenses/mit-license.php
*
* For usage and examples, visit:
* http://timeago.yarp.com/
*
* Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
*/
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else {
// Browser globals
factory(jQuery);
}
}(function ($) {
$.timeago = function(timestamp) {
if (timestamp instanceof Date) {
return inWords(timestamp);
} else if (typeof timestamp === "string") {
return inWords($.timeago.parse(timestamp));
} else if (typeof timestamp === "number") {
return inWords(new Date(timestamp));
} else {
return inWords($.timeago.datetime(timestamp));
}
};
var $t = $.timeago;
$.extend($.timeago, {
settings: {
refreshMillis: 60000,
allowFuture: false,
localeTitle: false,
cutoff: 0,
strings: {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "ago",
suffixFromNow: "from now",
seconds: "less than a minute",
minute: "about a minute",
minutes: "%d minutes",
hour: "about an hour",
hours: "about %d hours",
day: "a day",
days: "%d days",
month: "about a month",
months: "%d months",
year: "about a year",
years: "%d years",
wordSeparator: " ",
numbers: []
}
},
inWords: function(distanceMillis) {
var $l = this.settings.strings;
var prefix = $l.prefixAgo;
var suffix = $l.suffixAgo;
if (this.settings.allowFuture) {
if (distanceMillis < 0) {
prefix = $l.prefixFromNow;
suffix = $l.suffixFromNow;
}
}
var seconds = Math.abs(distanceMillis) / 1000;
var minutes = seconds / 60;
var hours = minutes / 60;
var days = hours / 24;
var years = days / 365;
function substitute(stringOrFunction, number) {
var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
var value = ($l.numbers && $l.numbers[number]) || number;
return string.replace(/%d/i, value);
}
var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
seconds < 90 && substitute($l.minute, 1) ||
minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
minutes < 90 && substitute($l.hour, 1) ||
hours < 24 && substitute($l.hours, Math.round(hours)) ||
hours < 42 && substitute($l.day, 1) ||
days < 30 && substitute($l.days, Math.round(days)) ||
days < 45 && substitute($l.month, 1) ||
days < 365 && substitute($l.months, Math.round(days / 30)) ||
years < 1.5 && substitute($l.year, 1) ||
substitute($l.years, Math.round(years));
var separator = $l.wordSeparator || "";
if ($l.wordSeparator === undefined) { separator = " "; }
return $.trim([prefix, words, suffix].join(separator));
},
parse: function(iso8601) {
var s = $.trim(iso8601);
s = s.replace(/\.\d+/,""); // remove milliseconds
s = s.replace(/-/,"/").replace(/-/,"/");
s = s.replace(/T/," ").replace(/Z/," UTC");
s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
return new Date(s);
},
datetime: function(elem) {
var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
return $t.parse(iso8601);
},
isTime: function(elem) {
// jQuery's `is()` doesn't play well with HTML5 in IE
return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
}
});
// functions that can be called via $(el).timeago('action')
// init is default when no action is given
// functions are called with context of a single element
var functions = {
init: function(){
var refresh_el = $.proxy(refresh, this);
refresh_el();
var $s = $t.settings;
if ($s.refreshMillis > 0) {
this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
}
},
update: function(time){
var parsedTime = $t.parse(time);
$(this).data('timeago', { datetime: parsedTime });
if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString());
refresh.apply(this);
},
updateFromDOM: function(){
$(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
refresh.apply(this);
},
dispose: function () {
if (this._timeagoInterval) {
window.clearInterval(this._timeagoInterval);
this._timeagoInterval = null;
}
}
};
$.fn.timeago = function(action, options) {
var fn = action ? functions[action] : functions.init;
if(!fn){
throw new Error("Unknown function name '"+ action +"' for timeago");
}
// each over objects here and call the requested function
this.each(function(){
fn.call(this, options);
});
return this;
};
function refresh() {
var data = prepareData(this);
var $s = $t.settings;
if (!isNaN(data.datetime)) {
if ( $s.cutoff == 0 || distance(data.datetime) < $s.cutoff) {
$(this).text(inWords(data.datetime));
}
}
return this;
}
function prepareData(element) {
element = $(element);
if (!element.data("timeago")) {
element.data("timeago", { datetime: $t.datetime(element) });
var text = $.trim(element.text());
if ($t.settings.localeTitle) {
element.attr("title", element.data('timeago').datetime.toLocaleString());
} else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
element.attr("title", text);
}
}
return element.data("timeago");
}
function inWords(date) {
return $t.inWords(distance(date));
}
function distance(date) {
return (new Date().getTime() - date.getTime());
}
// fix for IE6 suckage
document.createElement("abbr");
document.createElement("time");
}));

View File

@@ -0,0 +1,96 @@
(function() {
function numpf(n, a) {
return a[plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5];
}
jQuery.timeago.settings.strings = {
prefixAgo: "منذ",
prefixFromNow: "بعد",
suffixAgo: null,
suffixFromNow: null, // null OR "من الآن"
second: function(value) { return numpf(value, [
'أقل من ثانية',
'ثانية واحدة',
'ثانيتين',
'%d ثوانٍ',
'%d ثانية',
'%d ثانية']); },
seconds: function(value) { return numpf(value, [
'أقل من ثانية',
'ثانية واحدة',
'ثانيتين',
'%d ثوانٍ',
'%d ثانية',
'%d ثانية']); },
minute: function(value) { return numpf(value, [
'أقل من دقيقة',
'دقيقة واحدة',
'دقيقتين',
'%d دقائق',
'%d دقيقة',
'دقيقة']); },
minutes: function(value) { return numpf(value, [
'أقل من دقيقة',
'دقيقة واحدة',
'دقيقتين',
'%d دقائق',
'%d دقيقة',
'دقيقة']); },
hour: function(value) { return numpf(value, [
'أقل من ساعة',
'ساعة واحدة',
'ساعتين',
'%d ساعات',
'%d ساعة',
'%d ساعة']); },
hours: function(value) { return numpf(value, [
'أقل من ساعة',
'ساعة واحدة',
'ساعتين',
'%d ساعات',
'%d ساعة',
'%d ساعة']); },
day: function(value) { return numpf(value, [
'أقل من يوم',
'يوم واحد',
'يومين',
'%d أيام',
'%d يومًا',
'%d يوم']); },
days: function(value) { return numpf(value, [
'أقل من يوم',
'يوم واحد',
'يومين',
'%d أيام',
'%d يومًا',
'%d يوم']); },
month: function(value) { return numpf(value, [
'أقل من شهر',
'شهر واحد',
'شهرين',
'%d أشهر',
'%d شهرًا',
'%d شهر']); },
months: function(value) { return numpf(value, [
'أقل من شهر',
'شهر واحد',
'شهرين',
'%d أشهر',
'%d شهرًا',
'%d شهر']); },
year: function(value) { return numpf(value, [
'أقل من عام',
'عام واحد',
'%d عامين',
'%d أعوام',
'%d عامًا']);
},
years: function(value) { return numpf(value, [
'أقل من عام',
'عام واحد',
'عامين',
'%d أعوام',
'%d عامًا',
'%d عام']);}
};
})();

View File

@@ -0,0 +1,18 @@
// Bulgarian
jQuery.timeago.settings.strings = {
prefixAgo: "преди",
prefixFromNow: "след",
suffixAgo: null,
suffixFromNow: null,
seconds: "по-малко от минута",
minute: "една минута",
minutes: "%d минути",
hour: "един час",
hours: "%d часа",
day: "един ден",
days: "%d дни",
month: "един месец",
months: "%d месеца",
year: "една година",
years: "%d години"
};

View File

@@ -0,0 +1,49 @@
// Bosnian
(function() {
var numpf;
numpf = function(n, f, s, t) {
var n10;
n10 = n % 10;
if (n10 === 1 && (n === 1 || n > 20)) {
return f;
} else if (n10 > 1 && n10 < 5 && (n > 20 || n < 10)) {
return s;
} else {
return t;
}
};
jQuery.timeago.settings.strings = {
prefixAgo: "prije",
prefixFromNow: "za",
suffixAgo: null,
suffixFromNow: null,
second: "sekund",
seconds: function(value) {
return numpf(value, "%d sekund", "%d sekunde", "%d sekundi");
},
minute: "oko minut",
minutes: function(value) {
return numpf(value, "%d minut", "%d minute", "%d minuta");
},
hour: "oko sat",
hours: function(value) {
return numpf(value, "%d sat", "%d sata", "%d sati");
},
day: "oko jednog dana",
days: function(value) {
return numpf(value, "%d dan", "%d dana", "%d dana");
},
month: "mjesec dana",
months: function(value) {
return numpf(value, "%d mjesec", "%d mjeseca", "%d mjeseci");
},
year: "prije godinu dana ",
years: function(value) {
return numpf(value, "%d godinu", "%d godine", "%d godina");
},
wordSeparator: " "
};
}).call(this);

View File

@@ -0,0 +1,18 @@
// Catalan
jQuery.timeago.settings.strings = {
prefixAgo: "fa",
prefixFromNow: "d'aqui a",
suffixAgo: null,
suffixFromNow: null,
seconds: "menys d'1 minut",
minute: "1 minut",
minutes: "uns %d minuts",
hour: "1 hora",
hours: "unes %d hores",
day: "1 dia",
days: "%d dies",
month: "aproximadament un mes",
months: "%d mesos",
year: "aproximadament un any",
years: "%d anys"
};

View File

@@ -0,0 +1,20 @@
// Welsh
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "yn ôl",
suffixFromNow: "o hyn",
seconds: "llai na munud",
minute: "am funud",
minutes: "%d munud",
hour: "tua awr",
hours: "am %d awr",
day: "y dydd",
days: "%d diwrnod",
month: "tua mis",
months: "%d mis",
year: "am y flwyddyn",
years: "%d blynedd",
wordSeparator: " ",
numbers: []
};

View File

@@ -0,0 +1,18 @@
// Czech
jQuery.timeago.settings.strings = {
prefixAgo: "před",
prefixFromNow: null,
suffixAgo: null,
suffixFromNow: null,
seconds: "méně než minutou",
minute: "minutou",
minutes: "%d minutami",
hour: "hodinou",
hours: "%d hodinami",
day: "1 dnem",
days: "%d dny",
month: "1 měsícem",
months: "%d měsíci",
year: "1 rokem",
years: "%d roky"
};

View File

@@ -0,0 +1,18 @@
// Danish
jQuery.timeago.settings.strings = {
prefixAgo: "for",
prefixFromNow: "om",
suffixAgo: "siden",
suffixFromNow: "",
seconds: "mindre end et minut",
minute: "ca. et minut",
minutes: "%d minutter",
hour: "ca. en time",
hours: "ca. %d timer",
day: "en dag",
days: "%d dage",
month: "ca. en måned",
months: "%d måneder",
year: "ca. et år",
years: "%d år"
};

View File

@@ -0,0 +1,18 @@
// German
jQuery.timeago.settings.strings = {
prefixAgo: "vor",
prefixFromNow: "in",
suffixAgo: "",
suffixFromNow: "",
seconds: "wenigen Sekunden",
minute: "etwa einer Minute",
minutes: "%d Minuten",
hour: "etwa einer Stunde",
hours: "%d Stunden",
day: "etwa einem Tag",
days: "%d Tagen",
month: "etwa einem Monat",
months: "%d Monaten",
year: "etwa einem Jahr",
years: "%d Jahren"
};

View File

@@ -0,0 +1,18 @@
// Greek
jQuery.timeago.settings.strings = {
prefixAgo: "πριν",
prefixFromNow: "σε",
suffixAgo: "",
suffixFromNow: "",
seconds: "λιγότερο από ένα λεπτό",
minute: "περίπου ένα λεπτό",
minutes: "%d λεπτά",
hour: "περίπου μία ώρα",
hours: "περίπου %d ώρες",
day: "μία μέρα",
days: "%d μέρες",
month: "περίπου ένα μήνα",
months: "%d μήνες",
year: "περίπου ένα χρόνο",
years: "%d χρόνια"
};

View File

@@ -0,0 +1,20 @@
// English shortened
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "",
suffixFromNow: "",
seconds: "1m",
minute: "1m",
minutes: "%dm",
hour: "1h",
hours: "%dh",
day: "1d",
days: "%dd",
month: "1mo",
months: "%dmo",
year: "1yr",
years: "%dyr",
wordSeparator: " ",
numbers: []
};

View File

@@ -0,0 +1,20 @@
// English (Template)
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "ago",
suffixFromNow: "from now",
seconds: "less than a minute",
minute: "about a minute",
minutes: "%d minutes",
hour: "about an hour",
hours: "about %d hours",
day: "a day",
days: "%d days",
month: "about a month",
months: "%d months",
year: "about a year",
years: "%d years",
wordSeparator: " ",
numbers: []
};

View File

@@ -0,0 +1,18 @@
// Spanish
jQuery.timeago.settings.strings = {
prefixAgo: "hace",
prefixFromNow: "dentro de",
suffixAgo: "",
suffixFromNow: "",
seconds: "menos de un minuto",
minute: "un minuto",
minutes: "unos %d minutos",
hour: "una hora",
hours: "%d horas",
day: "un día",
days: "%d días",
month: "un mes",
months: "%d meses",
year: "un año",
years: "%d años"
};

View File

@@ -0,0 +1,18 @@
// Estonian
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "tagasi",
suffixFromNow: "pärast",
seconds: function(n, d) { return d < 0 ? "vähem kui minuti aja" : "vähem kui minut aega" },
minute: function(n, d) { return d < 0 ? "umbes minuti aja" : "umbes minut aega" },
minutes: function(n, d) { return d < 0 ? "%d minuti" : "%d minutit" },
hour: function(n, d) { return d < 0 ? "umbes tunni aja" : "umbes tund aega" },
hours: function(n, d) { return d < 0 ? "%d tunni" : "%d tundi" },
day: function(n, d) { return d < 0 ? "umbes päeva" : "umbes päev" },
days: function(n, d) { return d < 0 ? "%d päeva" : "%d päeva" },
month: function(n, d) { return d < 0 ? "umbes kuu aja" : "umbes kuu aega" },
months: function(n, d) { return d < 0 ? "%d kuu" : "%d kuud" },
year: function(n, d) { return d < 0 ? "umbes aasta aja" : "umbes aasta aega" },
years: function(n, d) { return d < 0 ? "%d aasta" : "%d aastat" }
};

View File

@@ -0,0 +1,22 @@
// Persian
// Use DIR attribute for RTL text in Persian Language for ABBR tag .
// By MB.seifollahi@gmail.com
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "پیش",
suffixFromNow: "از حال",
seconds: "کمتر از یک دقیقه",
minute: "حدود یک دقیقه",
minutes: "%d دقیقه",
hour: "حدود یک ساعت",
hours: "حدود %d ساعت",
day: "یک روز",
days: "%d روز",
month: "حدود یک ماه",
months: "%d ماه",
year: "حدود یک سال",
years: "%d سال",
wordSeparator: " "
};

View File

@@ -0,0 +1,28 @@
// Finnish
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "sitten",
suffixFromNow: "tulevaisuudessa",
seconds: "alle minuutti",
minute: "minuutti",
minutes: "%d minuuttia",
hour: "tunti",
hours: "%d tuntia",
day: "päivä",
days: "%d päivää",
month: "kuukausi",
months: "%d kuukautta",
year: "vuosi",
years: "%d vuotta"
};
// The above is not a great localization because one would usually
// write "2 days ago" in Finnish as "2 päivää sitten", however
// one would write "2 days into the future" as "2:n päivän päästä"
// which cannot be achieved with localization support this simple.
// This is because Finnish has word suffixes (attached directly
// to the end of the word). The word "day" is "päivä" in Finnish.
// As workaround, the above localizations will say
// "2 päivää tulevaisuudessa" which is understandable but
// not as fluent.

View File

@@ -0,0 +1,16 @@
// French shortened
jQuery.timeago.settings.strings = {
prefixAgo: "il y a",
prefixFromNow: "d'ici",
seconds: "moins d'une minute",
minute: "une minute",
minutes: "%d minutes",
hour: "une heure",
hours: "%d heures",
day: "un jour",
days: "%d jours",
month: "un mois",
months: "%d mois",
year: "un an",
years: "%d ans"
};

View File

@@ -0,0 +1,17 @@
// French
jQuery.timeago.settings.strings = {
// environ ~= about, it's optional
prefixAgo: "il y a",
prefixFromNow: "d'ici",
seconds: "moins d'une minute",
minute: "environ une minute",
minutes: "environ %d minutes",
hour: "environ une heure",
hours: "environ %d heures",
day: "environ un jour",
days: "environ %d jours",
month: "environ un mois",
months: "environ %d mois",
year: "un an",
years: "%d ans"
};

View File

@@ -0,0 +1,18 @@
// Hebrew
jQuery.timeago.settings.strings = {
prefixAgo: "לפני",
prefixFromNow: "מעכשיו",
suffixAgo: "",
suffixFromNow: "",
seconds: "פחות מדקה",
minute: "דקה",
minutes: "%d דקות",
hour: "שעה",
hours: "%d שעות",
day: "יום",
days: "%d ימים",
month: "חודש",
months: "%d חודשים",
year: "שנה",
years: "%d שנים"
};

View File

@@ -0,0 +1,49 @@
// Croatian
(function () {
var numpf;
numpf = function (n, f, s, t) {
var n10;
n10 = n % 10;
if (n10 === 1 && (n === 1 || n > 20)) {
return f;
} else if (n10 > 1 && n10 < 5 && (n > 20 || n < 10)) {
return s;
} else {
return t;
}
};
jQuery.timeago.settings.strings = {
prefixAgo: "prije",
prefixFromNow: "za",
suffixAgo: null,
suffixFromNow: null,
second: "sekundu",
seconds: function (value) {
return numpf(value, "%d sekundu", "%d sekunde", "%d sekundi");
},
minute: "oko minutu",
minutes: function (value) {
return numpf(value, "%d minutu", "%d minute", "%d minuta");
},
hour: "oko jedan sat",
hours: function (value) {
return numpf(value, "%d sat", "%d sata", "%d sati");
},
day: "jedan dan",
days: function (value) {
return numpf(value, "%d dan", "%d dana", "%d dana");
},
month: "mjesec dana",
months: function (value) {
return numpf(value, "%d mjesec", "%d mjeseca", "%d mjeseci");
},
year: "prije godinu dana",
years: function (value) {
return numpf(value, "%d godinu", "%d godine", "%d godina");
},
wordSeparator: " "
};
}).call(this);

View File

@@ -0,0 +1,18 @@
// Hungarian
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: null,
suffixFromNow: null,
seconds: "kevesebb mint egy perce",
minute: "körülbelül egy perce",
minutes: "%d perce",
hour: "körülbelül egy órája",
hours: "körülbelül %d órája",
day: "körülbelül egy napja",
days: "%d napja",
month: "körülbelül egy hónapja",
months: "%d hónapja",
year: "körülbelül egy éve",
years: "%d éve"
};

View File

@@ -0,0 +1,18 @@
// Armenian
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "առաջ",
suffixFromNow: "հետո",
seconds: "վայրկյաններ",
minute: "մեկ րոպե",
minutes: "%d րոպե",
hour: "մեկ ժամ",
hours: "%d ժամ",
day: "մեկ օր",
days: "%d օր",
month: "մեկ ամիս",
months: "%d ամիս",
year: "մեկ տարի",
years: "%d տարի"
};

View File

@@ -0,0 +1,18 @@
// Indonesian
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "yang lalu",
suffixFromNow: "dari sekarang",
seconds: "kurang dari semenit",
minute: "sekitar satu menit",
minutes: "%d menit",
hour: "sekitar sejam",
hours: "sekitar %d jam",
day: "sehari",
days: "%d hari",
month: "sekitar sebulan",
months: "%d bulan",
year: "sekitar setahun",
years: "%d tahun"
};

View File

@@ -0,0 +1,19 @@
jQuery.timeago.settings.strings = {
prefixAgo: "fyrir",
prefixFromNow: "eftir",
suffixAgo: "síðan",
suffixFromNow: null,
seconds: "minna en mínútu",
minute: "mínútu",
minutes: "%d mínútum",
hour: "klukkutíma",
hours: "um %d klukkutímum",
day: "degi",
days: "%d dögum",
month: "mánuði",
months: "%d mánuðum",
year: "ári",
years: "%d árum",
wordSeparator: " ",
numbers: []
};

View File

@@ -0,0 +1,16 @@
// Italian
jQuery.timeago.settings.strings = {
suffixAgo: "fa",
suffixFromNow: "da ora",
seconds: "meno di un minuto",
minute: "circa un minuto",
minutes: "%d minuti",
hour: "circa un'ora",
hours: "circa %d ore",
day: "un giorno",
days: "%d giorni",
month: "circa un mese",
months: "%d mesi",
year: "circa un anno",
years: "%d anni"
};

View File

@@ -0,0 +1,19 @@
// Japanese
jQuery.timeago.settings.strings = {
prefixAgo: "",
prefixFromNow: "今から",
suffixAgo: "前",
suffixFromNow: "後",
seconds: "1 分未満",
minute: "約 1 分",
minutes: "%d 分",
hour: "約 1 時間",
hours: "約 %d 時間",
day: "約 1 日",
days: "約 %d 日",
month: "約 1 月",
months: "約 %d 月",
year: "約 1 年",
years: "約 %d 年",
wordSeparator: ""
};

View File

@@ -0,0 +1,18 @@
// Javanesse (Boso Jowo)
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "kepungkur",
suffixFromNow: "seko saiki",
seconds: "kurang seko sakmenit",
minute: "kurang luwih sakmenit",
minutes: "%d menit",
hour: "kurang luwih sakjam",
hours: "kurang luwih %d jam",
day: "sedina",
days: "%d dina",
month: "kurang luwih sewulan",
months: "%d wulan",
year: "kurang luwih setahun",
years: "%d tahun"
};

View File

@@ -0,0 +1,17 @@
// Korean
jQuery.timeago.settings.strings = {
suffixAgo: "전",
suffixFromNow: "후",
seconds: "1분 이내",
minute: "1분",
minutes: "%d분",
hour: "1시간",
hours: "%d시간",
day: "하루",
days: "%d일",
month: "한 달",
months: "%d달",
year: "1년",
years: "%d년",
wordSeparator: " "
};

View File

@@ -0,0 +1,20 @@
//Lithuanian
jQuery.timeago.settings.strings = {
prefixAgo: "prieš",
prefixFromNow: null,
suffixAgo: null,
suffixFromNow: "nuo dabar",
seconds: "%d sek.",
minute: "min.",
minutes: "%d min.",
hour: "val.",
hours: "%d val.",
day: "1 d.",
days: "%d d.",
month: "mėn.",
months: "%d mėn.",
year: "metus",
years: "%d metus",
wordSeparator: " ",
numbers: []
};

View File

@@ -0,0 +1,20 @@
// Macedonian
(function() {
jQuery.timeago.settings.strings={
prefixAgo: "пред",
prefixFromNow: "за",
suffixAgo: null,
suffixFromNow: null,
seconds: "%d секунди",
minute: "%d минута",
minutes: "%d минути",
hour: "%d час",
hours: "%d часа",
day: "%d ден",
days: "%d денови" ,
month: "%d месец",
months: "%d месеци",
year: "%d година",
years: "%d години"
}
})();

View File

@@ -0,0 +1,20 @@
// Dutch
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "",
suffixAgo: "geleden",
suffixFromNow: "van nu",
seconds: "minder dan een minuut",
minute: "ongeveer een minuut",
minutes: "%d minuten",
hour: "ongeveer een uur",
hours: "ongeveer %d uur",
day: "een dag",
days: "%d dagen",
month: "ongeveer een maand",
months: "%d maanden",
year: "ongeveer een jaar",
years: "%d jaar",
wordSeparator: " ",
numbers: []
};

View File

@@ -0,0 +1,18 @@
// Norwegian
jQuery.timeago.settings.strings = {
prefixAgo: "for",
prefixFromNow: "om",
suffixAgo: "siden",
suffixFromNow: "",
seconds: "mindre enn et minutt",
minute: "ca. et minutt",
minutes: "%d minutter",
hour: "ca. en time",
hours: "ca. %d timer",
day: "en dag",
days: "%d dager",
month: "ca. en måned",
months: "%d måneder",
year: "ca. et år",
years: "%d år"
};

View File

@@ -0,0 +1,31 @@
// Polish
(function() {
function numpf(n, s, t) {
// s - 2-4, 22-24, 32-34 ...
// t - 5-21, 25-31, ...
var n10 = n % 10;
if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
return s;
} else {
return t;
}
}
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "za",
suffixAgo: "temu",
suffixFromNow: null,
seconds: "mniej niż minutę",
minute: "minutę",
minutes: function(value) { return numpf(value, "%d minuty", "%d minut"); },
hour: "godzinę",
hours: function(value) { return numpf(value, "%d godziny", "%d godzin"); },
day: "dzień",
days: "%d dni",
month: "miesiąc",
months: function(value) { return numpf(value, "%d miesiące", "%d miesięcy"); },
year: "rok",
years: function(value) { return numpf(value, "%d lata", "%d lat"); }
};
})();

View File

@@ -0,0 +1,18 @@
// Brazilian Portuguese
jQuery.timeago.settings.strings = {
prefixAgo: "há",
prefixFromNow: "em",
suffixAgo: null,
suffixFromNow: null,
seconds: "alguns segundos",
minute: "um minuto",
minutes: "%d minutos",
hour: "uma hora",
hours: "%d horas",
day: "um dia",
days: "%d dias",
month: "um mês",
months: "%d meses",
year: "um ano",
years: "%d anos"
};

View File

@@ -0,0 +1,16 @@
// Portuguese
jQuery.timeago.settings.strings = {
suffixAgo: "atrás",
suffixFromNow: "a partir de agora",
seconds: "menos de um minuto",
minute: "cerca de um minuto",
minutes: "%d minutos",
hour: "cerca de uma hora",
hours: "cerca de %d horas",
day: "um dia",
days: "%d dias",
month: "cerca de um mês",
months: "%d meses",
year: "cerca de um ano",
years: "%d anos"
};

View File

@@ -0,0 +1,18 @@
// Romanian
$.timeago.settings.strings = {
prefixAgo: "acum",
prefixFromNow: "in timp de",
suffixAgo: "",
suffixFromNow: "",
seconds: "mai putin de un minut",
minute: "un minut",
minutes: "%d minute",
hour: "o ora",
hours: "%d ore",
day: "o zi",
days: "%d zile",
month: "o luna",
months: "%d luni",
year: "un an",
years: "%d ani"
};

View File

@@ -0,0 +1,49 @@
// Serbian
(function () {
var numpf;
numpf = function (n, f, s, t) {
var n10;
n10 = n % 10;
if (n10 === 1 && (n === 1 || n > 20)) {
return f;
} else if (n10 > 1 && n10 < 5 && (n > 20 || n < 10)) {
return s;
} else {
return t;
}
};
jQuery.timeago.settings.strings = {
prefixAgo: "pre",
prefixFromNow: "za",
suffixAgo: null,
suffixFromNow: null,
second: "sekund",
seconds: function (value) {
return numpf(value, "%d sekund", "%d sekunde", "%d sekundi");
},
minute: "oko minut",
minutes: function (value) {
return numpf(value, "%d minut", "%d minuta", "%d minuta");
},
hour: "oko jedan sat",
hours: function (value) {
return numpf(value, "%d sat", "%d sata", "%d sati");
},
day: "jedan dan",
days: function (value) {
return numpf(value, "%d dan", "%d dana", "%d dana");
},
month: "mesec dana",
months: function (value) {
return numpf(value, "%d mesec", "%d meseca", "%d meseci");
},
year: "pre godinu dana",
years: function (value) {
return numpf(value, "%d godinu", "%d godine", "%d godina");
},
wordSeparator: " "
};
}).call(this);

View File

@@ -0,0 +1,34 @@
// Russian
(function() {
function numpf(n, f, s, t) {
// f - 1, 21, 31, ...
// s - 2-4, 22-24, 32-34 ...
// t - 5-20, 25-30, ...
var n10 = n % 10;
if ( (n10 == 1) && ( (n == 1) || (n > 20) ) ) {
return f;
} else if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
return s;
} else {
return t;
}
}
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "через",
suffixAgo: "назад",
suffixFromNow: null,
seconds: "меньше минуты",
minute: "минуту",
minutes: function(value) { return numpf(value, "%d минута", "%d минуты", "%d минут"); },
hour: "час",
hours: function(value) { return numpf(value, "%d час", "%d часа", "%d часов"); },
day: "день",
days: function(value) { return numpf(value, "%d день", "%d дня", "%d дней"); },
month: "месяц",
months: function(value) { return numpf(value, "%d месяц", "%d месяца", "%d месяцев"); },
year: "год",
years: function(value) { return numpf(value, "%d год", "%d года", "%d лет"); }
};
})();

View File

@@ -0,0 +1,18 @@
// Slovak
jQuery.timeago.settings.strings = {
prefixAgo: "pred",
prefixFromNow: null,
suffixAgo: null,
suffixFromNow: null,
seconds: "menej než minútou",
minute: "minútou",
minutes: "%d minútami",
hour: "hodinou",
hours: "%d hodinami",
day: "1 dňom",
days: "%d dňami",
month: "1 mesiacom",
months: "%d mesiacmi",
year: "1 rokom",
years: "%d rokmi"
};

View File

@@ -0,0 +1,44 @@
// Slovenian with support for dual
(function () {
var numpf;
numpf = function (n, d, m) {
if (n == 2) {
return d;
} else {
return m;
}
};
jQuery.timeago.settings.strings = {
prefixAgo: "pred",
prefixFromNow: "čez",
suffixAgo: null,
suffixFromNow: null,
second: "sekundo",
seconds: function (value) {
return numpf(value, "%d sekundama", "%d sekundami");
},
minute: "minuto",
minutes: function (value) {
return numpf(value, "%d minutama", "%d minutami");
},
hour: "uro",
hours: function (value) {
return numpf(value, "%d urama", "%d urami");
},
day: "dnevom",
days: function (value) {
return numpf(value, "%d dnevi", "%d dnevi");
},
month: "enim mescem",
months: function (value) {
return numpf(value, "%d mesecema", "%d meseci");
},
year: "enim letom",
years: function (value) {
return numpf(value, "%d letoma", "%d leti");
},
wordSeparator: " "
};
}).call(this);

View File

@@ -0,0 +1,18 @@
// Swedish
jQuery.timeago.settings.strings = {
prefixAgo: "för",
prefixFromNow: "om",
suffixAgo: "sedan",
suffixFromNow: "",
seconds: "mindre än en minut",
minute: "ungefär en minut",
minutes: "%d minuter",
hour: "ungefär en timme",
hours: "ungefär %d timmar",
day: "en dag",
days: "%d dagar",
month: "ungefär en månad",
months: "%d månader",
year: "ungefär ett år",
years: "%d år"
};

View File

@@ -0,0 +1,20 @@
// Thai
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "ที่แล้ว",
suffixFromNow: "จากตอนนี้",
seconds: "น้อยกว่าหนึ่งนาที",
minute: "ประมาณหนึ่งนาที",
minutes: "%d นาที",
hour: "ประมาณหนึ่งชั่วโมง",
hours: "ประมาณ %d ชั่วโมง",
day: "หนึ่งวัน",
days: "%d วัน",
month: "ประมาณหนึ่งเดือน",
months: "%d เดือน",
year: "ประมาณหนึ่งปี",
years: "%d ปี",
wordSeparator: "",
numbers: []
};

View File

@@ -0,0 +1,16 @@
// Turkish
jQuery.extend($.timeago.settings.strings, {
suffixAgo: 'önce',
suffixFromNow: null,
seconds: '1 dakikadan',
minute: '1 dakika',
minutes: '%d dakika',
hour: '1 saat',
hours: '%d saat',
day: '1 gün',
days: '%d gün',
month: '1 ay',
months: '%d ay',
year: '1 yıl',
years: '%d yıl'
});

View File

@@ -0,0 +1,34 @@
// Ukrainian
(function() {
function numpf(n, f, s, t) {
// f - 1, 21, 31, ...
// s - 2-4, 22-24, 32-34 ...
// t - 5-20, 25-30, ...
var n10 = n % 10;
if ( (n10 == 1) && ( (n == 1) || (n > 20) ) ) {
return f;
} else if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
return s;
} else {
return t;
}
}
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "через",
suffixAgo: "тому",
suffixFromNow: null,
seconds: "менше хвилини",
minute: "хвилина",
minutes: function(value) { return numpf(value, "%d хвилина", "%d хвилини", "%d хвилин"); },
hour: "година",
hours: function(value) { return numpf(value, "%d година", "%d години", "%d годин"); },
day: "день",
days: function(value) { return numpf(value, "%d день", "%d дні", "%d днів"); },
month: "місяць",
months: function(value) { return numpf(value, "%d місяць", "%d місяці", "%d місяців"); },
year: "рік",
years: function(value) { return numpf(value, "%d рік", "%d роки", "%d років"); }
};
})();

View File

@@ -0,0 +1,19 @@
//Uzbek
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "keyin",
suffixAgo: "avval",
suffixFromNow: null,
seconds: "bir necha soniya",
minute: "1 daqiqa",
minutes: function(value) { return "%d daqiqa" },
hour: "1 soat",
hours: function(value) { return "%d soat" },
day: "1 kun",
days: function(value) { return "%d kun" },
month: "1 oy",
months: function(value) { return "%d oy" },
year: "1 yil",
years: function(value) { return "%d yil" },
wordSeparator: " "
};

View File

@@ -0,0 +1,20 @@
// Simplified Chinese
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "从现在开始",
suffixAgo: "之前",
suffixFromNow: null,
seconds: "不到 1 分钟",
minute: "大约 1 分钟",
minutes: "%d 分钟",
hour: "大约 1 小时",
hours: "大约 %d 小时",
day: "1 天",
days: "%d 天",
month: "大约 1 个月",
months: "%d 月",
year: "大约 1 年",
years: "%d 年",
numbers: [],
wordSeparator: ""
};

View File

@@ -0,0 +1,20 @@
// Traditional Chinese, zh-tw
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "從現在開始",
suffixAgo: "之前",
suffixFromNow: null,
seconds: "不到 1 分鐘",
minute: "大約 1 分鐘",
minutes: "%d 分鐘",
hour: "大約 1 小時",
hours: "%d 小時",
day: "大約 1 天",
days: "%d 天",
month: "大約 1 個月",
months: "%d 個月",
year: "大約 1 年",
years: "%d 年",
numbers: [],
wordSeparator: ""
};

View File

@@ -0,0 +1,617 @@
/*!
* jQuery Validation Plugin 1.11.1
*
* http://bassistance.de/jquery-plugins/jquery-plugin-validation/
* http://docs.jquery.com/Plugins/Validation
*
* Copyright 2013 Jörn Zaefferer
* Released under the MIT license:
* http://www.opensource.org/licenses/mit-license.php
*/
(function() {
function stripHtml(value) {
// remove html tags and space chars
return value.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' ')
// remove punctuation
.replace(/[.(),;:!?%#$'"_+=\/\-]*/g,'');
}
jQuery.validator.addMethod("maxWords", function(value, element, params) {
return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length <= params;
}, jQuery.validator.format("Please enter {0} words or less."));
jQuery.validator.addMethod("minWords", function(value, element, params) {
return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params;
}, jQuery.validator.format("Please enter at least {0} words."));
jQuery.validator.addMethod("rangeWords", function(value, element, params) {
var valueStripped = stripHtml(value);
var regex = /\b\w+\b/g;
return this.optional(element) || valueStripped.match(regex).length >= params[0] && valueStripped.match(regex).length <= params[1];
}, jQuery.validator.format("Please enter between {0} and {1} words."));
}());
jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) {
return this.optional(element) || /^[a-z\-.,()'"\s]+$/i.test(value);
}, "Letters or punctuation only please");
jQuery.validator.addMethod("alphanumeric", function(value, element) {
return this.optional(element) || /^\w+$/i.test(value);
}, "Letters, numbers, and underscores only please");
jQuery.validator.addMethod("lettersonly", function(value, element) {
return this.optional(element) || /^[a-z]+$/i.test(value);
}, "Letters only please");
jQuery.validator.addMethod("nowhitespace", function(value, element) {
return this.optional(element) || /^\S+$/i.test(value);
}, "No white space please");
jQuery.validator.addMethod("ziprange", function(value, element) {
return this.optional(element) || /^90[2-5]\d\{2\}-\d{4}$/.test(value);
}, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx");
jQuery.validator.addMethod("zipcodeUS", function(value, element) {
return this.optional(element) || /\d{5}-\d{4}$|^\d{5}$/.test(value);
}, "The specified US ZIP Code is invalid");
jQuery.validator.addMethod("integer", function(value, element) {
return this.optional(element) || /^-?\d+$/.test(value);
}, "A positive or negative non-decimal number please");
/**
* Return true, if the value is a valid vehicle identification number (VIN).
*
* Works with all kind of text inputs.
*
* @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" />
* @desc Declares a required input element whose value must be a valid vehicle identification number.
*
* @name jQuery.validator.methods.vinUS
* @type Boolean
* @cat Plugins/Validate/Methods
*/
jQuery.validator.addMethod("vinUS", function(v) {
if (v.length !== 17) {
return false;
}
var i, n, d, f, cd, cdv;
var LL = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"];
var VL = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9];
var FL = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2];
var rs = 0;
for(i = 0; i < 17; i++){
f = FL[i];
d = v.slice(i,i+1);
if (i === 8) {
cdv = d;
}
if (!isNaN(d)) {
d *= f;
} else {
for (n = 0; n < LL.length; n++) {
if (d.toUpperCase() === LL[n]) {
d = VL[n];
d *= f;
if (isNaN(cdv) && n === 8) {
cdv = LL[n];
}
break;
}
}
}
rs += d;
}
cd = rs % 11;
if (cd === 10) {
cd = "X";
}
if (cd === cdv) {
return true;
}
return false;
}, "The specified vehicle identification number (VIN) is invalid.");
/**
* Return true, if the value is a valid date, also making this formal check dd/mm/yyyy.
*
* @example jQuery.validator.methods.date("01/01/1900")
* @result true
*
* @example jQuery.validator.methods.date("01/13/1990")
* @result false
*
* @example jQuery.validator.methods.date("01.01.1900")
* @result false
*
* @example <input name="pippo" class="{dateITA:true}" />
* @desc Declares an optional input element whose value must be a valid date.
*
* @name jQuery.validator.methods.dateITA
* @type Boolean
* @cat Plugins/Validate/Methods
*/
jQuery.validator.addMethod("dateITA", function(value, element) {
var check = false;
var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
if( re.test(value)) {
var adata = value.split('/');
var gg = parseInt(adata[0],10);
var mm = parseInt(adata[1],10);
var aaaa = parseInt(adata[2],10);
var xdata = new Date(aaaa,mm-1,gg);
if ( ( xdata.getFullYear() === aaaa ) && ( xdata.getMonth() === mm - 1 ) && ( xdata.getDate() === gg ) ){
check = true;
} else {
check = false;
}
} else {
check = false;
}
return this.optional(element) || check;
}, "Please enter a correct date");
/**
* IBAN is the international bank account number.
* It has a country - specific format, that is checked here too
*/
jQuery.validator.addMethod("iban", function(value, element) {
// some quick simple tests to prevent needless work
if (this.optional(element)) {
return true;
}
if (!(/^([a-zA-Z0-9]{4} ){2,8}[a-zA-Z0-9]{1,4}|[a-zA-Z0-9]{12,34}$/.test(value))) {
return false;
}
// check the country code and find the country specific format
var iban = value.replace(/ /g,'').toUpperCase(); // remove spaces and to upper case
var countrycode = iban.substring(0,2);
var bbancountrypatterns = {
'AL': "\\d{8}[\\dA-Z]{16}",
'AD': "\\d{8}[\\dA-Z]{12}",
'AT': "\\d{16}",
'AZ': "[\\dA-Z]{4}\\d{20}",
'BE': "\\d{12}",
'BH': "[A-Z]{4}[\\dA-Z]{14}",
'BA': "\\d{16}",
'BR': "\\d{23}[A-Z][\\dA-Z]",
'BG': "[A-Z]{4}\\d{6}[\\dA-Z]{8}",
'CR': "\\d{17}",
'HR': "\\d{17}",
'CY': "\\d{8}[\\dA-Z]{16}",
'CZ': "\\d{20}",
'DK': "\\d{14}",
'DO': "[A-Z]{4}\\d{20}",
'EE': "\\d{16}",
'FO': "\\d{14}",
'FI': "\\d{14}",
'FR': "\\d{10}[\\dA-Z]{11}\\d{2}",
'GE': "[\\dA-Z]{2}\\d{16}",
'DE': "\\d{18}",
'GI': "[A-Z]{4}[\\dA-Z]{15}",
'GR': "\\d{7}[\\dA-Z]{16}",
'GL': "\\d{14}",
'GT': "[\\dA-Z]{4}[\\dA-Z]{20}",
'HU': "\\d{24}",
'IS': "\\d{22}",
'IE': "[\\dA-Z]{4}\\d{14}",
'IL': "\\d{19}",
'IT': "[A-Z]\\d{10}[\\dA-Z]{12}",
'KZ': "\\d{3}[\\dA-Z]{13}",
'KW': "[A-Z]{4}[\\dA-Z]{22}",
'LV': "[A-Z]{4}[\\dA-Z]{13}",
'LB': "\\d{4}[\\dA-Z]{20}",
'LI': "\\d{5}[\\dA-Z]{12}",
'LT': "\\d{16}",
'LU': "\\d{3}[\\dA-Z]{13}",
'MK': "\\d{3}[\\dA-Z]{10}\\d{2}",
'MT': "[A-Z]{4}\\d{5}[\\dA-Z]{18}",
'MR': "\\d{23}",
'MU': "[A-Z]{4}\\d{19}[A-Z]{3}",
'MC': "\\d{10}[\\dA-Z]{11}\\d{2}",
'MD': "[\\dA-Z]{2}\\d{18}",
'ME': "\\d{18}",
'NL': "[A-Z]{4}\\d{10}",
'NO': "\\d{11}",
'PK': "[\\dA-Z]{4}\\d{16}",
'PS': "[\\dA-Z]{4}\\d{21}",
'PL': "\\d{24}",
'PT': "\\d{21}",
'RO': "[A-Z]{4}[\\dA-Z]{16}",
'SM': "[A-Z]\\d{10}[\\dA-Z]{12}",
'SA': "\\d{2}[\\dA-Z]{18}",
'RS': "\\d{18}",
'SK': "\\d{20}",
'SI': "\\d{15}",
'ES': "\\d{20}",
'SE': "\\d{20}",
'CH': "\\d{5}[\\dA-Z]{12}",
'TN': "\\d{20}",
'TR': "\\d{5}[\\dA-Z]{17}",
'AE': "\\d{3}\\d{16}",
'GB': "[A-Z]{4}\\d{14}",
'VG': "[\\dA-Z]{4}\\d{16}"
};
var bbanpattern = bbancountrypatterns[countrycode];
// As new countries will start using IBAN in the
// future, we only check if the countrycode is known.
// This prevents false negatives, while almost all
// false positives introduced by this, will be caught
// by the checksum validation below anyway.
// Strict checking should return FALSE for unknown
// countries.
if (typeof bbanpattern !== 'undefined') {
var ibanregexp = new RegExp("^[A-Z]{2}\\d{2}" + bbanpattern + "$", "");
if (!(ibanregexp.test(iban))) {
return false; // invalid country specific format
}
}
// now check the checksum, first convert to digits
var ibancheck = iban.substring(4,iban.length) + iban.substring(0,4);
var ibancheckdigits = "";
var leadingZeroes = true;
var charAt;
for (var i =0; i<ibancheck.length; i++) {
charAt = ibancheck.charAt(i);
if (charAt !== "0") {
leadingZeroes = false;
}
if (!leadingZeroes) {
ibancheckdigits += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(charAt);
}
}
// calculate the result of: ibancheckdigits % 97
var cRest = '';
var cOperator = '';
for (var p=0; p<ibancheckdigits.length; p++) {
var cChar = ibancheckdigits.charAt(p);
cOperator = '' + cRest + '' + cChar;
cRest = cOperator % 97;
}
return cRest === 1;
}, "Please specify a valid IBAN");
jQuery.validator.addMethod("dateNL", function(value, element) {
return this.optional(element) || /^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(value);
}, "Please enter a correct date");
/**
* Dutch phone numbers have 10 digits (or 11 and start with +31).
*/
jQuery.validator.addMethod("phoneNL", function(value, element) {
return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
}, "Please specify a valid phone number.");
jQuery.validator.addMethod("mobileNL", function(value, element) {
return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
}, "Please specify a valid mobile number");
jQuery.validator.addMethod("postalcodeNL", function(value, element) {
return this.optional(element) || /^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(value);
}, "Please specify a valid postal code");
/*
* Dutch bank account numbers (not 'giro' numbers) have 9 digits
* and pass the '11 check'.
* We accept the notation with spaces, as that is common.
* acceptable: 123456789 or 12 34 56 789
*/
jQuery.validator.addMethod("bankaccountNL", function(value, element) {
if (this.optional(element)) {
return true;
}
if (!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value))) {
return false;
}
// now '11 check'
var account = value.replace(/ /g,''); // remove spaces
var sum = 0;
var len = account.length;
for (var pos=0; pos<len; pos++) {
var factor = len - pos;
var digit = account.substring(pos, pos+1);
sum = sum + factor * digit;
}
return sum % 11 === 0;
}, "Please specify a valid bank account number");
/**
* Dutch giro account numbers (not bank numbers) have max 7 digits
*/
jQuery.validator.addMethod("giroaccountNL", function(value, element) {
return this.optional(element) || /^[0-9]{1,7}$/.test(value);
}, "Please specify a valid giro account number");
jQuery.validator.addMethod("bankorgiroaccountNL", function(value, element) {
return this.optional(element) ||
($.validator.methods["bankaccountNL"].call(this, value, element)) ||
($.validator.methods["giroaccountNL"].call(this, value, element));
}, "Please specify a valid bank or giro account number");
jQuery.validator.addMethod("time", function(value, element) {
return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){1,2}$/.test(value);
}, "Please enter a valid time, between 00:00 and 23:59");
jQuery.validator.addMethod("time12h", function(value, element) {
return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ ?[AP]M))$/i.test(value);
}, "Please enter a valid time in 12-hour am/pm format");
/**
* matches US phone number format
*
* where the area code may not start with 1 and the prefix may not start with 1
* allows '-' or ' ' as a separator and allows parens around area code
* some people may want to put a '1' in front of their number
*
* 1(212)-999-2345 or
* 212 999 2344 or
* 212-999-0983
*
* but not
* 111-123-5434
* and not
* 212 123 4567
*/
jQuery.validator.addMethod("phoneUS", function(phone_number, element) {
phone_number = phone_number.replace(/\s+/g, "");
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(\+?1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
}, "Please specify a valid phone number");
jQuery.validator.addMethod('phoneUK', function(phone_number, element) {
phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/);
}, 'Please specify a valid phone number');
jQuery.validator.addMethod('mobileUK', function(phone_number, element) {
phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[45789]\d{2}|624)\s?\d{3}\s?\d{3})$/);
}, 'Please specify a valid mobile number');
//Matches UK landline + mobile, accepting only 01-3 for landline or 07 for mobile to exclude many premium numbers
jQuery.validator.addMethod('phonesUK', function(phone_number, element) {
phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[45789]\d{8}|624\d{6})))$/);
}, 'Please specify a valid uk phone number');
// On the above three UK functions, do the following server side processing:
// Compare original input with this RegEx pattern:
// ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
// Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0'
// Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2.
// A number of very detailed GB telephone number RegEx patterns can also be found at:
// http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
// Matches UK postcode. Does not match to UK Channel Islands that have their own postcodes (non standard UK)
jQuery.validator.addMethod('postcodeUK', function(value, element) {
return this.optional(element) || /^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(value);
}, 'Please specify a valid UK postcode');
// TODO check if value starts with <, otherwise don't try stripping anything
jQuery.validator.addMethod("strippedminlength", function(value, element, param) {
return jQuery(value).text().length >= param;
}, jQuery.validator.format("Please enter at least {0} characters"));
// same as email, but TLD is optional
jQuery.validator.addMethod("email2", function(value, element, param) {
return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
}, jQuery.validator.messages.email);
// same as url, but TLD is optional
jQuery.validator.addMethod("url2", function(value, element, param) {
return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
}, jQuery.validator.messages.url);
// NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
// Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0
// Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings)
jQuery.validator.addMethod("creditcardtypes", function(value, element, param) {
if (/[^0-9\-]+/.test(value)) {
return false;
}
value = value.replace(/\D/g, "");
var validTypes = 0x0000;
if (param.mastercard) {
validTypes |= 0x0001;
}
if (param.visa) {
validTypes |= 0x0002;
}
if (param.amex) {
validTypes |= 0x0004;
}
if (param.dinersclub) {
validTypes |= 0x0008;
}
if (param.enroute) {
validTypes |= 0x0010;
}
if (param.discover) {
validTypes |= 0x0020;
}
if (param.jcb) {
validTypes |= 0x0040;
}
if (param.unknown) {
validTypes |= 0x0080;
}
if (param.all) {
validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080;
}
if (validTypes & 0x0001 && /^(5[12345])/.test(value)) { //mastercard
return value.length === 16;
}
if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa
return value.length === 16;
}
if (validTypes & 0x0004 && /^(3[47])/.test(value)) { //amex
return value.length === 15;
}
if (validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value)) { //dinersclub
return value.length === 14;
}
if (validTypes & 0x0010 && /^(2(014|149))/.test(value)) { //enroute
return value.length === 15;
}
if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover
return value.length === 16;
}
if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb
return value.length === 16;
}
if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb
return value.length === 15;
}
if (validTypes & 0x0080) { //unknown
return true;
}
return false;
}, "Please enter a valid credit card number.");
jQuery.validator.addMethod("ipv4", function(value, element, param) {
return this.optional(element) || /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(value);
}, "Please enter a valid IP v4 address.");
jQuery.validator.addMethod("ipv6", function(value, element, param) {
return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
}, "Please enter a valid IP v6 address.");
/**
* Return true if the field value matches the given format RegExp
*
* @example jQuery.validator.methods.pattern("AR1004",element,/^AR\d{4}$/)
* @result true
*
* @example jQuery.validator.methods.pattern("BR1004",element,/^AR\d{4}$/)
* @result false
*
* @name jQuery.validator.methods.pattern
* @type Boolean
* @cat Plugins/Validate/Methods
*/
jQuery.validator.addMethod("pattern", function(value, element, param) {
if (this.optional(element)) {
return true;
}
if (typeof param === 'string') {
param = new RegExp('^(?:' + param + ')$');
}
return param.test(value);
}, "Invalid format.");
/*
* Lets you say "at least X inputs that match selector Y must be filled."
*
* The end result is that neither of these inputs:
*
* <input class="productinfo" name="partnumber">
* <input class="productinfo" name="description">
*
* ...will validate unless at least one of them is filled.
*
* partnumber: {require_from_group: [1,".productinfo"]},
* description: {require_from_group: [1,".productinfo"]}
*
*/
jQuery.validator.addMethod("require_from_group", function(value, element, options) {
var validator = this;
var selector = options[1];
var validOrNot = $(selector, element.form).filter(function() {
return validator.elementValue(this);
}).length >= options[0];
if(!$(element).data('being_validated')) {
var fields = $(selector, element.form);
fields.data('being_validated', true);
fields.valid();
fields.data('being_validated', false);
}
return validOrNot;
}, jQuery.format("Please fill at least {0} of these fields."));
/*
* Lets you say "either at least X inputs that match selector Y must be filled,
* OR they must all be skipped (left blank)."
*
* The end result, is that none of these inputs:
*
* <input class="productinfo" name="partnumber">
* <input class="productinfo" name="description">
* <input class="productinfo" name="color">
*
* ...will validate unless either at least two of them are filled,
* OR none of them are.
*
* partnumber: {skip_or_fill_minimum: [2,".productinfo"]},
* description: {skip_or_fill_minimum: [2,".productinfo"]},
* color: {skip_or_fill_minimum: [2,".productinfo"]}
*
*/
jQuery.validator.addMethod("skip_or_fill_minimum", function(value, element, options) {
var validator = this,
numberRequired = options[0],
selector = options[1];
var numberFilled = $(selector, element.form).filter(function() {
return validator.elementValue(this);
}).length;
var valid = numberFilled >= numberRequired || numberFilled === 0;
if(!$(element).data('being_validated')) {
var fields = $(selector, element.form);
fields.data('being_validated', true);
fields.valid();
fields.data('being_validated', false);
}
return valid;
}, jQuery.format("Please either skip these fields or fill at least {0} of them."));
// Accept a value from a file input based on a required mimetype
jQuery.validator.addMethod("accept", function(value, element, param) {
// Split mime on commas in case we have multiple types we can accept
var typeParam = typeof param === "string" ? param.replace(/\s/g, '').replace(/,/g, '|') : "image/*",
optionalValue = this.optional(element),
i, file;
// Element is optional
if (optionalValue) {
return optionalValue;
}
if ($(element).attr("type") === "file") {
// If we are using a wildcard, make it regex friendly
typeParam = typeParam.replace(/\*/g, ".*");
// Check if the element has a FileList before checking each file
if (element.files && element.files.length) {
for (i = 0; i < element.files.length; i++) {
file = element.files[i];
// Grab the mimetype from the loaded file, verify it matches
if (!file.type.match(new RegExp( ".?(" + typeParam + ")$", "i"))) {
return false;
}
}
}
}
// Either return true because we've validated each file, or because the
// browser does not support element.files and the FileList feature
return true;
}, jQuery.format("Please enter a value with a valid mimetype."));
// Older "accept" file extension method. Old docs: http://docs.jquery.com/Plugins/Validation/Methods/accept
jQuery.validator.addMethod("extension", function(value, element, param) {
param = typeof param === "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif";
return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i"));
}, jQuery.format("Please enter a value with a valid extension."));

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More