Merge branch 'master' of github.com:OSBI/saiku

OSBI · Aug 12, 2013 · 670f52a · 670f52a · enriquezrene · Aug 16, 2013
2 parents f0cabb1 + d043d25
commit 670f52a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/saiku-core/saiku-service/src/main/java/org/saiku/olap/query/MdxQuery.java b/saiku-core/saiku-service/src/main/java/org/saiku/olap/query/MdxQuery.java
@@ -104,7 +104,7 @@ public void setProperties(Properties props) {
 	}
 
 	public Properties getProperties() {
-		Properties props = new Properties(this.properties);
+		Properties props = this.properties;
 		props.put(QueryProperties.KEY_IS_DRILLTHROUGH, isDrillThroughEnabled().toString());
 		props.put("org.saiku.connection.scenario", Boolean.toString(false));
 		try {

diff --git a/saiku-ui b/saiku-ui
+316 −151		css/saiku/src/styles.css
+ −		images/chart/100bar.png
+ −		images/chart/area.png
+ −		images/chart/area2.png
+ −		images/chart/bar.png
+ −		images/chart/dot.png
+ −		images/chart/gray/100bar.png
+ −		images/chart/gray/area.png
+ −		images/chart/gray/area2.png
+ −		images/chart/gray/bar.png
+ −		images/chart/gray/dot.png
+ −		images/chart/gray/heat.png
+ −		images/chart/gray/line.png
+ −		images/chart/gray/multiple.png
+ −		images/chart/gray/pie.png
+ −		images/chart/gray/stackedbar.png
+ −		images/chart/gray/trendbars.png
+ −		images/chart/gray/trendline.png
+ −		images/chart/gray/waterfall.png
+ −		images/chart/heat.png
+ −		images/chart/line.png
+ −		images/chart/multiple.png
+ −		images/chart/pie.png
+ −		images/chart/stackedbar.png
+ −		images/chart/trendbars.png
+ −		images/chart/trendline.png
+ −		images/chart/waterfall.png
+ −		images/src/cancel3.png
+ −		images/src/meteorite_free.png
+ −		images/src/page_white.png
+68 −46		index.html
+1 −1		js/ga.js
+5 −5		js/saiku/Saiku.js
+21 −1		js/saiku/Settings.js
+5 −3		js/saiku/models/Properties.js
+34 −29		js/saiku/models/Query.js
+1 −1		js/saiku/models/QueryAction.js
+6 −2		js/saiku/models/Repository.js
+9 −0		js/saiku/models/Result.js
+1 −1		js/saiku/models/SessionWorkspace.js
+3 −1		js/saiku/plugins/BIServer/plugin.js
+105 −108		js/saiku/plugins/CCC_Chart/def.js
+3 −2		js/saiku/plugins/CCC_Chart/jquery.tipsy.js
+251 −43		js/saiku/plugins/CCC_Chart/plugin.js
+14 −36		js/saiku/plugins/CCC_Chart/protovis-msie.js
+1,066 −821		js/saiku/plugins/CCC_Chart/protovis.js
+728 −761		js/saiku/plugins/CCC_Chart/pvc-r2.0.js
+14 −14		js/saiku/plugins/I18n/plugin.js
+98 −0		js/saiku/plugins/I18n/po/cs.json
+67 −25		js/saiku/plugins/I18n/po/de.json
+74 −59		js/saiku/plugins/I18n/po/fr.json
+40 −2		js/saiku/plugins/I18n/po/hr.json
+95 −69		js/saiku/plugins/I18n/po/hu.json
+102 −31		js/saiku/plugins/I18n/po/ru.json
+77 −35		js/saiku/plugins/Statistics/plugin.js
+8 −1		js/saiku/views/AboutModal.js
+1 −1		js/saiku/views/AddFolderModal.js
+1 −1		js/saiku/views/CustomFilterModal.js
+41 −3		js/saiku/views/DimensionList.js
+9 −2		js/saiku/views/DrillthroughModal.js
+1 −1		js/saiku/views/FilterModal.js
+5 −1		js/saiku/views/MDXModal.js
+2 −0		js/saiku/views/Modal.js
+45 −4		js/saiku/views/OpenDialog.js
+68 −7		js/saiku/views/OpenQuery.js
+35 −1		js/saiku/views/PermissionsModal.js
+58 −23		js/saiku/views/QueryToolbar.js
+83 −11		js/saiku/views/SaveQuery.js
+44 −23		js/saiku/views/SelectionsModal.js
+62 −6		js/saiku/views/Tab.js
+23 −80		js/saiku/views/Table.js
+203 −34		js/saiku/views/Workspace.js
+90 −29		js/saiku/views/WorkspaceDropZone.js
+106 −32		js/saiku/views/WorkspaceToolbar.js