knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,025 Commits 65 Branches 60 Tags
Commit Graph

1025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rufus Pollock
52fb7543ed Merge pull request #287 from okfn/287-view-flot 
[merge,view/flot][s]: Bring back graph view based on flot - thx to @johnglover.
 2013-01-10 01:43:04 -08:00
John Glover
789086b290 [#287] Add flot view tests. 
Same as view.graph.js tests (flotr2).
 2013-01-10 09:41:57 +01:00
John Glover
8439cc5522 [#287] Add view.flot.js. 
Allows flot to be used for graphs as well as
flotr2.
Based on view.graph.js in the ckan-updates branch.
 2013-01-09 15:53:44 +01:00
Rufus Pollock
896686c466 Merge pull request #302 from okfn/fix-timeline-test 
[timeline][xs]: Fix timeline test and remove old HACK that is no longer needed - thx to @stefanw.
 2013-01-08 06:13:12 -08:00
Rufus Pollock
ea1bced824 Merge pull request #303 from okfn/fix-multiview-demo 
[flotr2][s]: Remove underscore from flotr2 source - thx to @stefanw.
 2013-01-07 02:08:38 -08:00
Stefan Wehrmeyer
e520a0d0d6 Remove underscore from flotr2 source 
The older underscore version in flotr would overwrite the newer
one coming with recline and would also overwrite mixins like
underscore.deferred.
 2013-01-07 10:57:06 +01:00
Stefan Wehrmeyer
2c79d00f09 Remove weird date parsing hack to fix tests 2013-01-07 10:33:29 +01:00
Stefan Wehrmeyer
616d6b2ed8 Fix order of equal arguments 2013-01-07 10:33:00 +01:00
Rufus Pollock
a50733e552 [build][xs]: regular build. 2013-01-04 20:14:33 +00:00
Rufus Pollock
965bf6e9bb [#172,refactor][s]: switch everything to use underscore.deferred rather than jQuery.Deferred - fixes #172. 
* In addition reduced pattern of passing in $ to backend modules - instead just use jQuery explicitly (this should make it easier to mock-out jQuery if you waned to
 2013-01-04 20:13:16 +00:00
Rufus Pollock
e09a793a85 [#187,make][xs]: list minify as option in the help. 2013-01-04 19:28:54 +00:00
Rufus Pollock
ccde07574a [vendor,refactor][xs]: remove long-unused vendor libs jquery.hotkeys.js and traverse.js. 2013-01-04 19:20:56 +00:00
Rufus Pollock
e8ad368347 [backend.memory][s]: rename Store.data attribute to records to be more consistent (and more meaningful). 2013-01-03 21:50:47 +00:00
Rufus Pollock
4eb68fbf0f [build][xs]: build latest. 2012-12-22 19:56:37 +00:00
Rufus Pollock
64af7b2150 Merge branch 'master' of github.com:okfn/recline 2012-12-22 19:54:48 +00:00
Rufus Pollock
3610d95e74 [#291,bugfix][s]: memory backend transform function now works even when records do not have id - fixes #291. 
* Also simplified (and made more efficient) by removing dependency on (not very useful) recline.Data.Transform.mapDocs function
* As documented in #291 issue was that an id was required in the docs
 2012-12-22 19:51:03 +00:00
Rufus Pollock
5691466cda Merge pull request #288 from okfn/284-replacement-json 
[284] Add json2.js which defines JSON for older browsers (IE7).
 2012-12-10 08:52:11 -08:00
Rufus Pollock
498001b4d9 Merge pull request #289 from okfn/264-multiple-filters 
[#264] Fix for #264 from ckan-updates branch.
 2012-12-10 08:51:30 -08:00
John Glover
9bfbce776b [#264] Fix for #264 from ckan-updates branch. 
Uses _.defaults rather than performing an explicit
deep copy.
 2012-12-10 16:57:44 +01:00
John Glover
c6a8a33d32 [284] Add json2.js which defines JSON for older browsers (IE7). Fixes filters and 6 test failures with IE7. 2012-12-10 15:20:02 +01:00
Rufus Pollock
7f35cffe3c [build][xs]: build from latest code. 2012-12-09 19:05:27 +00:00
Rufus Pollock
8b2a076387 [#187,make][xs]: minify build command. 2012-12-09 19:04:17 +00:00
Rufus Pollock
5a322e2c7c [#286,bugfix]: fix for case where fields array has nulls in it. 
If passed fields = [ null, ..., ...] or [ ... , null, ...] we fail in Dataset._normalizeRecordsAndFields method because:

1. If null is first element we do not do field generation correctly because typeof(null) is object - ede211646a/src/model.js (L108)
2.  We call toString on field names which fails for null ede211646a/src/model.js (L113)
 2012-12-09 18:58:52 +00:00
Rufus Pollock
f093fcebfe Merge pull request #263 from Integral/master 
[backend/couchdb,#229]: Fixes for CouchDB sorting and filtering from @integral.
 2012-12-01 06:40:01 -08:00
Rufus Pollock
b2cd87cec4 Revert "Merge pull request #275 from citizen-cyberscience-centre/master". 
This reverts commit b900581605e7612bd896e4f1bec7837784a1ebbc, reversing
changes made to 3226d8b11b1d41bdafcdab6f9ea424d3f553cbe3.
 2012-11-19 12:24:06 +00:00
Rufus Pollock
b900581605 Merge pull request #275 from citizen-cyberscience-centre/master 
[view/timeline,bugfix][xs]: Fixing Date parsing for TimeLine in Safari from @teleyinex.
 2012-11-13 08:35:17 -08:00
Daniel Lombraña González
7af166ed85 Create a Date using the Date type. 
This commit fixes an error in Safari that was not working. Moment.JS was not
converting correctly a string, while with thix fix works. More info here:
http://stackoverflow.com/questions/2587345/javascript-date-parse
 2012-11-13 16:00:15 +01:00
Rufus Pollock
3226d8b11b [demos/multiview][xs]: set number types on x,y,z fields. 2012-11-13 12:07:23 +00:00
Rufus Pollock
53a417abde [bugfix,backend/memory][xs]: map 'number' type correctly for filter application. 2012-11-13 12:06:47 +00:00
Rufus Pollock
b89e6a8a65 Merge pull request #272 from demiurg/master 
[view/graph][s]: Ability to extend graph options with general options - thx to @demiurg.
 2012-11-10 00:44:05 -08:00
User
94c56e1d10 Added test case for 'graphOptions' 2012-11-09 12:55:54 -05:00
Rufus Pollock
ede211646a [#264,bugfix,filtereditor][s]: track down and fix bug with addFilter (and hence filtereditor) - fixes #264. 
* Quite a subtle bug due to the fact that we were not doing a deep copy on the filter template in addFilter
 2012-11-08 20:35:03 +00:00
User
c74c329c21 Added a line to document graphOptions, changed attribute access method 2012-11-08 13:02:49 -05:00
User
b501b7123c Added ability to extend graph options with state parameter 'graphOptions' 2012-11-08 12:31:05 -05:00
Rufus Pollock
d479603ca7 [README][xs]: better instructions for contributing. 2012-11-08 10:46:15 +00:00
Rufus Pollock
3362083db6 [#183,demos/search][s]: improve commenting in search demo js and produced docco'd version. 2012-11-02 22:26:45 +04:00
Rufus Pollock
da1da60942 [docs][xs]: latest version of docco.css. 2012-11-02 22:26:45 +04:00
Rufus Pollock
4e8a8eb340 [#183,demos/search][xs]: rename js file. 2012-11-02 22:26:45 +04:00
Frederick Ros
24ee9fa019 Update the grid when a record is changed 
Fixes #255
 2012-11-02 22:26:45 +04:00
Frederick Ros
c7ff853acb Fixed typo in comments 2012-11-02 22:26:45 +04:00
Rufus Pollock
2799fe5acd [#183,demos/search][s]: improve commenting in search demo js and produced docco'd version. 2012-11-02 09:58:42 +00:00
Rufus Pollock
a441c939d0 [docs][xs]: latest version of docco.css. 2012-11-02 09:58:27 +00:00
Rufus Pollock
c3c4f04cc9 [#183,demos/search][xs]: rename js file. 2012-11-02 09:36:25 +00:00
Rufus Pollock
98e346b270 Merge pull request #261 from sleeper/fix_typo 
[view/slickgrid][xs]: Fixed typo in comments.
 2012-10-29 02:18:09 -07:00
Rufus Pollock
07bd5a44e7 Merge pull request #260 from sleeper/slickgrid_data_change 
[#255,views/slickgrid][s]: Update the grid when a record is changed - thx to @sleeper.
 2012-10-29 02:17:24 -07:00
Daniel Beilinson
7a12003a35 undfinded _id for couchDB, 33 symbols ID generator 2012-10-29 01:43:52 +04:00
Daniel Beilinson
7e471407a3 _createDocument fixed, randomId function added 2012-10-24 23:13:28 +04:00
Frederick Ros
0aa85c9560 Update the grid when a record is changed 
Fixes #255
 2012-10-24 00:01:08 +02:00
Daniel Beilinson
b3e68c152d couchDB broken sort and filter fixed 2012-10-23 23:06:52 +04:00
Rufus Pollock
2684bfed0e [#223,tutorial/maps][m]: start of a in-depth map tutorial with instructions on customizing infoboxes and markers. 
* Also add to tutorials.html (and refactor that page a bit)
 2012-10-23 00:27:25 +01:00