Compare commits

..

722 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 https://github.com/PrestaShop/PrestaShop/commit/7140a63272fa2de5f7368a062d7fde79ca89d692#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 https://github.com/ExploZe/PrestaShop/commit/40abb0aa72607ddfe912b364d8fc7d65733d2bd8 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 + https://github.com/PrestaShop/PrestaShop/commit/5e407db21e3e30a1a5fa94b9558314ffa21af407 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 https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a 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 https://github.com/smilesrg/PrestaShop/commit/b7b79ff4614e5be7891f8702acdc46c8303a2fdd 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 https://github.com/PrestaShop/PrestaShop/commit/48b7a49b1aea34a2def355ffec1d4c08dfdbdfd6 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 https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 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
Kevin Granger 3580dc016a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:46:48 +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
Jerome Nadaud 6be883217e [-] BO : FixBug #PNM-1594 - Double selected option value 2013-11-18 18:36:30 +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 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
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
gRoussac 8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured 2013-11-18 14:58:17 +01:00
Jerome Nadaud bcc851c98c // Update image fix 2013-11-18 14:44:23 +01:00
gRoussac dbc08d779c // typo, sorry about this 2013-11-18 14:35:39 +01:00
gRoussac 22a9548f83 [-] FO : Fix bug #PSCFV-11043, bad cache id from module template 2013-11-18 14:32:34 +01:00
gRoussac 4771746959 [-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url 2013-11-18 12:26:08 +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
dlage 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
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
gRoussac 7f02c8ca58 [-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality 2013-11-15 18:50:28 +01:00
gRoussac bfed3532bf [*] BO : AdminPerformances Hide warnings message when not necessary 2013-11-15 16:12:07 +01:00
gRoussac 2962141d51 [-] BO : Fix warning when no memcached servers 2013-11-15 15:39:00 +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
gRoussac 6a690b255b [-] BO : Model return html error messagae instead of json while image uploading 2013-11-15 12:20:10 +01:00
gRoussac 152960639f [-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46 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
gRoussac 47d58ff930 [*] FO : set at least a class to body 2013-11-14 19:03:12 +01:00
gRoussac d06bf10bbb [-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight 2013-11-14 16:35:11 +01:00
gRoussac d0d234f555 // typo, sorry about this 2013-11-14 15:58:42 +01:00
gRoussac 19d975a0b4 // typo 2013-11-14 14:48:14 +01:00
gRoussac 6393746f04 [-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c 2013-11-14 11:43:05 +01:00
Kevin Granger a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +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
gRoussac 947f9bb21c // small isset in productcomments 2013-11-13 16:39:33 +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
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
gRoussac 4479db88a0 [-) PDF : nowrap on several product prices 2013-11-13 11:52:10 +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
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
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
Jerome Nadaud 6a99b84452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:02:28 +01:00
gRoussac 6ddf220aee [-] Fo : Call Gmaps on https if required 2013-11-12 21:16:09 +01:00
gRoussac 9328a3c473 // forgot to commit https://github.com/PrestaShop/PrestaShop/commit/036e2362c97ca00e9066076af1c45fc8f9946d56 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
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
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
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
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
gRoussac c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 2013-11-12 10:41:19 +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
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
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
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 02acd47c9e Merge pull request #950 from pelTek/patch-2
Added states to Greek localization pack
2013-11-08 02:46:55 -08:00
Chris 32e92762f5 Added states to Greek localization pack
Added states to Greek localization pack
2013-11-08 12:44:42 +02:00
Francois Gaillard 3b7387ffe8 [-] Classes : Hook - Installer & context shop id 2013-11-08 11:00:14 +01:00
gRoussac 472dc8c27d [-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556 2013-11-07 17:59:04 +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
Fabio Chelly 92cf31e5c3 [-] MO : Fixed #PNM-1600 by modifying getPageLink() 2013-11-07 16:46:30 +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
gRoussac 91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
gRoussac e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +01:00
gRoussac fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
Jerome Nadaud f3147b4e57 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-07 09:47:47 +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
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
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
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
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
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
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 d4253b9849 // small fix 2013-11-05 15:33:21 +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
Damien Metzger 4c1ad83b18 // "Fixed" strict standard 2013-11-05 10:22:39 +01:00
gRoussac 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +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
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 https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0 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
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
gRoussac c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +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
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
Rémi Gaillard bf8cd29868 // validator on message field 2013-11-04 14:21:42 +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 https://github.com/PrestaShop/PrestaShop/commit/b16e4b5a8ee6bdab13808f8ab473bda6c060c086 2013-11-04 11:10:40 +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
Rémi Gaillard e000f8c627 // something is missing in the last commit 2013-11-04 11:00:21 +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
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
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
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
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
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
Madman 1895ec8731 // Begining of Support for Advanved Stock Managment in CSV Import 2013-07-26 15:30:54 +02:00
1348 changed files with 38710 additions and 46150 deletions
+25
View File
@@ -44,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/*
@@ -108,4 +114,23 @@ modules/uspscarrier
modules/wexpay
modules/yotpo
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
+1 -1
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)
+185 -160
View File
@@ -1,161 +1,186 @@
- adonis karavokyros
- aFolletete
- Agence CINS
- aKorczak
- 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
- Cédric Mouleyre
- ChristopheBoucaut
- CINS
- cippest
- cmouleyre
- Corentin Delcourt
- Cosmin Hutanu
- Damien Metzger
- DamienMetzger
- Damon Skelhorn
- Daniel
- David Gasperoni
- Davy Rolink
- djfm
- dlage
- dMetzger
- (d)oekia
- Dragan Skrbic
- dreammeup
- DrySs
- DrÿSs
- DrÿSs'
- dSevere
- Edouard Gaulué
- emily-d
- Fabio Chelly
- fBrignoli
- fram
- Francois Gaillard
- François Gaillard
- Fran?s Gaillard
- fSerny
- Gabriel Schwardy
- gBrunier
- gCharmes
- gPoulain
- gr4devel
- Grégoire Bélorgey
- Gregory Roussac
- gRoussac
- Guillaume DELOINCE
- ha99y
- hAitmansour
- Ha!*!*y
- indesign47
- inem0o
- ivancasasempere
- jBreux
- jeckyl
- jeromenadaud
- Jerome Nadaud
- Jérôme Nadaud
- jessylenne
- jmCollin
- jObregon
- Jonathan Danse
- joseantgv
- Julien
- Kevin Granger
- kpodemski
- Krystian Podemski
- lBrieu
- lCherifi
- ldecoker
- lLefevre
- LOIC ROSSET ltd
- makk1ntosh
- marcinsz101
- Marco Cervellin
- matiasiglesias
- Mats Rynge
- MatthieuB
- Maxence
- mBertholino
- mDeflotte
- Michel Courtade
- Milow
- minic studio
- misthero
- mMarinetti
- montes
- nezenmoins
- Nicolas Sorosac
- Nils-Helge Garli Hegvik
- nPellicari
- nturato
- oleacorner
- Otto Nascarella
- Patanock
- PhpMadman
- Pierre
- Piotr Kaczor
- Piotr Mocko
- PrestaEdit
- 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 WITMEYER
- tDidierjean
- unknown
- vAugagneur
- vChabot
- Vincent Augagneur
- Vincent Schoener
- Vincent Terenti
- vinvin27
- vKham
- vSchoener
- Xavier
- Xavier POITAU
- Yoozio
- zimmi1
- 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
- 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
- fchellypresta
- fram
- Francois Gaillard
- François Gaillard
- Franois 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
- 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
- montes
- 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
+16 -5
View File
@@ -1,21 +1,29 @@
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")
ABOUT
ABOUT PRESTASHOP
--------
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...).
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 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.
@@ -25,7 +33,7 @@ INSTALLATION
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. See the page linked above.
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].
@@ -47,3 +55,6 @@ Thank you for downloading and using PrestaShop e-commerce Open-source solution!
[3]: http://www.prestashop.com/forums/forum/7-installing-prestashop/
[4]: http://doc.prestashop.com
[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
@@ -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]])) {
+2 -1
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);
+4 -2
View File
@@ -544,7 +544,8 @@ 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']);
@@ -559,7 +560,8 @@ function runAdminTab($tab, $ajaxMode = false)
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']);
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
#nobootstrap{width:100%;background-color:#fff;margin:-20px 0 0 -20px;padding:20px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap fieldset h1,#nobootstrap fieldset h2,#nobootstrap fieldset h3,#nobootstrap fieldset h4,#nobootstrap fieldset h5,#nobootstrap fieldset h6{margin:0 !important;padding:0 !important;background-color:transparent !important;border:none !important;text-transform:none !important}#nobootstrap a{line-height:normal}#nobootstrap .categorieList a{line-height:20px}#nobootstrap p{line-height:normal}#nobootstrap legend{font-size:13px;line-height:20px;width:auto}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px;border-radius:none !important}#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"]{margin:0}#nobootstrap input[type="text"]{height:14px !important}#nobootstrap table.table{margin:0;padding:0;width:100%;border-collapse:collapse}#nobootstrap table.widthfull{width:100%}#nobootstrap .table thead th{vertical-align:top}#nobootstrap .table th,#nobootstrap .table td{line-height:normal;vertical-align:middle;border-top:none}#nobootstrap [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}
File diff suppressed because one or more lines are too long
+4 -1
View File
@@ -58,7 +58,7 @@ $( document ).ready(function() {
//nav top bar
function navTopbar(){
//$('body').removeClass('page-sidebar').addClass('page-topbar').removeClass('page-sidebar-closed');
//$('#nav-sidebar').attr('id','nav-topbar');
$('#nav-sidebar').attr('id','nav-topbar');
var topbar = $('#nav-topbar');
topbar.off();
$('span.submenu_expand').remove();
@@ -215,4 +215,7 @@ $( document ).ready(function() {
removeMobileNav();
}
});
//show time elapsed
$("abbr.timeago").timeago();
});
+12
View File
@@ -179,6 +179,8 @@ function setDayPeriod() {
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
@@ -190,6 +192,8 @@ function setPreviousDayPeriod() {
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
@@ -201,6 +205,8 @@ function setMonthPeriod() {
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
@@ -213,6 +219,8 @@ function setPreviousMonthPeriod() {
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
@@ -224,6 +232,8 @@ function setYearPeriod() {
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
@@ -236,6 +246,8 @@ function setPreviousYearPeriod() {
$('#date-start').trigger('change');
updatePickerFromInput();
$('#datepickerFrom').val($("#date-start").val());
$('#datepickerTo').val($("#date-end").val());
$('button[name="submitDateRange"]').click();
}
+1 -1
View File
@@ -13,7 +13,7 @@ Tree.prototype =
{
var that = $(this);
this.$element.find("label.tree-toggler").click(
this.$element.find("label.tree-toggler, .icon-folder-close, .icon-folder-open").click(
function ()
{
if ($(this).parent().parent().children("ul.tree").is(":visible"))
+201
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");
}));
@@ -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 عام']);}
};
})();
@@ -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 години"
};
@@ -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);
@@ -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"
};
@@ -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: []
};
@@ -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"
};
@@ -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"
};
@@ -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"
};
@@ -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 χρόνια"
};
@@ -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: []
};
@@ -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: []
};
@@ -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"
};
@@ -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" }
};
@@ -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: " "
};
@@ -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.
@@ -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"
};
@@ -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"
};
@@ -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 שנים"
};
@@ -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);
@@ -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"
};
@@ -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 տարի"
};
@@ -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"
};
@@ -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: []
};
@@ -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"
};
@@ -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: ""
};
@@ -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"
};
@@ -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: " "
};
@@ -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: []
};
@@ -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 години"
}
})();
@@ -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: []
};
@@ -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"
};
@@ -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"); }
};
})();
@@ -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"
};
@@ -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"
};
@@ -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"
};
@@ -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);
@@ -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 лет"); }
};
})();
@@ -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"
};
@@ -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);
@@ -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"
};
@@ -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: []
};
@@ -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'
});
@@ -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 років"); }
};
})();
@@ -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: " "
};
@@ -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: ""
};
@@ -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: ""
};
@@ -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
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
+27
View File
@@ -0,0 +1,27 @@
(function() {
var parts = document.location.search.slice( 1 ).split( "&" ),
length = parts.length,
scripts = document.getElementsByTagName("script"),
src = scripts[ scripts.length - 1].src,
i = 0,
current,
version = "1.9.0",
file = "http://code.jquery.com/jquery-git.js";
for ( ; i < length; i++ ) {
current = parts[ i ].split( "=" );
if ( current[ 0 ] === "jquery" ) {
version = current[ 1 ];
break;
}
}
if (version != "git") {
file = src.replace(/jquery\.js$/, "jquery-" + version + ".js");
}
document.write( "<script src='" + file + "'></script>" );
})();
@@ -0,0 +1,382 @@
/*!
* MockJax - jQuery Plugin to Mock Ajax requests
*
* Version: 1.4.0
* Released: 2011-02-04
* Source: http://github.com/appendto/jquery-mockjax
* Docs: http://enterprisejquery.com/2010/07/mock-your-ajax-requests-with-mockjax-for-rapid-development
* Plugin: mockjax
* Author: Jonathan Sharp (http://jdsharp.com)
* License: MIT,GPL
*
* Copyright (c) 2010 appendTo LLC.
* Dual licensed under the MIT or GPL licenses.
* http://appendto.com/open-source-licenses
*/
(function($) {
var _ajax = $.ajax,
mockHandlers = [];
function parseXML(xml) {
if ( window['DOMParser'] == undefined && window.ActiveXObject ) {
DOMParser = function() { };
DOMParser.prototype.parseFromString = function( xmlString ) {
var doc = new ActiveXObject('Microsoft.XMLDOM');
doc.async = 'false';
doc.loadXML( xmlString );
return doc;
};
}
try {
var xmlDoc = ( new DOMParser() ).parseFromString( xml, 'text/xml' );
if ( $.isXMLDoc( xmlDoc ) ) {
var err = $('parsererror', xmlDoc);
if ( err.length == 1 ) {
throw('Error: ' + $(xmlDoc).text() );
}
} else {
throw('Unable to parse XML');
}
} catch( e ) {
var msg = ( e.name == undefined ? e : e.name + ': ' + e.message );
$(document).trigger('xmlParseError', [ msg ]);
return undefined;
}
return xmlDoc;
}
$.extend({
ajax: function(origSettings) {
var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
mock = false;
// Iterate over our mock handlers (in registration order) until we find
// one that is willing to intercept the request
$.each(mockHandlers, function(k, v) {
if ( !mockHandlers[k] ) {
return;
}
var m = null;
// If the mock was registered with a function, let the function decide if we
// want to mock this request
if ( $.isFunction(mockHandlers[k]) ) {
m = mockHandlers[k](s);
} else {
m = mockHandlers[k];
// Inspect the URL of the request and check if the mock handler's url
// matches the url for this ajax request
if ( $.isFunction(m.url.test) ) {
// The user provided a regex for the url, test it
if ( !m.url.test( s.url ) ) {
m = null;
}
} else {
// Look for a simple wildcard '*' or a direct URL match
var star = m.url.indexOf('*');
if ( ( m.url != '*' && m.url != s.url && star == -1 ) ||
( star > -1 && m.url.substr(0, star) != s.url.substr(0, star) ) ) {
// The url we tested did not match the wildcard *
m = null;
}
}
if ( m ) {
// Inspect the data submitted in the request (either POST body or GET query string)
if ( m.data && s.data ) {
var identical = false;
// Deep inspect the identity of the objects
(function ident(mock, live) {
// Test for situations where the data is a querystring (not an object)
if (typeof live === 'string') {
// Querystring may be a regex
identical = $.isFunction( mock.test ) ? mock.test(live) : mock == live;
return identical;
}
$.each(mock, function(k, v) {
if ( live[k] === undefined ) {
identical = false;
return false;
} else {
identical = true;
if ( typeof live[k] == 'object' ) {
return ident(mock[k], live[k]);
} else {
if ( $.isFunction( mock[k].test ) ) {
identical = mock[k].test(live[k]);
} else {
identical = ( mock[k] == live[k] );
}
return identical;
}
}
});
})(m.data, s.data);
// They're not identical, do not mock this request
if ( identical == false ) {
m = null;
}
}
// Inspect the request type
if ( m && m.type && m.type != s.type ) {
// The request type doesn't match (GET vs. POST)
m = null;
}
}
}
if ( m ) {
mock = true;
// Handle console logging
var c = $.extend({}, $.mockjaxSettings, m);
if ( c.log && $.isFunction(c.log) ) {
c.log('MOCK ' + s.type.toUpperCase() + ': ' + s.url, $.extend({}, s));
}
var jsre = /=\?(&|$)/, jsc = (new Date()).getTime();
// Handle JSONP Parameter Callbacks, we need to replicate some of the jQuery core here
// because there isn't an easy hook for the cross domain script tag of jsonp
if ( s.dataType === "jsonp" ) {
if ( s.type.toUpperCase() === "GET" ) {
if ( !jsre.test( s.url ) ) {
s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
}
} else if ( !s.data || !jsre.test(s.data) ) {
s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
}
s.dataType = "json";
}
// Build temporary JSONP function
if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
jsonp = s.jsonpCallback || ("jsonp" + jsc++);
// Replace the =? sequence both in the query string and the data
if ( s.data ) {
s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
}
s.url = s.url.replace(jsre, "=" + jsonp + "$1");
// We need to make sure
// that a JSONP style response is executed properly
s.dataType = "script";
// Handle JSONP-style loading
window[ jsonp ] = window[ jsonp ] || function( tmp ) {
data = tmp;
success();
complete();
// Garbage collect
window[ jsonp ] = undefined;
try {
delete window[ jsonp ];
} catch(e) {}
if ( head ) {
head.removeChild( script );
}
};
}
var rurl = /^(\w+:)?\/\/([^\/?#]+)/,
parts = rurl.exec( s.url ),
remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
// Test if we are going to create a script tag (if so, intercept & mock)
if ( s.dataType === "script" && s.type.toUpperCase() === "GET" && remote ) {
// Synthesize the mock request for adding a script tag
var callbackContext = origSettings && origSettings.context || s;
function success() {
// If a local callback was specified, fire it and pass it the data
if ( s.success ) {
s.success.call( callbackContext, ( m.response ? m.response.toString() : m.responseText || ''), status, {} );
}
// Fire the global callback
if ( s.global ) {
trigger( "ajaxSuccess", [{}, s] );
}
}
function complete() {
// Process result
if ( s.complete ) {
s.complete.call( callbackContext, {} , status );
}
// The request was completed
if ( s.global ) {
trigger( "ajaxComplete", [{}, s] );
}
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) {
jQuery.event.trigger( "ajaxStop" );
}
}
function trigger(type, args) {
(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
}
if ( m.response && $.isFunction(m.response) ) {
m.response(origSettings);
} else {
$.globalEval(m.responseText);
}
success();
complete();
return false;
}
mock = _ajax.call($, $.extend(true, {}, origSettings, {
// Mock the XHR object
xhr: function() {
// Extend with our default mockjax settings
m = $.extend({}, $.mockjaxSettings, m);
if ( m.contentType ) {
m.headers['content-type'] = m.contentType;
}
// Return our mock xhr object
return {
status: m.status,
readyState: 1,
open: function() { },
send: function() {
// This is a substitute for < 1.4 which lacks $.proxy
var process = (function(that) {
return function() {
return (function() {
// The request has returned
this.status = m.status;
this.readyState = 4;
// We have an executable function, call it to give
// the mock handler a chance to update it's data
if ( $.isFunction(m.response) ) {
m.response(origSettings);
}
// Copy over our mock to our xhr object before passing control back to
// jQuery's onreadystatechange callback
if ( s.dataType == 'json' && ( typeof m.responseText == 'object' ) ) {
this.responseText = JSON.stringify(m.responseText);
} else if ( s.dataType == 'xml' ) {
if ( typeof m.responseXML == 'string' ) {
this.responseXML = parseXML(m.responseXML);
} else {
this.responseXML = m.responseXML;
}
} else {
this.responseText = m.responseText;
}
// jQuery < 1.4 doesn't have onreadystate change for xhr
if ( $.isFunction(this.onreadystatechange) ) {
this.onreadystatechange( m.isTimeout ? 'timeout' : undefined );
}
}).apply(that);
};
})(this);
if ( m.proxy ) {
// We're proxying this request and loading in an external file instead
_ajax({
global: false,
url: m.proxy,
type: m.proxyType,
data: m.data,
dataType: s.dataType,
complete: function(xhr, txt) {
m.responseXML = xhr.responseXML;
m.responseText = xhr.responseText;
this.responseTimer = setTimeout(process, m.responseTime || 0);
}
});
} else {
// type == 'POST' || 'GET' || 'DELETE'
if ( s.async === false ) {
// TODO: Blocking delay
process();
} else {
this.responseTimer = setTimeout(process, m.responseTime || 50);
}
}
},
abort: function() {
clearTimeout(this.responseTimer);
},
setRequestHeader: function() { },
getResponseHeader: function(header) {
// 'Last-modified', 'Etag', 'content-type' are all checked by jQuery
if ( m.headers && m.headers[header] ) {
// Return arbitrary headers
return m.headers[header];
} else if ( header.toLowerCase() == 'last-modified' ) {
return m.lastModified || (new Date()).toString();
} else if ( header.toLowerCase() == 'etag' ) {
return m.etag || '';
} else if ( header.toLowerCase() == 'content-type' ) {
return m.contentType || 'text/plain';
}
},
getAllResponseHeaders: function() {
var headers = '';
$.each(m.headers, function(k, v) {
headers += k + ': ' + v + "\n";
});
return headers;
}
};
}
}));
return false;
}
});
// We don't have a mock request, trigger a normal request
if ( !mock ) {
return _ajax.apply($, arguments);
} else {
return mock;
}
}
});
$.mockjaxSettings = {
//url: null,
//type: 'GET',
log: function(msg) {
window['console'] && window.console.log && window.console.log(msg);
},
status: 200,
responseTime: 500,
isTimeout: false,
contentType: 'text/plain',
response: '',
responseText: '',
responseXML: '',
proxy: '',
proxyType: 'GET',
lastModified: null,
etag: '',
headers: {
etag: 'IJF@H#@923uf8023hFO@I#H#',
'content-type' : 'text/plain'
}
};
$.mockjax = function(settings) {
var i = mockHandlers.length;
mockHandlers[i] = settings;
return i;
};
$.mockjaxClear = function(i) {
if ( arguments.length == 1 ) {
mockHandlers[i] = null;
} else {
mockHandlers = [];
}
};
})(jQuery);
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: AR (Arabic; العربية)
*/
(function ($) {
$.extend($.validator.messages, {
required: "هذا الحقل إلزامي",
remote: "يرجى تصحيح هذا الحقل للمتابعة",
email: "رجاء إدخال عنوان بريد إلكتروني صحيح",
url: "رجاء إدخال عنوان موقع إلكتروني صحيح",
date: "رجاء إدخال تاريخ صحيح",
dateISO: "رجاء إدخال تاريخ صحيح (ISO)",
number: "رجاء إدخال عدد بطريقة صحيحة",
digits: "رجاء إدخال أرقام فقط",
creditcard: "رجاء إدخال رقم بطاقة ائتمان صحيح",
equalTo: "رجاء إدخال نفس القيمة",
accept: "رجاء إدخال ملف بامتداد موافق عليه",
maxlength: $.validator.format("الحد الأقصى لعدد الحروف هو {0}"),
minlength: $.validator.format("الحد الأدنى لعدد الحروف هو {0}"),
rangelength: $.validator.format("عدد الحروف يجب أن يكون بين {0} و {1}"),
range: $.validator.format("رجاء إدخال عدد قيمته بين {0} و {1}"),
max: $.validator.format("رجاء إدخال عدد أقل من أو يساوي (0}"),
min: $.validator.format("رجاء إدخال عدد أكبر من أو يساوي (0}")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: BG (Bulgarian; български език)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Полето е задължително.",
remote: "Моля, въведете правилната стойност.",
email: "Моля, въведете валиден email.",
url: "Моля, въведете валидно URL.",
date: "Моля, въведете валидна дата.",
dateISO: "Моля, въведете валидна дата (ISO).",
number: "Моля, въведете валиден номер.",
digits: "Моля, въведете само цифри",
creditcard: "Моля, въведете валиден номер на кредитна карта.",
equalTo: "Моля, въведете същата стойност отново.",
accept: "Моля, въведете стойност с валидно разширение.",
maxlength: $.validator.format("Моля, въведете повече от {0} символа."),
minlength: $.validator.format("Моля, въведете поне {0} символа."),
rangelength: $.validator.format("Моля, въведете стойност с дължина между {0} и {1} символа."),
range: $.validator.format("Моля, въведете стойност между {0} и {1}."),
max: $.validator.format("Моля, въведете стойност по-малка или равна на {0}."),
min: $.validator.format("Моля, въведете стойност по-голяма или равна на {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: CA (Catalan; català)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Aquest camp és obligatori.",
remote: "Si us plau, omple aquest camp.",
email: "Si us plau, escriu una adreça de correu-e vàlida",
url: "Si us plau, escriu una URL vàlida.",
date: "Si us plau, escriu una data vàlida.",
dateISO: "Si us plau, escriu una data (ISO) vàlida.",
number: "Si us plau, escriu un número enter vàlid.",
digits: "Si us plau, escriu només dígits.",
creditcard: "Si us plau, escriu un número de tarjeta vàlid.",
equalTo: "Si us plau, escriu el maateix valor de nou.",
accept: "Si us plau, escriu un valor amb una extensió acceptada.",
maxlength: $.validator.format("Si us plau, no escriguis més de {0} caracters."),
minlength: $.validator.format("Si us plau, no escriguis menys de {0} caracters."),
rangelength: $.validator.format("Si us plau, escriu un valor entre {0} i {1} caracters."),
range: $.validator.format("Si us plau, escriu un valor entre {0} i {1}."),
max: $.validator.format("Si us plau, escriu un valor menor o igual a {0}."),
min: $.validator.format("Si us plau, escriu un valor major o igual a {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: CS (Czech; čeština, český jazyk)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Tento údaj je povinný.",
remote: "Prosím, opravte tento údaj.",
email: "Prosím, zadejte platný e-mail.",
url: "Prosím, zadejte platné URL.",
date: "Prosím, zadejte platné datum.",
dateISO: "Prosím, zadejte platné datum (ISO).",
number: "Prosím, zadejte číslo.",
digits: "Prosím, zadávejte pouze číslice.",
creditcard: "Prosím, zadejte číslo kreditní karty.",
equalTo: "Prosím, zadejte znovu stejnou hodnotu.",
accept: "Prosím, zadejte soubor se správnou příponou.",
maxlength: $.validator.format("Prosím, zadejte nejvíce {0} znaků."),
minlength: $.validator.format("Prosím, zadejte nejméně {0} znaků."),
rangelength: $.validator.format("Prosím, zadejte od {0} do {1} znaků."),
range: $.validator.format("Prosím, zadejte hodnotu od {0} do {1}."),
max: $.validator.format("Prosím, zadejte hodnotu menší nebo rovnu {0}."),
min: $.validator.format("Prosím, zadejte hodnotu větší nebo rovnu {0}.")
});
}(jQuery));
@@ -0,0 +1,22 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: DA (Danish; dansk)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Dette felt er påkrævet.",
maxlength: $.validator.format("Indtast højst {0} tegn."),
minlength: $.validator.format("Indtast mindst {0} tegn."),
rangelength: $.validator.format("Indtast mindst {0} og højst {1} tegn."),
email: "Indtast en gyldig email-adresse.",
url: "Indtast en gyldig URL.",
date: "Indtast en gyldig dato.",
number: "Indtast et tal.",
digits: "Indtast kun cifre.",
equalTo: "Indtast den samme værdi igen.",
range: $.validator.format("Angiv en værdi mellem {0} og {1}."),
max: $.validator.format("Angiv en værdi der højst er {0}."),
min: $.validator.format("Angiv en værdi der mindst er {0}."),
creditcard: "Indtast et gyldigt kreditkortnummer."
});
}(jQuery));
@@ -0,0 +1,22 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: DE (German, Deutsch)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format("Geben Sie bitte maximal {0} Zeichen ein."),
minlength: $.validator.format("Geben Sie bitte mindestens {0} Zeichen ein."),
rangelength: $.validator.format("Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein."),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format("Geben Sie bitte einen Wert zwischen {0} und {1} ein."),
max: $.validator.format("Geben Sie bitte einen Wert kleiner oder gleich {0} ein."),
min: $.validator.format("Geben Sie bitte einen Wert größer oder gleich {0} ein."),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: EL (Greek; ελληνικά)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Αυτό το πεδίο είναι υποχρεωτικό.",
remote: "Παρακαλώ διορθώστε αυτό το πεδίο.",
email: "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email.",
url: "Παρακαλώ εισάγετε ένα έγκυρο URL.",
date: "Παρακαλώ εισάγετε μια έγκυρη ημερομηνία.",
dateISO: "Παρακαλώ εισάγετε μια έγκυρη ημερομηνία (ISO).",
number: "Παρακαλώ εισάγετε έναν έγκυρο αριθμό.",
digits: "Παρακαλώ εισάγετε μόνο αριθμητικά ψηφία.",
creditcard: "Παρακαλώ εισάγετε έναν έγκυρο αριθμό πιστωτικής κάρτας.",
equalTo: "Παρακαλώ εισάγετε την ίδια τιμή ξανά.",
accept: "Παρακαλώ εισάγετε μια τιμή με έγκυρη επέκταση αρχείου.",
maxlength: $.validator.format("Παρακαλώ εισάγετε μέχρι και {0} χαρακτήρες."),
minlength: $.validator.format("Παρακαλώ εισάγετε τουλάχιστον {0} χαρακτήρες."),
rangelength: $.validator.format("Παρακαλώ εισάγετε μια τιμή με μήκος μεταξύ {0} και {1} χαρακτήρων."),
range: $.validator.format("Παρακαλώ εισάγετε μια τιμή μεταξύ {0} και {1}."),
max: $.validator.format("Παρακαλώ εισάγετε μια τιμή μικρότερη ή ίση του {0}."),
min: $.validator.format("Παρακαλώ εισάγετε μια τιμή μεγαλύτερη ή ίση του {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: ES (Spanish; Español)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Este campo es obligatorio.",
remote: "Por favor, rellena este campo.",
email: "Por favor, escribe una dirección de correo válida",
url: "Por favor, escribe una URL válida.",
date: "Por favor, escribe una fecha válida.",
dateISO: "Por favor, escribe una fecha (ISO) válida.",
number: "Por favor, escribe un número entero válido.",
digits: "Por favor, escribe sólo dígitos.",
creditcard: "Por favor, escribe un número de tarjeta válido.",
equalTo: "Por favor, escribe el mismo valor de nuevo.",
accept: "Por favor, escribe un valor con una extensión aceptada.",
maxlength: $.validator.format("Por favor, no escribas más de {0} caracteres."),
minlength: $.validator.format("Por favor, no escribas menos de {0} caracteres."),
rangelength: $.validator.format("Por favor, escribe un valor entre {0} y {1} caracteres."),
range: $.validator.format("Por favor, escribe un valor entre {0} y {1}."),
max: $.validator.format("Por favor, escribe un valor menor o igual a {0}."),
min: $.validator.format("Por favor, escribe un valor mayor o igual a {0}.")
});
}(jQuery));
@@ -0,0 +1,23 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: ET (Estonian; eesti, eesti keel)
*/
(function ($) {
$.extend($.validator.messages, {
required: "See väli peab olema täidetud.",
maxlength: $.validator.format("Palun sisestage vähem kui {0} tähemärki."),
minlength: $.validator.format("Palun sisestage vähemalt {0} tähemärki."),
rangelength: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1} tähemärki."),
email: "Palun sisestage korrektne e-maili aadress.",
url: "Palun sisestage korrektne URL.",
date: "Palun sisestage korrektne kuupäev.",
dateISO: "Palun sisestage korrektne kuupäev (YYYY-MM-DD).",
number: "Palun sisestage korrektne number.",
digits: "Palun sisestage ainult numbreid.",
equalTo: "Palun sisestage sama väärtus uuesti.",
range: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1}."),
max: $.validator.format("Palun sisestage väärtus, mis on väiksem või võrdne arvuga {0}."),
min: $.validator.format("Palun sisestage väärtus, mis on suurem või võrdne arvuga {0}."),
creditcard: "Palun sisestage korrektne krediitkaardi number."
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: EU (Basque; euskara, euskera)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Eremu hau beharrezkoa da.",
remote: "Mesedez, bete eremu hau.",
email: "Mesedez, idatzi baliozko posta helbide bat.",
url: "Mesedez, idatzi baliozko URL bat.",
date: "Mesedez, idatzi baliozko data bat.",
dateISO: "Mesedez, idatzi baliozko (ISO) data bat.",
number: "Mesedez, idatzi baliozko zenbaki oso bat.",
digits: "Mesedez, idatzi digituak soilik.",
creditcard: "Mesedez, idatzi baliozko txartel zenbaki bat.",
equalTo: "Mesedez, idatzi berdina berriro ere.",
accept: "Mesedez, idatzi onartutako luzapena duen balio bat.",
maxlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gehiago."),
minlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gutxiago."),
rangelength: $.validator.format("Mesedez, idatzi {0} eta {1} karaktere arteko balio bat."),
range: $.validator.format("Mesedez, idatzi {0} eta {1} arteko balio bat."),
max: $.validator.format("Mesedez, idatzi {0} edo txikiagoa den balio bat."),
min: $.validator.format("Mesedez, idatzi {0} edo handiagoa den balio bat.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: FA (Persian; فارسی)
*/
(function ($) {
$.extend($.validator.messages, {
required: "تکمیل این فیلد اجباری است.",
remote: "لطفا این فیلد را تصحیح کنید.",
email: ".لطفا یک ایمیل صحیح وارد کنید",
url: "لطفا آدرس صحیح وارد کنید.",
date: "لطفا یک تاریخ صحیح وارد کنید",
dateISO: "لطفا تاریخ صحیح وارد کنید (ISO).",
number: "لطفا عدد صحیح وارد کنید.",
digits: "لطفا تنها رقم وارد کنید",
creditcard: "لطفا کریدیت کارت صحیح وارد کنید.",
equalTo: "لطفا مقدار برابری وارد کنید",
accept: "لطفا مقداری وارد کنید که ",
maxlength: $.validator.format("لطفا بیشتر از {0} حرف وارد نکنید."),
minlength: $.validator.format("لطفا کمتر از {0} حرف وارد نکنید."),
rangelength: $.validator.format("لطفا مقداری بین {0} تا {1} حرف وارد کنید."),
range: $.validator.format("لطفا مقداری بین {0} تا {1} حرف وارد کنید."),
max: $.validator.format("لطفا مقداری کمتر از {0} حرف وارد کنید."),
min: $.validator.format("لطفا مقداری بیشتر از {0} حرف وارد کنید.")
});
}(jQuery));
@@ -0,0 +1,23 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: FI (Finnish; suomi, suomen kieli)
*/
(function ($) {
$.extend($.validator.messages, {
required: "T&auml;m&auml; kentt&auml; on pakollinen.",
email: "Sy&ouml;t&auml; oikea s&auml;hk&ouml;postiosoite.",
url: "Sy&ouml;t&auml; oikea URL osoite.",
date: "Sy&ouml;t&auml; oike p&auml;iv&auml;m&auml;&auml;r&auml;.",
dateISO: "Sy&ouml;t&auml; oike p&auml;iv&auml;m&auml;&auml;r&auml; (VVVV-MM-DD).",
number: "Sy&ouml;t&auml; numero.",
creditcard: "Sy&ouml;t&auml; voimassa oleva luottokorttinumero.",
digits: "Sy&ouml;t&auml; pelk&auml;st&auml;&auml;n numeroita.",
equalTo: "Sy&ouml;t&auml; sama arvo uudestaan.",
maxlength: $.validator.format("Voit sy&ouml;tt&auml;&auml; enint&auml;&auml;n {0} merkki&auml;."),
minlength: $.validator.format("V&auml;hint&auml;&auml;n {0} merkki&auml;."),
rangelength: $.validator.format("Sy&ouml;t&auml; v&auml;hint&auml;&auml;n {0} ja enint&auml;&auml;n {1} merkki&auml;."),
range: $.validator.format("Sy&ouml;t&auml; arvo {0} ja {1} v&auml;lilt&auml;."),
max: $.validator.format("Sy&ouml;t&auml; arvo joka on pienempi tai yht&auml; suuri kuin {0}."),
min: $.validator.format("Sy&ouml;t&auml; arvo joka on yht&auml; suuri tai suurempi kuin {0}.")
});
}(jQuery));
@@ -0,0 +1,47 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: FR (French; français)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Ce champ est obligatoire.",
remote: "Veuillez corriger ce champ.",
email: "Veuillez fournir une adresse électronique valide.",
url: "Veuillez fournir une adresse URL valide.",
date: "Veuillez fournir une date valide.",
dateISO: "Veuillez fournir une date valide (ISO).",
number: "Veuillez fournir un numéro valide.",
digits: "Veuillez fournir seulement des chiffres.",
creditcard: "Veuillez fournir un numéro de carte de crédit valide.",
equalTo: "Veuillez fournir encore la même valeur.",
accept: "Veuillez fournir une valeur avec une extension valide.",
maxlength: $.validator.format("Veuillez fournir au plus {0} caractères."),
minlength: $.validator.format("Veuillez fournir au moins {0} caractères."),
rangelength: $.validator.format("Veuillez fournir une valeur qui contient entre {0} et {1} caractères."),
range: $.validator.format("Veuillez fournir une valeur entre {0} et {1}."),
max: $.validator.format("Veuillez fournir une valeur inférieur ou égal à {0}."),
min: $.validator.format("Veuillez fournir une valeur supérieur ou égal à {0}."),
maxWords: $.validator.format("Veuillez fournir au plus {0} mots."),
minWords: $.validator.format("Veuillez fournir au moins {0} mots."),
rangeWords: $.validator.format("Veuillez fournir entre {0} et {1} mots."),
letterswithbasicpunc: "Veuillez fournir seulement des lettres et des signes de ponctuation.",
alphanumeric: "Veuillez fournir seulement des lettres, nombres, espaces et soulignages",
lettersonly: "Veuillez fournir seulement des lettres.",
nowhitespace: "Veuillez ne pas inscrire d'espaces blancs.",
ziprange: "Veuillez fournir un code postal entre 902xx-xxxx et 905-xx-xxxx.",
integer: "Veuillez fournir un nombre non décimal qui est positif ou négatif.",
vinUS: "Veuillez fournir un numéro d'identification du véhicule (VIN).",
dateITA: "Veuillez fournir une date valide.",
time: "Veuillez fournir une heure valide entre 00:00 et 23:59.",
phoneUS: "Veuillez fournir un numéro de téléphone valide.",
phoneUK: "Veuillez fournir un numéro de téléphone valide.",
mobileUK: "Veuillez fournir un numéro de téléphone mobile valide.",
strippedminlength: $.validator.format("Veuillez fournir au moins {0} caractères."),
email2: "Veuillez fournir une adresse électronique valide.",
url2: "Veuillez fournir une adresse URL valide.",
creditcardtypes: "Veuillez fournir un numéro de carte de crédit valide.",
ipv4: "Veuillez fournir une adresse IP v4 valide.",
ipv6: "Veuillez fournir une adresse IP v6 valide.",
require_from_group: "Veuillez fournir au moins {0} de ces champs."
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: HE (Hebrew; עברית)
*/
(function ($) {
$.extend($.validator.messages, {
required: "השדה הזה הינו שדה חובה",
remote: "נא לתקן שדה זה",
email: "נא למלא כתובת דוא\"ל חוקית",
url: "נא למלא כתובת אינטרנט חוקית",
date: "נא למלא תאריך חוקי",
dateISO: "נא למלא תאריך חוקי (ISO)",
number: "נא למלא מספר",
digits: "נא למלא רק מספרים",
creditcard: "נא למלא מספר כרטיס אשראי חוקי",
equalTo: "נא למלא את אותו ערך שוב",
accept: "נא למלא ערך עם סיומת חוקית",
maxlength: $.validator.format(".נא לא למלא יותר מ- {0} תווים"),
minlength: $.validator.format("נא למלא לפחות {0} תווים"),
rangelength: $.validator.format("נא למלא ערך בין {0} ל- {1} תווים"),
range: $.validator.format("נא למלא ערך בין {0} ל- {1}"),
max: $.validator.format("נא למלא ערך קטן או שווה ל- {0}"),
min: $.validator.format("נא למלא ערך גדול או שווה ל- {0}")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: HR (Croatia; hrvatski jezik)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Ovo polje je obavezno.",
remote: "Ovo polje treba popraviti.",
email: "Unesite ispravnu e-mail adresu.",
url: "Unesite ispravan URL.",
date: "Unesite ispravan datum.",
dateISO: "Unesite ispravan datum (ISO).",
number: "Unesite ispravan broj.",
digits: "Unesite samo brojeve.",
creditcard: "Unesite ispravan broj kreditne kartice.",
equalTo: "Unesite ponovo istu vrijednost.",
accept: "Unesite vrijednost sa ispravnom ekstenzijom.",
maxlength: $.validator.format("Maksimalni broj znakova je {0} ."),
minlength: $.validator.format("Minimalni broj znakova je {0} ."),
rangelength: $.validator.format("Unesite vrijednost između {0} i {1} znakova."),
range: $.validator.format("Unesite vrijednost između {0} i {1}."),
max: $.validator.format("Unesite vrijednost manju ili jednaku {0}."),
min: $.validator.format("Unesite vrijednost veću ili jednaku {0}.")
});
}(jQuery));
@@ -0,0 +1,24 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: HU (Hungarian; Magyar)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Kötelező megadni.",
maxlength: $.validator.format("Legfeljebb {0} karakter hosszú legyen."),
minlength: $.validator.format("Legalább {0} karakter hosszú legyen."),
rangelength: $.validator.format("Legalább {0} és legfeljebb {1} karakter hosszú legyen."),
email: "Érvényes e-mail címnek kell lennie.",
url: "Érvényes URL-nek kell lennie.",
date: "Dátumnak kell lennie.",
number: "Számnak kell lennie.",
digits: "Csak számjegyek lehetnek.",
equalTo: "Meg kell egyeznie a két értéknek.",
range: $.validator.format("{0} és {1} közé kell esnie."),
max: $.validator.format("Nem lehet nagyobb, mint {0}."),
min: $.validator.format("Nem lehet kisebb, mint {0}."),
creditcard: "Érvényes hitelkártyaszámnak kell lennie.",
remote: "Kérem javítsa ki ezt a mezőt.",
dateISO: "Kérem írjon be egy érvényes dátumot (ISO)."
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: IT (Italian; Italiano)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Campo obbligatorio.",
remote: "Controlla questo campo.",
email: "Inserisci un indirizzo email valido.",
url: "Inserisci un indirizzo web valido.",
date: "Inserisci una data valida.",
dateISO: "Inserisci una data valida (ISO).",
number: "Inserisci un numero valido.",
digits: "Inserisci solo numeri.",
creditcard: "Inserisci un numero di carta di credito valido.",
equalTo: "Il valore non corrisponde.",
accept: "Inserisci un valore con un&apos;estensione valida.",
maxlength: $.validator.format("Non inserire pi&ugrave; di {0} caratteri."),
minlength: $.validator.format("Inserisci almeno {0} caratteri."),
rangelength: $.validator.format("Inserisci un valore compreso tra {0} e {1} caratteri."),
range: $.validator.format("Inserisci un valore compreso tra {0} e {1}."),
max: $.validator.format("Inserisci un valore minore o uguale a {0}."),
min: $.validator.format("Inserisci un valore maggiore o uguale a {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: JA (Japanese; 日本語)
*/
(function ($) {
$.extend($.validator.messages, {
required: "このフィールドは必須です。",
remote: "このフィールドを修正してください。",
email: "有効なEメールアドレスを入力してください。",
url: "有効なURLを入力してください。",
date: "有効な日付を入力してください。",
dateISO: "有効な日付(ISO)を入力してください。",
number: "有効な数字を入力してください。",
digits: "数字のみを入力してください。",
creditcard: "有効なクレジットカード番号を入力してください。",
equalTo: "同じ値をもう一度入力してください。",
accept: "有効な拡張子を含む値を入力してください。",
maxlength: $.format("{0} 文字以内で入力してください。"),
minlength: $.format("{0} 文字以上で入力してください。"),
rangelength: $.format("{0} 文字から {1} 文字までの値を入力してください。"),
range: $.format("{0} から {1} までの値を入力してください。"),
max: $.format("{0} 以下の値を入力してください。"),
min: $.format("{0} 以上の値を入力してください。")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: KA (Georgian; ქართული)
*/
(function ($) {
$.extend($.validator.messages, {
required: "ამ ველის შევსება აუცილებელია.",
remote: "გთხოვთ მიუთითოთ სწორი მნიშვნელობა.",
email: "გთხოვთ მიუთითოთ ელ-ფოსტის კორექტული მისამართი.",
url: "გთხოვთ მიუთითოთ კორექტული URL.",
date: "გთხოვთ მიუთითოთ კორექტული თარიღი.",
dateISO: "გთხოვთ მიუთითოთ კორექტული თარიღი ISO ფორმატში.",
number: "გთხოვთ მიუთითოთ ციფრი.",
digits: "გთხოვთ მიუთითოთ მხოლოდ ციფრები.",
creditcard: "გთხოვთ მიუთითოთ საკრედიტო ბარათის კორექტული ნომერი.",
equalTo: "გთხოვთ მიუთითოთ ასეთივე მნიშვნელობა კიდევ ერთხელ.",
accept: "გთხოვთ აირჩიოთ ფაილი კორექტული გაფართოებით.",
maxlength: $.validator.format("დასაშვებია არაუმეტეს {0} სიმბოლო."),
minlength: $.validator.format("აუცილებელია შეიყვანოთ მინიმუმ {0} სიმბოლო."),
rangelength: $.validator.format("ტექსტში სიმბოლოების რაოდენობა უნდა იყოს {0}-დან {1}-მდე."),
range: $.validator.format("გთხოვთ შეიყვანოთ ციფრი {0}-დან {1}-მდე."),
max: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც ნაკლებია ან უდრის {0}-ს."),
min: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც მეტია ან უდრის {0}-ს.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: KK (Kazakh; қазақ тілі)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Бұл өрісті міндетті түрде толтырыңыз.",
remote: "Дұрыс мағына енгізуіңізді сұраймыз.",
email: "Нақты электронды поштаңызды енгізуіңізді сұраймыз.",
url: "Нақты URL-ды енгізуіңізді сұраймыз.",
date: "Нақты URL-ды енгізуіңізді сұраймыз.",
dateISO: "Нақты ISO форматымен сәйкес датасын енгізуіңізді сұраймыз.",
number: "Күнді енгізуіңізді сұраймыз.",
digits: "Тек қана сандарды енгізуіңізді сұраймыз.",
creditcard: "Несие картасының нөмірін дұрыс енгізуіңізді сұраймыз.",
equalTo: "Осы мәнді қайта енгізуіңізді сұраймыз.",
accept: "Файлдың кеңейтуін дұрыс таңдаңыз.",
maxlength: $.format("Ұзындығы {0} символдан көр болмасын."),
minlength: $.format("Ұзындығы {0} символдан аз болмасын."),
rangelength: $.format("Ұзындығы {0}-{1} дейін мән енгізуіңізді сұраймыз."),
range: $.format("Пожалуйста, введите число от {0} до {1}. - {0} - {1} санын енгізуіңізді сұраймыз."),
max: $.format("{0} аз немесе тең санын енгізуіңіді сұраймыз."),
min: $.format("{0} көп немесе тең санын енгізуіңізді сұраймыз.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: KO (Korean; 한국어)
*/
(function ($) {
$.extend($.validator.messages, {
required: "필수 항목입니다.",
remote: "항목을 수정하세요.",
email: "유효하지 않은 E-Mail주소입니다.",
url: "유효하지 않은 주소입니다.",
date: "옳바른 날짜를 입력하세요.",
dateISO: "옳바른 날짜(ISO)를 입력하세요.",
number: "유효한 숫자가 아닙니다.",
digits: "숫자만 입력 가능합니다.",
creditcard: "신용카드번호가 바르지 않습니다.",
equalTo: "같은값을 다시 입력하세요.",
accept: "옳바른 확장자가 아닙니다.",
maxlength: $.format("{0}자를 넘을 수 없습니다. "),
minlength: $.format("{0}자 이하로 입력하세요."),
rangelength: $.format("문자 길이를 {0} 에서 {1} 사이의로 입력하세요."),
range: $.format("{0} 에서 {1} 값을 입력하세요."),
max: $.format("{0} 이하의 값을 입력하세요."),
min: $.format("{0} 이상의 값을 입력하세요.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: LT (Lithuanian; lietuvių kalba)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Šis laukas yra privalomas.",
remote: "Prašau pataisyti šį lauką.",
email: "Prašau įvesti teisingą elektroninio pašto adresą.",
url: "Prašau įvesti teisingą URL.",
date: "Prašau įvesti teisingą datą.",
dateISO: "Prašau įvesti teisingą datą (ISO).",
number: "Prašau įvesti teisingą skaičių.",
digits: "Prašau naudoti tik skaitmenis.",
creditcard: "Prašau įvesti teisingą kreditinės kortelės numerį.",
equalTo: "Prašau įvestį tą pačią reikšmę dar kartą.",
accept: "Prašau įvesti reikšmę su teisingu plėtiniu.",
maxlength: $.format("Prašau įvesti ne daugiau kaip {0} simbolių."),
minlength: $.format("Prašau įvesti bent {0} simbolius."),
rangelength: $.format("Prašau įvesti reikšmes, kurių ilgis nuo {0} iki {1} simbolių."),
range: $.format("Prašau įvesti reikšmę intervale nuo {0} iki {1}."),
max: $.format("Prašau įvesti reikšmę mažesnę arba lygią {0}."),
min: $.format("Prašau įvesti reikšmę didesnę arba lygią {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: LV (Latvian; latviešu valoda)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Šis lauks ir obligāts.",
remote: "Lūdzu, pārbaudiet šo lauku.",
email: "Lūdzu, ievadiet derīgu e-pasta adresi.",
url: "Lūdzu, ievadiet derīgu URL adresi.",
date: "Lūdzu, ievadiet derīgu datumu.",
dateISO: "Lūdzu, ievadiet derīgu datumu (ISO).",
number: "Lūdzu, ievadiet derīgu numuru.",
digits: "Lūdzu, ievadiet tikai ciparus.",
creditcard: "Lūdzu, ievadiet derīgu kredītkartes numuru.",
equalTo: "Lūdzu, ievadiet to pašu vēlreiz.",
accept: "Lūdzu, ievadiet vērtību ar derīgu paplašinājumu.",
maxlength: $.validator.format("Lūdzu, ievadiet ne vairāk kā {0} rakstzīmes."),
minlength: $.validator.format("Lūdzu, ievadiet vismaz {0} rakstzīmes."),
rangelength: $.validator.format("Lūdzu ievadiet {0} līdz {1} rakstzīmes."),
range: $.validator.format("Lūdzu, ievadiet skaitli no {0} līdz {1}."),
max: $.validator.format("Lūdzu, ievadiet skaitli, kurš ir mazāks vai vienāds ar {0}."),
min: $.validator.format("Lūdzu, ievadiet skaitli, kurš ir lielāks vai vienāds ar {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: MY (Malay; Melayu)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Medan ini diperlukan.",
remote: "Sila betulkan medan ini.",
email: "Sila masukkan alamat emel yang betul.",
url: "Sila masukkan URL yang betul.",
date: "Sila masukkan tarikh yang betul.",
dateISO: "Sila masukkan tarikh(ISO) yang betul.",
number: "Sila masukkan nombor yang betul.",
digits: "Sila masukkan nilai digit sahaja.",
creditcard: "Sila masukkan nombor kredit kad yang betul.",
equalTo: "Sila masukkan nilai yang sama semula.",
accept: "Sila masukkan nilai yang telah diterima.",
maxlength: $.validator.format("Sila masukkan nilai tidak lebih dari {0} aksara."),
minlength: $.validator.format("Sila masukkan nilai sekurang-kurangnya {0} aksara."),
rangelength: $.validator.format("Sila masukkan panjang nilai antara {0} dan {1} aksara."),
range: $.validator.format("Sila masukkan nilai antara {0} dan {1} aksara."),
max: $.validator.format("Sila masukkan nilai yang kurang atau sama dengan {0}."),
min: $.validator.format("Sila masukkan nilai yang lebih atau sama dengan {0}.")
});
}(jQuery));
@@ -0,0 +1,35 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: NL (Dutch; Nederlands, Vlaams)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Dit is een verplicht veld.",
remote: "Controleer dit veld.",
email: "Vul hier een geldig e-mailadres in.",
url: "Vul hier een geldige URL in.",
date: "Vul hier een geldige datum in.",
dateISO: "Vul hier een geldige datum in (ISO-formaat).",
number: "Vul hier een geldig getal in.",
digits: "Vul hier alleen getallen in.",
creditcard: "Vul hier een geldig creditcardnummer in.",
equalTo: "Vul hier dezelfde waarde in.",
accept: "Vul hier een waarde in met een geldige extensie.",
maxlength: $.validator.format("Vul hier maximaal {0} tekens in."),
minlength: $.validator.format("Vul hier minimaal {0} tekens in."),
rangelength: $.validator.format("Vul hier een waarde in van minimaal {0} en maximaal {1} tekens."),
range: $.validator.format("Vul hier een waarde in van minimaal {0} en maximaal {1}."),
max: $.validator.format("Vul hier een waarde in kleiner dan of gelijk aan {0}."),
min: $.validator.format("Vul hier een waarde in groter dan of gelijk aan {0}."),
// for validations in additional-methods.js
iban: "Vul hier een geldig IBAN in.",
dateNL: "Vul hier een geldige datum in.",
phoneNL: "Vul hier een geldig Nederlands telefoonnummer in.",
mobileNL: "Vul hier een geldig Nederlands mobiel telefoonnummer in.",
postalcodeNL: "Vul hier een geldige postcode in.",
bankaccountNL: "Vul hier een geldig bankrekeningnummer in.",
giroaccountNL: "Vul hier een geldig gironummer in.",
bankorgiroaccountNL: "Vul hier een geldig bank- of gironummer in."
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: NO (Norwegian; Norsk)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Dette feltet er obligatorisk.",
maxlength: $.validator.format("Maksimalt {0} tegn."),
minlength: $.validator.format("Minimum {0} tegn."),
rangelength: $.validator.format("Angi minimum {0} og maksimum {1} tegn."),
email: "Oppgi en gyldig epostadresse.",
url: "Angi en gyldig URL.",
date: "Angi en gyldig dato.",
dateISO: "Angi en gyldig dato (&ARING;&ARING;&ARING;&ARING;-MM-DD).",
dateSE: "Angi en gyldig dato.",
number: "Angi et gyldig nummer.",
numberSE: "Angi et gyldig nummer.",
digits: "Skriv kun tall.",
equalTo: "Skriv samme verdi igjen.",
range: $.validator.format("Angi en verdi mellom {0} og {1}."),
max: $.validator.format("Angi en verdi som er mindre eller lik {0}."),
min: $.validator.format("Angi en verdi som er st&oslash;rre eller lik {0}."),
creditcard: "Angi et gyldig kredittkortnummer."
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: PL (Polish; język polski, polszczyzna)
*/
(function ($) {
$.extend($.validator.messages, {
required: "To pole jest wymagane.",
remote: "Proszę o wypełnienie tego pola.",
email: "Proszę o podanie prawidłowego adresu email.",
url: "Proszę o podanie prawidłowego URL.",
date: "Proszę o podanie prawidłowej daty.",
dateISO: "Proszę o podanie prawidłowej daty (ISO).",
number: "Proszę o podanie prawidłowej liczby.",
digits: "Proszę o podanie samych cyfr.",
creditcard: "Proszę o podanie prawidłowej karty kredytowej.",
equalTo: "Proszę o podanie tej samej wartości ponownie.",
accept: "Proszę o podanie wartości z prawidłowym rozszerzeniem.",
maxlength: $.validator.format("Proszę o podanie nie więcej niż {0} znaków."),
minlength: $.validator.format("Proszę o podanie przynajmniej {0} znaków."),
rangelength: $.validator.format("Proszę o podanie wartości o długości od {0} do {1} znaków."),
range: $.validator.format("Proszę o podanie wartości z przedziału od {0} do {1}."),
max: $.validator.format("Proszę o podanie wartości mniejszej bądź równej {0}."),
min: $.validator.format("Proszę o podanie wartości większej bądź równej {0}.")
});
}(jQuery));
@@ -0,0 +1,26 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: PT (Portuguese; português)
* Region: BR (Brazil)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Este campo &eacute; requerido.",
remote: "Por favor, corrija este campo.",
email: "Por favor, forne&ccedil;a um endere&ccedil;o eletr&ocirc;nico v&aacute;lido.",
url: "Por favor, forne&ccedil;a uma URL v&aacute;lida.",
date: "Por favor, forne&ccedil;a uma data v&aacute;lida.",
dateISO: "Por favor, forne&ccedil;a uma data v&aacute;lida (ISO).",
number: "Por favor, forne&ccedil;a um n&uacute;mero v&aacute;lido.",
digits: "Por favor, forne&ccedil;a somente d&iacute;gitos.",
creditcard: "Por favor, forne&ccedil;a um cart&atilde;o de cr&eacute;dito v&aacute;lido.",
equalTo: "Por favor, forne&ccedil;a o mesmo valor novamente.",
accept: "Por favor, forne&ccedil;a um valor com uma extens&atilde;o v&aacute;lida.",
maxlength: $.validator.format("Por favor, forne&ccedil;a n&atilde;o mais que {0} caracteres."),
minlength: $.validator.format("Por favor, forne&ccedil;a ao menos {0} caracteres."),
rangelength: $.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1} caracteres de comprimento."),
range: $.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1}."),
max: $.validator.format("Por favor, forne&ccedil;a um valor menor ou igual a {0}."),
min: $.validator.format("Por favor, forne&ccedil;a um valor maior ou igual a {0}.")
});
}(jQuery));
@@ -0,0 +1,26 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: PT (Portuguese; português)
* Region: PT (Portugal)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Campo de preenchimento obrigat&oacute;rio.",
remote: "Por favor, corrija este campo.",
email: "Por favor, introduza um endere&ccedil;o eletr&oacute;nico v&aacute;lido.",
url: "Por favor, introduza um URL v&aacute;lido.",
date: "Por favor, introduza uma data v&aacute;lida.",
dateISO: "Por favor, introduza uma data v&aacute;lida (ISO).",
number: "Por favor, introduza um n&uacute;mero v&aacute;lido.",
digits: "Por favor, introduza apenas d&iacute;gitos.",
creditcard: "Por favor, introduza um n&uacute;mero de cart&atilde;o de cr&eacute;dito v&aacute;lido.",
equalTo: "Por favor, introduza de novo o mesmo valor.",
accept: "Por favor, introduza um ficheiro com uma extens&atilde;o v&aacute;lida.",
maxlength: $.validator.format("Por favor, n&atilde;o introduza mais do que {0} caracteres."),
minlength: $.validator.format("Por favor, introduza pelo menos {0} caracteres."),
rangelength: $.validator.format("Por favor, introduza entre {0} e {1} caracteres."),
range: $.validator.format("Por favor, introduza um valor entre {0} e {1}."),
max: $.validator.format("Por favor, introduza um valor menor ou igual a {0}."),
min: $.validator.format("Por favor, introduza um valor maior ou igual a {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: RO (Romanian, limba română)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Acest câmp este obligatoriu.",
remote: "Te rugăm să completezi acest câmp.",
email: "Te rugăm să introduci o adresă de email validă",
url: "Te rugăm sa introduci o adresă URL validă.",
date: "Te rugăm să introduci o dată corectă.",
dateISO: "Te rugăm să introduci o dată (ISO) corectă.",
number: "Te rugăm să introduci un număr întreg valid.",
digits: "Te rugăm să introduci doar cifre.",
creditcard: "Te rugăm să introduci un numar de carte de credit valid.",
equalTo: "Te rugăm să reintroduci valoarea.",
accept: "Te rugăm să introduci o valoare cu o extensie validă.",
maxlength: $.validator.format("Te rugăm să nu introduci mai mult de {0} caractere."),
minlength: $.validator.format("Te rugăm să introduci cel puțin {0} caractere."),
rangelength: $.validator.format("Te rugăm să introduci o valoare între {0} și {1} caractere."),
range: $.validator.format("Te rugăm să introduci o valoare între {0} și {1}."),
max: $.validator.format("Te rugăm să introduci o valoare egal sau mai mică decât {0}."),
min: $.validator.format("Te rugăm să introduci o valoare egal sau mai mare decât {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: RU (Russian; русский язык)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Это поле необходимо заполнить.",
remote: "Пожалуйста, введите правильное значение.",
email: "Пожалуйста, введите корректный адрес электронной почты.",
url: "Пожалуйста, введите корректный URL.",
date: "Пожалуйста, введите корректную дату.",
dateISO: "Пожалуйста, введите корректную дату в формате ISO.",
number: "Пожалуйста, введите число.",
digits: "Пожалуйста, вводите только цифры.",
creditcard: "Пожалуйста, введите правильный номер кредитной карты.",
equalTo: "Пожалуйста, введите такое же значение ещё раз.",
accept: "Пожалуйста, выберите файл с правильным расширением.",
maxlength: $.validator.format("Пожалуйста, введите не больше {0} символов."),
minlength: $.validator.format("Пожалуйста, введите не меньше {0} символов."),
rangelength: $.validator.format("Пожалуйста, введите значение длиной от {0} до {1} символов."),
range: $.validator.format("Пожалуйста, введите число от {0} до {1}."),
max: $.validator.format("Пожалуйста, введите число, меньшее или равное {0}."),
min: $.validator.format("Пожалуйста, введите число, большее или равное {0}.")
});
}(jQuery));
@@ -0,0 +1,25 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: SI (Slovenian)
*/
(function ($) {
$.extend($.validator.messages, {
required: "To polje je obvezno.",
remote: "Vpis v tem polju ni v pravi obliki.",
email: "Prosimo, vnesite pravi email naslov.",
url: "Prosimo, vnesite pravi URL.",
date: "Prosimo, vnesite pravi datum.",
dateISO: "Prosimo, vnesite pravi datum (ISO).",
number: "Prosimo, vnesite pravo številko.",
digits: "Prosimo, vnesite samo številke.",
creditcard: "Prosimo, vnesite pravo številko kreditne kartice.",
equalTo: "Prosimo, ponovno vnesite enako vsebino.",
accept: "Prosimo, vnesite vsebino z pravo končnico.",
maxlength: $.validator.format("Prosimo, da ne vnašate več kot {0} znakov."),
minlength: $.validator.format("Prosimo, vnesite vsaj {0} znakov."),
rangelength: $.validator.format("Prosimo, vnesite od {0} do {1} znakov."),
range: $.validator.format("Prosimo, vnesite vrednost med {0} in {1}."),
max: $.validator.format("Prosimo, vnesite vrednost manjšo ali enako {0}."),
min: $.validator.format("Prosimo, vnesite vrednost večjo ali enako {0}.")
});
}(jQuery));
@@ -0,0 +1,22 @@
/*
* Translated default messages for the jQuery validation plugin.
* Locale: SK (Slovak; slovenčina, slovenský jazyk)
*/
(function ($) {
$.extend($.validator.messages, {
required: "Povinné zadať.",
maxlength: $.validator.format("Maximálne {0} znakov."),
minlength: $.validator.format("Minimálne {0} znakov."),
rangelength: $.validator.format("Minimálne {0} a Maximálne {0} znakov."),
email: "E-mailová adresa musí byť platná.",
url: "URL musí byť platný.",
date: "Musí byť dátum.",
number: "Musí byť číslo.",
digits: "Môže obsahovať iba číslice.",
equalTo: "Dva hodnoty sa musia rovnať.",
range: $.validator.format("Musí byť medzi {0} a {1}."),
max: $.validator.format("Nemôže byť viac ako{0}."),
min: $.validator.format("Nemôže byť menej ako{0}."),
creditcard: "Číslo platobnej karty musí byť platné."
});
}(jQuery));

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