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

1063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Glover
9f73c99bbd Merge pull request #310 from okfn/310-hide-filters-fields 
Hide filters and fields by default
 2013-02-11 06:33:32 -08:00
John Glover
74d94c51d6 Merge remote-tracking branch 'origin/master' into 310-hide-filters-fields 2013-02-11 15:31:47 +01:00
John Glover
f9439f21d9 Merge pull request #309 from okfn/309-expand-content-when-sidebar-empty 
Expand main content view if sidebar is empty
 2013-02-11 06:26:38 -08: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
c3f18ab1ed [site/theme][xs]: add github buttons to navbar in place of simple link. 2013-02-10 18:26:06 +00: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
ba7e747b97 [build][xs]: build. 2013-02-09 18:30:11 +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
7c54e05141 [build][xs]: regular build. 2013-02-09 18:15:13 +00:00
Rufus Pollock
67e9f61d85 [docs][xs]: download referenced correct location for flot charts. 2013-02-09 16:22:25 +00:00
Rufus Pollock
e77d6c4d36 [site][s]: some minor tweaks to css and fix a typo in map tutorial. 2013-02-09 16:20:59 +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
72bcedf419 [build][s]: build again. 2013-02-08 13:31:49 +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
8c6c2d7c67 [build][s]: regular build of js and css. 2013-02-08 13:05:56 +00:00
Rufus Pollock
68215a0fa5 [#313,model][s]: use jquery promise api if available. 2013-02-08 13:05:00 +00:00
Rufus Pollock
89ad7c1686 Merge branch 'master' of github.com:okfn/recline 2013-02-08 11:05:39 +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
Rufus Pollock
c3c2fef95c Merge branch 'master' of github.com:okfn/recline 2013-02-08 11:02:20 +00:00
Rufus Pollock
1c1df12e5a [#312,README][s]: note about using jekyll to build docs or demos if working on them locally. 2013-02-08 11:01:44 +00:00
John Glover
8a7f7650ea Merge pull request #311 from okfn/311-update-view-flot 
Make view.flot.js consistent with view.graph.js
 2013-02-06 08:59:20 -08:00
John Glover
4f2e58b514 Add horizontal bar chart back to view.flot.js 2013-02-06 17:51:59 +01:00
John Glover
850fe9a41c Merge pull request #280 from okfn/280-graph-axis-labels 
Rename "Group" and "Series" labels in graph UI to "X-Axis" and "Y-Axis"
 2013-02-06 07:43:22 -08: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
d1a5c0803d Merge pull request #307 from amercader/master 
[README][xs]: correct name of @amercader in contributors in the README.
 2013-01-24 01:43:30 -08:00
amercader
2a151461ab [README][xs] Micro tweak 2013-01-23 22:43:27 +00:00
Rufus Pollock
722b7dcbf8 Merge branch 'master' of github.com:okfn/recline 2013-01-23 20:31:20 +00:00
Rufus Pollock
015d926c03 [#299,README[s]: list contributors in README - fixes #299. 2013-01-23 20:30:25 +00: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
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