cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,946 Commits 13 Branches 25 Tags 44 MiB
839940981e
Commit Graph

1946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimir Agafonkin
839940981e add travis build status to readme 2013-02-01 15:48:56 +02:00
Vladimir Agafonkin
08f0e90c70 minor comment fixes 2013-02-01 15:17:11 +02:00
Vladimir Agafonkin
e773742a40 Merge pull request #1336 from edjafarov/travis-integration 
Travis integration up and running another try
 2013-02-01 05:15:15 -08:00
Eldar Djafarov
776be6dcbd travisci integration 2013-02-01 11:04:33 -02:00
Vladimir Agafonkin
08f770fcc2 Merge pull request #1053 from inpursuit/enhancement/3 
Allow pointer-events to be set via options passed to shape
 2013-01-31 08:37:43 -08:00
Vladimir Agafonkin
b2c0de16ac update build 2013-01-31 17:59:13 +02:00
Vladimir Agafonkin
619698f6fb minor whitespace cleanup 2013-01-31 17:32:16 +02:00
Vladimir Agafonkin
ef02f60387 merge #1141 and clean it up 2013-01-31 17:29:40 +02:00
Vladimir Agafonkin
2ebe67f110 cleanup testacular config 2013-01-31 15:44:55 +02:00
Vladimir Agafonkin
687246128c update Jasmine to 1.3.1 2013-01-31 14:31:53 +02:00
Vladimir Agafonkin
db499a8314 minor contribution guide update 2013-01-31 13:25:18 +02:00
Vladimir Agafonkin
7977220830 don't require testacular for other jake tasks 2013-01-31 13:17:42 +02:00
Vladimir Agafonkin
0d3aa59f9c cleanup leaflet-include.js 2013-01-31 12:59:41 +02:00
Vladimir Agafonkin
2ecc304687 Merge pull request #1330 from edjafarov/master 
my #1326  pull broke debug html pages. Pls merge the fix that adds deps script to all of those.
 2013-01-31 02:34:51 -08:00
Eldar Djafarov
5985bffea0 Fix debug html pages after #1326 2013-01-31 08:29:39 -02:00
Vladimir Agafonkin
a63c90159b Merge pull request #1326 from edjafarov/master 
add testacular runner for jasmine tests
 2013-01-31 02:07:17 -08:00
