822ef96a7e
Merge remote-tracking branch 'upstream/master'
2013-09-17 14:03:21 -07:00
db088f5740
Added JSON and Raw views of events for #507 and #461
2013-09-17 14:01:42 -07:00
1afec73fe0
Merge pull request #468 from spenceralger/numeric-sort
...
Fixes for #466
2013-09-17 11:09:40 -07:00
6e728480bb
Updated the changes to work with the new repo structure.
2013-09-17 11:04:23 -07:00
8a142d9173
Fixed duplicate label, added input for panel.size. Closes #481
2013-09-17 10:48:57 -07:00
de22a1ad34
Cache bust json files
2013-09-17 09:56:12 -07:00
38b5c19990
Added 'add' button on row editor panel list
2013-09-17 09:41:24 -07:00
51a895cf47
Merge remote-tracking branch 'bobrik/dash-loader-filter-fix' into pulls
2013-09-17 09:27:24 -07:00
e23d733805
Merge remote-tracking branch 'bobrik/color-loading-fix' into pulls
2013-09-17 09:27:17 -07:00
c088783dc9
Added toggle between single and grouped analysis to micropanel
2013-09-16 15:09:25 -07:00
63fbbc9c21
Added seperate grunt task for LESS default build
2013-09-16 13:21:29 -07:00
a59f9e617f
Added filesaver module to dashboard service. Closes #503
2013-09-16 12:44:21 -07:00
efaff8405d
Merge pull request #502 from spenceralger/fix-js-dashboards
...
Fixed dashboard scripts
2013-09-16 11:11:20 -07:00
ff50e6e753
Fixed the loading of the dashboard scripts, feeding them the needed args and fixing the path that they are fetch from.
2013-09-16 11:09:29 -07:00
25344632a3
Fixed map path
2013-09-16 08:45:03 -07:00
f2d87ad5a4
Merge branch 'master' into build-tweaks
...
Conflicts:
dist/app/components/require.config.js
src/app/components/require.config.js
2013-09-15 12:45:27 -07:00
7b28483102
Fixed path to extend-jquery.js in require config
2013-09-15 07:12:42 -07:00
7f0bcd7761
Dashboard loader filter applied after dropdown show
2013-09-15 12:47:12 +04:00
fc069a0458
Fixed default color on dashboard load
2013-09-15 12:43:25 +04:00
a0bd73f27c
Previous fix did not work when jQuery was inlined into app.js because RequireJS was under the impression that it had already init-ed jQuery and didn't call the init function. This new strategy just allows jQuery to be jQuery and has app.js include the extensions (components/extend-jquery.js) before the app boots.
2013-09-14 17:59:09 -07:00
2a1c67ffdb
Somehow missed that tooltips were broken, caused by jquery defining itself using the 'jquery' name, which prevented our custom module from being included and extending jquery.
2013-09-14 17:21:25 -07:00
ab93bcecb2
Added a cache busting config option to RequireJS that will add the latest commit sha to urls (only in dist build).
2013-09-13 19:14:14 -07:00
8f67381c79
Merge pull request #494 from spenceralger/build-tweaks
...
Build tweaks
2013-09-13 16:29:51 -07:00
6c07338782
- Moved the config.js file into the root of the src and dist.
...
- prevented the config file from being minified.
- offloaded the js minification to a dedicated uglify task, which accepts more options than the require-js wrapper does.
- Addded the banner to the top of the minified files.
2013-09-13 16:02:08 -07:00
04caf67a0d
Merge remote-tracking branch 'upstream/master'
2013-09-13 14:32:30 -07:00
5d9cb85ccf
Merged Pull Request #484
2013-09-13 13:52:13 -07:00
Rashid Khan
spenceralger
Spencer Alger
bobrik