2428 Commits

Author SHA1 Message Date
Luke Page
9b7021a309 2.5.0 release v2.5.0 2015-04-03 09:53:16 +01:00
Luke Page
dbe2eaa5f7 Tidy up path splitting 2015-04-03 08:33:21 +01:00
Luke Page
7c6da7ae86 Merge https://github.com/ifunk/less.js
Conflicts:
	lib/less-rhino/index.js
2015-04-03 08:32:51 +01:00
Luke Page
7ed9574d8a Merge pull request #2530 from seven-phases-max/proper-non-primitive-value-replacement-for-format-and-replace
Proper non-primitive value replacement for `%` and `replace`
2015-04-03 08:04:03 +01:00
Luke Page
2b42605337 Merge pull request #2526 from bassjobsen/image-size
Image size
2015-04-02 06:36:12 +01:00
Bass Jobsen
ea43e7d6d0 Merge remote-tracking branch 'upstream/master' into image-size 2015-04-01 23:45:14 +02:00
Luke Page
fc93876dcc Merge pull request #2533 from seven-phases-max/fix-formatting-for-jscs
Fix formatting to meet jscs settings
2015-04-01 19:43:51 +01:00
seven-phases-max
1950248a87 fix formatting to meet jscs settings 2015-04-01 21:26:14 +04:00
Luke Page
1e67f03172 Merge pull request #2525 from whitecolor/patch-1
Add browser field
2015-04-01 13:06:11 +01:00
Luke Page
c1bccbec32 Do not use the latest jscs as it breaks
since it does extra checking on indentation that doesn't pass.
2015-04-01 13:01:28 +01:00
Luke Page
86fa4f6f9d Merge pull request #2522 from rjgotten/fix-plugin-scoping
Fix `@plugin` scoping rules
2015-04-01 06:46:40 +01:00
seven-phases-max
13ef5b7422 proper non-primitive value replacement for % and replace functions 2015-03-31 19:35:22 +04:00
Luke Page
ecd3f6659d Merge pull request #2527 from seven-phases-max/fix-grunt-shell-benchmark
Fix grunt shell:benchmark command
2015-03-30 16:53:19 +01:00
seven-phases-max
ff55171dc8 fix grunt shell:benchmark command 2015-03-30 04:38:36 +04:00
Bass Jobsen
16a0285b7b fixes for issue #2482 2015-03-29 18:16:53 +02:00
Bass Jobsen
f0f271919b fixes for issue #2482 2015-03-29 18:16:01 +02:00
Alex
7cc986e361 Add browser field
to support browserfy and other loaders that use `browser` field for resolving browser version
https://github.com/substack/node-browserify#packagejson
2015-03-28 14:50:51 +05:00
Luke Page
e411f548c1 Merge pull request #2520 from less/bugfix/2440
Fix 2440
2015-03-26 16:25:56 +00:00
rjgotten
aa66271dd3 Deletes an accidentally committed dev file 2015-03-23 22:50:50 +01:00
rjgotten
56687b9d02 Make functionRegistry in mxin definition inherit from mixinEnv
functionRegistry was mistakingly inheriting from the top frame of the
caller context, which was incorrect. It should inherit from definition
scope.
2015-03-23 11:01:51 +01:00
rjgotten
0a6e2f814d merge changes from upstream 2015-03-23 10:40:01 +01:00
Luke Page
17aafae556 Add test for #2440 2015-03-21 22:08:50 +00:00
Luke Page
e0dff5308c Bubble import only above other non comment, non charset rules. Fixes #2440 2015-03-21 22:06:01 +00:00
Luke Page
9de877523b Merge pull request #2517 from seven-phases-max/fix-naked-url-import
Quick fix for naked `url` imports
2015-03-21 21:52:12 +00:00
Adam Royle
b4bf0546b7 Add support for : or ; path separators in --include-path regardless of platform. Understands absolute paths with Windows drive letters (ie. .:C:\Windows\) 2015-03-22 07:40:30 +10:00
Luke Page
125a7f06d8 use function context for file info, not the path node 2015-03-21 17:07:07 +00:00
Luke Page
8f1153885a Merge branch 'master' of https://github.com/less/less.js 2015-03-21 16:41:26 +00:00
Luke Page
a01c40e1b9 more replacement of regexes 2015-03-21 16:40:57 +00:00
seven-phases-max
414d21c7af Fix naked url import 2015-03-21 15:19:14 +04:00
Luke Page
16ed6bfc2e Remove regex used every node with a char lookup 2015-03-21 10:28:35 +00:00
Luke Page
b476f6edce Merge pull request #2515 from wahuneke/revert_pr2510
re: #2508 - revert #2510 - undo all fixes. issue == WONTFIX
2015-03-20 17:23:25 +00:00
Luke Page
5c0179d199 Merge branch 'master' of https://github.com/less/less.js 2015-03-20 17:14:41 +00:00
Luke Page
936b78c6b4 See missing media blocks. Fixes #2494 2015-03-20 17:13:10 +00:00
rjgotten
56f5db8362 Mend failing unit tests 2015-03-20 17:15:31 +01:00
Bill Huneke
328ea62d7c re: #2508 - revert #2510 - undo all fixes. issue == WONTFIX 2015-03-20 12:01:33 -04:00
rjgotten
4d17c8b35d Fix plugin scope for mixins, directives and detached rulesets
Fixed scope for plugins to apply correctly for mixins, directives and
detached rulesets.
Updated plugin unit tests to be more comprehensive
2015-03-20 16:41:05 +01:00
rjgotten
7a80a82283 Add missing null check 2015-03-20 12:46:19 +01:00
Luke Page
a6dca8872a Merge pull request #2504 from bassjobsen/relative
optional relative amounts for color functions, see#975
2015-03-20 08:22:44 +00:00
Luke Page
b10928720f Merge branch 'tests' of https://github.com/bassjobsen/less.js
Conflicts:
	test/index.js
2015-03-20 08:11:46 +00:00
Luke Page
39c603a558 Merge pull request #2512 from rjgotten/directive-selectors
Fix selectors folding into directives
2015-03-19 19:51:46 +00:00
rjgotten
b948dad7ab Fix selectors folding into directives
When directives bubble up to global scope, selectors are no longer
folded into directives that do not logically allow them.
Fixes #2511
2015-03-19 20:22:40 +01:00
Luke Page
1033939243 Merge pull request #2510 from wahuneke/fix_issue_2508
Fix issue 2508
2015-03-19 06:37:13 +00:00
wahuneke
96ad40dec2 was missing declaration for a variable
sorry bout that. fixed.
2015-03-18 17:43:17 -04:00
Bill Huneke
e19e89d4f4 Merge branch 'master' into fix_issue_2508
Conflicts:
	bin/lessc
2015-03-18 16:34:08 -04:00
Bill Huneke
9585d4a063 fixes: #2508 - strip quotes on lessc command line input/output file names 2015-03-18 16:24:46 -04:00
Luke Page
8526dee6be Merge pull request #2505 from bassjobsen/paths
fix for issue #2500
2015-03-16 06:40:19 +00:00
Bass Jobsen
4bb098bfc9 fix for issue #2500 2015-03-15 23:09:50 +01:00
Luke Page
ebb79c08b2 fix call to removed function 2015-03-15 17:50:48 +00:00
Luke Page
d7846e2ae5 Merge pull request #2479 from rjgotten/import-plugin
Import plugin
2015-03-15 17:44:47 +00:00
Luke Page
54556bddf2 missing save/restore code searching for assignments 2015-03-15 17:39:29 +00:00