Dominik Moritz
2d26afb435
Merge branch 'master' into markercluster
...
Conflicts:
src/view.map.js
2012-09-25 11:49:16 +01:00
Michael Bauer
d5e36944d7
query now supports regexes
...
actually compile stuff :/
2012-09-13 16:37:08 +02:00
Michael Bauer
73c414be30
changed memory test to reflect changed behavior
2012-09-13 16:35:43 +02:00
Michael Bauer
4954e442a3
added regex support for query
...
Added a the regex support for queries - this will also match substrings!
(change from previous behavior).
Also fixed the test vor Custom popups, since this was b0rken.
2012-09-13 16:32:36 +02:00
Michael Bauer
fbea51030b
fixes #222
...
It's quite simple obviously fields can not only be null but also
undefined....
2012-09-13 14:50:25 +02:00
Dominik Moritz
79c262e25b
update markercluster to latest version
2012-09-12 14:17:03 +01:00
Dominik Moritz
3ecd0b875b
write a test for automatic clustering and fix render issue
2012-09-12 14:10:50 +01:00
Michael Bauer
881fee5fe7
Fixes #230 - updated the feature popup code
...
The feature popup code was broken since commit
9b1bedc97c6febd236023e1ec40114ed288eecd4
2012-09-12 12:48:59 +02:00
Michael Bauer
208c9a9330
Merge branch 'master' of github.com:okfn/recline
...
Conflicts:
dist/recline.js
2012-09-12 11:42:10 +02:00
Michael Bauer
6fa99a0cf0
compile of dist/recline
2012-09-12 11:40:41 +02:00
Dominik Moritz
89890c8acb
automatically enable clustering if there is a large number of markers
2012-09-12 01:52:58 +01:00
Dominik Moritz
e167591253
Updated documentation and tutorials
2012-09-12 00:50:20 +01:00
Dominik Moritz
063d4b7ece
formatting and fixes in dev notes
2012-09-12 00:16:51 +01:00
Dominik Moritz
0577ab145d
disable clustering in tests
2012-09-12 00:09:25 +01:00
Dominik Moritz
751cd095ce
cluster markers to handle larger datasets
2012-09-12 00:09:07 +01:00
Dominik Moritz
b190e3b8a8
add clustering library
2012-09-12 00:00:03 +01:00
Rufus Pollock
ce668a32c7
[vendor/leaflet][s]: remove leaflet v0.3.1 rendered obsolete by work in #220 .
2012-09-10 11:18:46 +01:00
Rufus Pollock
e7f9d022d1
[demos][xs]: reinstate first demo link to multiview accidentally just removed in d1cc591dfcad55b813acbe6092e8edb0647233d7.
2012-09-09 16:22:54 +01:00
Rufus Pollock
2023cc4c35
[build][m]: regular build including docs.
2012-09-09 16:16:00 +01:00
Rufus Pollock
1effe779f3
[#180,refactor][xs]: rename couchdb demo url to /couchdb/ from /couchdb_multiview/.
2012-09-09 16:09:31 +01:00
Rufus Pollock
d1cc591dfc
[#180,refactor][s]: clean up couchdb demo from @danbietz in minor ways - fixes #180 .
...
* Provide instructions on how to set up couchdb to try out the example
* Remove cruft from demos index page (in link to this demo)
2012-09-09 16:04:59 +01:00
bietz
f8f1e78699
removed updated underscore and backbone libs
2012-09-09 15:37:05 +01:00
bietz
be8c9de605
removed updated backbone and updated example
2012-09-09 15:37:05 +01:00
bietz
a62d9ccdb2
updated couchdb backend
2012-09-09 15:37:05 +01:00
Bietz
b8537aae57
fixed couchdb backend, updated backbone and underscore, added couchdb multiview example in demos
2012-09-09 15:37:05 +01:00
Rufus Pollock
00d36f2dac
[#170,cleanup][s]: remove jquery.flot vendor lib and last remaining ref to it in test/index.html as now replaced by flotr2 - fixes #170 .
2012-09-09 15:33:57 +01:00
Rufus Pollock
9948c501cf
[#190,backend/csv][s]: rename CSV options from delimiter to quotechar and separator to delimiter - fixes #190 .
2012-09-09 15:20:37 +01:00
Rufus Pollock
6e49f53a63
[#185,backend/csv][s]: add support for dataset-style objects to serializeCSV method - fixes #185 .
2012-09-09 15:11:54 +01:00
Rufus Pollock
c879ca6df9
[whitespace,view/graph][xs]: fix up whitespace in view.graph.js.
2012-09-09 14:43:48 +01:00
Rufus Pollock
f823459561
[README][s]: add instructions for contributors.
2012-09-09 11:14:12 +01:00
Rufus Pollock
5542e2e23b
[#77,view/map][s]: support for infobox method to allow customization of popup infoboxes.
2012-09-08 19:27:42 +01:00
Rufus Pollock
763de67596
[test][xs]: remove dataset.query calls in map tests as no longer needed (since 02d152c5ad2a68e8b80ed63c636e2d6e4c3d084a I think).
2012-09-08 18:48:54 +01:00
Rufus Pollock
3742c7b9da
[#220,fixups][s]: fix up references to old Leaflet (0.3.1) to new Leaflet (0.4.1).
2012-09-08 18:43:34 +01:00
Rufus Pollock
e18a70aecf
Merge pull request #220 from domoritz/master
...
[view/map][s]: Update to use Leaflet v0.4.4 (contribution from @domoritz).
2012-09-03 01:06:46 -07:00
Dominik Moritz
eed8024391
cleanup
2012-09-01 22:22:30 +01:00
Dominik Moritz
419f2e395c
Hack because of leaflet issue ( https://github.com/CloudMade/Leaflet/issues/966 )
2012-09-01 22:08:07 +01:00
Dominik Moritz
8049f73f09
cleanup
2012-09-01 22:07:44 +01:00
Dominik Moritz
6695b3d371
Use src version of leaflet in tests
2012-09-01 21:33:39 +01:00
Dominik Moritz
69d1cfbdf2
satisfy lint
2012-09-01 21:07:01 +01:00
Dominik Moritz
9b1bedc97c
Adapt to api changes (featureparse event does not exist anymore)
2012-09-01 21:04:57 +01:00
Dominik Moritz
fb81d51bc6
Updated leaflet to 0.4.4
2012-08-27 00:56:56 +01:00
Rufus Pollock
1bc5e72820
Merge pull request #219 from fgnass/master
...
[multiview][xs]: Bugfix for upper right menu in MultiView - thx to @fgnass.
2012-08-23 08:27:57 -07:00
Felix Gnass
831d656477
fixed the upper right menu and made it dynamic
...
The menu did not work because `this['$'+view.id]=...` was called with the wrong scope. Besides this fix, the template now looks at the actual `sidebarViews` array and renders the buttons dynamically.
2012-08-23 14:29:22 +02:00
Rufus Pollock
a7baa1739d
[build][s]: regular buildi (new stuff will be ckan i imagine).
2012-08-22 10:00:11 +01:00
Rufus Pollock
e2963e9fb7
[#217,backend/ckan][s]: support for sorting (plus refactor to have a normalizeQuery method).
2012-08-22 09:51:33 +01:00
Rufus Pollock
fe41a0cf90
Merge branch 'master' into 217-ckan-backend
2012-08-21 23:57:10 +01:00
Rufus Pollock
4737d7ecc5
[#218,refactor,query][m]: refactor query object sort attribute structure as described in #218 - fixes #218 .
2012-08-21 23:55:03 +01:00
Rufus Pollock
09ffb04e40
[#196,addendum][xs]: fix up demos restore functionality which was broken by removal of Dataset.restore for #196 .
2012-08-21 23:43:32 +01:00
Rufus Pollock
41657d2cae
[#217,backend/ckan][xs]: bugfix regarding setting of the CKAN API endpoint.
2012-08-21 22:20:12 +01:00
Rufus Pollock
b03fa3b1a4
Merge branch '217-ckan-backend'
2012-08-21 22:09:16 +01:00