Eldar Djafarov
82b327d9f5 use global deps file instead of ustom list 2013-01-30 18:01:32 -02:00
Eldar Djafarov
c8c19d3b6f Make getFiles more consistent 2013-01-30 16:48:22 -02:00
Eldar Djafarov
c4b8139ee8 fix code style 2013-01-30 16:41:13 -02:00
Vladimir Agafonkin
a8763e665b Merge remote-tracking branch 'origin/control-design' 
# By Vladimir Agafonkin (4) and jacobtoye (2)
# Via Vladimir Agafonkin (1) and jacobtoye (1)
* origin/control-design:
  Removing unnecessary ie only styles.
  Using hex color instead of rgba to support oldie.
  make toolbar styles more generic
  simplify toolbar classes
  rename top/bottom to first/last in control classes, thanks @yohanboniface
  improve zoom control design (refining @jacobtoye's work)
 2013-01-30 17:23:17 +02:00
Eldar Djafarov
7e537eb954 enable testacular runner 2013-01-30 12:06:19 -02:00
Vagrant
88ba9dd0c8 Merge branch 'master' of git://github.com/Leaflet/Leaflet 
* 'master' of git://github.com/Leaflet/Leaflet:
  Escape URI component in getParamString
  update build and changelog
  hasLayer not checking for null Return false when checking for a null object in L.Map.hasLayer, in response to issue #1282.
  Fix js typo
  Add hasLayer to LayerGroup Add the method hasLayer to LayerGroup, return false when not present or checking for a null layer.
  condition on one line
  Revert "whitespace fix?"
  whitespace fix?
  whitespace again
  Trying to fix whitespace
  Simplify features check
  Handle arrays of feature collections
 2013-01-30 10:56:22 -02:00
Vladimir Agafonkin
b661c7bd44 Merge pull request #1313 from jacobtoye/control-design 
IE fixes for new control styles.
 2013-01-29 02:22:59 -08:00
jacobtoye
d42f9e966b Removing unnecessary ie only styles. 2013-01-29 14:01:10 +13:00
jacobtoye
93f46bf656 Using hex color instead of rgba to support oldie. 2013-01-29 14:00:26 +13:00
Vladimir Agafonkin
39f9e2be10 Merge pull request #1317 from yohanboniface/escape_uri_component 
Escape URI component in getParamString
 2013-01-27 12:37:32 -08:00
Yohan Boniface
c432c4eb24 Escape URI component in getParamString 2013-01-26 17:47:28 +01:00
Vladimir Agafonkin
4551633b9c update build and changelog 2013-01-23 15:45:45 +02:00
Vladimir Agafonkin
9bdab60182 make toolbar styles more generic 2013-01-23 15:34:44 +02:00
Vladimir Agafonkin
0554098460 simplify toolbar classes 2013-01-23 15:16:42 +02:00
Vladimir Agafonkin
140cace2a7 Merge pull request #1300 from rvlasveld/add_hasLayer_to_layerGroup 
Add has layer to layer group
 2013-01-21 14:29:07 -08:00
Vladimir Agafonkin
7bff6c5f2c Merge pull request #1302 from rvlasveld/fix_hasLayer_check_for_null 
hasLayer not checking for null
 2013-01-21 14:28:30 -08:00
Roemer Vlasveld
109fd06ae6 hasLayer not checking for null 
Return false when checking for a null object in L.Map.hasLayer, in
response to issue #1282.
 2013-01-21 23:22:01 +01:00
Roemer Vlasveld
75fa5b087f Fix js typo 2013-01-21 22:46:18 +01:00
Roemer Vlasveld
82d4535180 Add hasLayer to LayerGroup 
Add the method hasLayer to LayerGroup, return false when not present or checking for a null layer.
 2013-01-21 22:36:24 +01:00
Vladimir Agafonkin
a000304473 Merge pull request #1299 from snkashis/fix_feat_collects 
Handle arrays of feature collections, #1298
 2013-01-21 07:17:26 -08:00
snkashis
5524db2816 condition on one line 2013-01-21 10:14:42 -05:00
Vladimir Agafonkin
57c0ac408e rename top/bottom to first/last in control classes, thanks @yohanboniface 2013-01-21 17:04:58 +02:00
Vladimir Agafonkin
b5c9a16ffb improve zoom control design (refining @jacobtoye's work) 2013-01-21 16:55:48 +02:00
snkashis
65aad99297 Revert "whitespace fix?" 
This reverts commit 9856a66864.
 2013-01-20 20:18:48 -05:00
Steve
9856a66864 whitespace fix? 2013-01-20 20:06:52 -05:00
Steve
c0210009df whitespace again 2013-01-20 19:39:01 -05:00
Steve
03a775c69b Trying to fix whitespace 2013-01-20 19:38:12 -05:00
Steve
52b445a36d Simplify features check 2013-01-20 19:35:18 -05:00
snkashis
c43e72da16 Handle arrays of feature collections 2013-01-20 19:13:43 -05:00
Eldar Djafarov
e1a3e97349 testacular port 2013-01-20 05:04:06 -02:00
Vladimir Agafonkin
4056f4c504 Merge pull request #1294 from calvinmetcalf/IconPath 
Wrong default icon path on old IE in certain cases.
 2013-01-18 10:49:28 -08:00
Calvin Metcalf
f26da9f9be only mention the path, and ternery 2013-01-18 13:35:07 -05:00
Calvin Metcalf
c3cb132463 we want it reletive not from the base 2013-01-18 12:46:16 -05:00
Calvin Metcalf
82869206e2 ie7 fix 2013-01-18 12:41:11 -05:00