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

522 Commits

Author SHA1 Message Date
John Glover
74d94c51d6 Merge remote-tracking branch 'origin/master' into 310-hide-filters-fields 2013-02-11 15:31:47 +01:00
John Glover
bb28ef2347 [#309] Small JS fix for IE7. 
Extra comma in object literal removed.
 2013-02-11 14:27:22 +01:00
John Glover
bc3ade4c23 [#309] Fix rendering of fields widget in IE7. 2013-02-11 12:10:57 +01:00
John Glover
fa086053fb Merge master into 309-expand-content-when-sidebar-empty 2013-02-11 10:00:41 +01:00
Rufus Pollock
6f82c4c5cc [#314,be/solr][s]: remove solr backend from core as in separate repo [1]. 
[1]: https://github.com/Recline/backend.solr
 2013-02-10 17:05:30 +00:00
Rufus Pollock
b6e179e3e7 [#287,view/flot][s]: s/recline-graph/recline-flot/g. 2013-02-09 18:29:44 +00:00
Rufus Pollock
d369c9d958 [bugfix,view/flot][xs]: do not subtract 240px from rhs of flot graph (fix appears to be no longer needed and is breaking in most cases ...). 2013-02-09 18:29:02 +00:00
Rufus Pollock
242bcc7a14 [#287,view/graph][s]: move current view.graph.js to view.flotr2.js and setup recline.View.Graph to point to recline.View.Flot. 2013-02-09 16:18:37 +00:00
Rufus Pollock
723d128d13 [#313,backend][s]: use jquery deferred if available - fixes #313. 2013-02-08 13:31:03 +00:00
Rufus Pollock
3e27edd9c4 [backend/csv][xs]: set my.__type__ to csv.` 2013-02-08 13:20:53 +00:00
Rufus Pollock
bd98d15b61 [#313,backend/memory][xs]: use jquery deferred if we can. 2013-02-08 13:20:38 +00:00
Rufus Pollock
68215a0fa5 [#313,model][s]: use jquery promise api if available. 2013-02-08 13:05:00 +00:00
Rufus Pollock
5a27e1c08d Merge pull request #308 from okfn/308-filter-update-ux 
[bugfix][s]: Return to first page of records after applying filters.
 2013-02-08 03:05:32 -08:00
John Glover
4f2e58b514 Add horizontal bar chart back to view.flot.js 2013-02-06 17:51:59 +01:00
John Glover
67b684d58f Hide filters and fields by default 2013-02-06 16:37:59 +01:00
John Glover
f0005bed6c Hide the sidebar if it's empty. 
When updating the view check to see if the sidebar
contains any visible children elements. If not,
hide it.
 2013-02-06 12:09:34 +01:00
John Glover
2d5291b201 Rename x-axis and y-axis in view.graph.js. 
Changed to Axis 1 and Axis 2 to avoid confusion
in bar graph (when axes are inverted).
 2013-02-05 17:32:06 +01:00
John Glover
6ceff22b15 Return to first page of records after filter update. 
Also add missing radix parameter to parseInt call.
 2013-02-05 16:37:02 +01:00
Rufus Pollock
23d056d1aa Merge pull request #305 from modilabs/cap_pager_params 
[widget/paper][s]: Cap pager input params to valid range(s) - thx to @larryweya.
 2013-01-15 03:21:01 -08:00
Larry Weya
11630c46ff Cap pager input params to valid range(s) 2013-01-15 13:51:25 +03: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
Stefan Wehrmeyer
2c79d00f09 Remove weird date parsing hack to fix tests 2013-01-07 10:33:29 +01: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
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
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
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
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
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
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
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
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
98e346b270 Merge pull request #261 from sleeper/fix_typo 
[view/slickgrid][xs]: Fixed typo in comments.
 2012-10-29 02:18:09 -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
df935091fd [#244,view/map][m]: support for customizing rendering of map features in all ways supported by Leaflet - fixes #244. 
* This automatically provides support for things like custom markers via
  pointToLayer etc

* Also a significant bugfix for a bug that surfaced when using different marker
  (like the CircleMarker) - and which took ~30m to track down. Bug was that the
  call to zoom (or, more specifically, call to getBounds) occurred before
  features were added to the map and getBounds for some objects (such as
  circles) requires map to exit (so you can do a projection!)
 2012-10-23 00:19:59 +01:00
Rufus Pollock
80626485ce [#223,map][xs]: small improvements to in file docs for Map view. 2012-10-22 21:39:18 +01:00
Frederick Ros
abb23cc5e3 Fixed typo in comments 2012-10-22 19:07:57 +02:00
Rufus Pollock
97dcf08780 [backend/gdocs][s]: minor improvement to support handling spreadsheet urls where #gid=xxx is missing. 2012-10-20 01:57:13 +01:00
Rufus Pollock
4aeabbe3a1 Merge branch '120-solr-backend' 2012-10-19 09:55:18 +01:00
Rufus Pollock
bc1c84944a Merge branch 'master' of github.com:okfn/recline 2012-10-19 08:00:51 +01:00
Rufus Pollock
f6a3395b40 [#258,model][xs]: tiny bugfix for cases where fields in raw state contain a non-string - fixes #258. 2012-10-19 07:57:47 +01:00