Commit89727e5

authored

Merge pull request#245 from Resgrid/develop

CU-868f7n1u3 Fixing bugs and removing dropper for package.

2 parentsd0d01c0 +c40f6dd commit89727e5Copy full SHA for 89727e5

File tree

-2

lines changed

Web/Resgrid.Web
- Startup.cs
- wwwroot/js/app/common/analytics
  - resgrid.common.analytics.js

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,8 @@ public void ConfigureServices(IServiceCollection services)`
`378`	`378`	`"lib/fullcalendar/dist/fullcalendar.min.js","lib/leaflet/dist/leaflet.js","lib/bstreeview/dist/js/bstreeview.min.js",`
`379`	`379`	`"lib/selectize/selectize/dist/js/standalone/selectize.min.js","lib/claviska/jquery-minicolors/jquery.minicolors.min.js","lib/algolia/autocomplete-js/dist/umd/index.production.js",`
`380`	`380`	`"lib/bootstrap-select/dist/js/bootstrap-select.js","clib/data-tables/datatables.js","lib/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js",`
`381`		`-"lib/deltablot/dropzone/dist/dropzone.js","js/site.min.js");`
	`381`	`+/"lib/deltablot/dropzone/dist/dropzone.js",/`
	`382`	`+"js/site.min.js");`
`382`	`383`	`});`
`383`	`384`
`384`	`385`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ var resgrid;`
`22`	`22`	`"custom":{`
`23`	`23`	`"createdOn":newDate(createdOn*1000),`
`24`	`24`	`"departmentId":departmentId`
`25`		`-}]);`
	`25`	`+}`
	`26`	`+}]);`
`26`	`27`	`Countly.q.push(['track_sessions']);`
`27`	`28`	`Countly.q.push(['track_pageview']);`
`28`	`29`	`}`

Comments

(0)