spenceralger
|
6c4f00ced8
|
Merge pull request #420 from spenceralger/zero-filled-ts
Restored the "required_times" functionality
|
2013-08-26 16:51:11 -07:00 |
|
Spencer Alger
|
7252800c53
|
Restored the "required_times" functionality so that stacking will work as expected.
|
2013-08-26 16:25:20 -07:00 |
|
Rashid Khan
|
0af2549712
|
Merge pull request #418 from rashidkpc/fix
Bringing the rest of spencers changes in
|
2013-08-26 15:36:26 -07:00 |
|
Rashid Khan
|
196d39e462
|
squashing merge
|
2013-08-26 15:32:53 -07:00 |
|
Rashid Khan
|
1222b49827
|
Merge pull request #414 from rashidkpc/master
Zerofill tweaks
|
2013-08-26 10:25:38 -07:00 |
|
Rashid Khan
|
85fd491b13
|
Fixed subsecond intervals in interval_to_seconds
|
2013-08-26 10:21:28 -07:00 |
|
Rashid Khan
|
99c5cb5ef5
|
Merge remote-tracking branch 'spencer/zero-filled-ts' into spencer-zero
|
2013-08-23 11:22:36 -07:00 |
|
Spencer Alger
|
a01dd003fa
|
Rebased to master to include latest changes
updated the getFlotPairs() function to only check before and after a value, adding only enough zeros to maintain line graphs.
|
2013-08-23 10:04:44 -07:00 |
|
Rashid Khan
|
56351038bd
|
Merge pull request #405 from rashidkpc/master
Adding grunt step to CONTRIBUTING.md
|
2013-08-23 08:54:07 -07:00 |
|
Rashid Khan
|
b61ce057a3
|
Adding grunt step to CONTRIBUTING.md
|
2013-08-23 08:53:27 -07:00 |
|
Rashid Khan
|
d45690af41
|
Merge pull request #404 from rashidkpc/master
Fixing grunt build and 0 height bars
|
2013-08-23 08:13:46 -07:00 |
|
Rashid Khan
|
ada84c40f5
|
fixed 0 height bars
|
2013-08-23 07:40:09 -07:00 |
|
Rashid Khan
|
79ed63dfee
|
Brought code back into line with existing jshint
|
2013-08-23 07:37:33 -07:00 |
|
Rashid Khan
|
9b563d1dfa
|
spacing
|
2013-08-22 15:47:31 -07:00 |
|
Rashid Khan
|
a058b8c7da
|
Merge remote-tracking branch 'upstream/master'
|
2013-08-22 15:46:41 -07:00 |
|
Rashid Khan
|
aa4b3ef047
|
More error handling, changed es loading to use get instead of search
|
2013-08-22 15:46:38 -07:00 |
|
spenceralger
|
2cff988ba0
|
Merge pull request #400 from spenceralger/master
Creates zero-filled data for the histogram.
|
2013-08-22 15:04:09 -07:00 |
|
Spencer Alger
|
69ab6bbd12
|
Merge branch 'zero-filled-ts'
Conflicts:
js/services.js
|
2013-08-22 14:59:59 -07:00 |
|
Spencer Alger
|
c8638e0581
|
moved the timeSeries service into the histogram module.
|
2013-08-22 14:58:10 -07:00 |
|
Spencer Alger
|
13d3da048d
|
created timeSeries service with a ZeroFilled class to manage the rows for the histogram
|
2013-08-22 13:53:31 -07:00 |
|
Spencer Alger
|
8a9661bf26
|
Added a time series service, which provides a ZeroFilled class, setup the histogram to use it so that zero measurements will be displayed
|
2013-08-22 13:51:15 -07:00 |
|
Rashid Khan
|
3b9bc6bc52
|
Merge pull request #396 from rashidkpc/master
Improved error handling via alertSrv service
|
2013-08-21 16:03:44 -07:00 |
|
Rashid Khan
|
f4f8577d91
|
Improved error handling via alertSrv service
|
2013-08-21 15:56:20 -07:00 |
|
Rashid Khan
|
9056287998
|
Merge pull request #394 from rashidkpc/master
Add panel options, clean up fields list
|
2013-08-21 09:53:57 -07:00 |
|
Rashid Khan
|
275221f3e6
|
Adding panel should have all options
|
2013-08-21 09:53:12 -07:00 |
|
Rashid Khan
|
4255f4588d
|
Removed useless placement, added pointer class to field list
|
2013-08-20 16:10:09 -07:00 |
|
Rashid Khan
|
a1df0fc15f
|
Merge pull request #393 from rashidkpc/master
Fix for count positioning in firefox
|
2013-08-20 15:48:16 -07:00 |
|
Rashid Khan
|
adf5ed8c99
|
Fix for count positioning in firefox
|
2013-08-20 15:47:13 -07:00 |
|
Rashid Khan
|
9b5f8f0bde
|
Merge pull request #391 from rashidkpc/master
added charts to micropanel in table
|
2013-08-20 07:50:01 -07:00 |
|
Rashid Khan
|
eba4214b97
|
added charts to micropanel in table
|
2013-08-20 07:24:04 -07:00 |
|
Rashid Khan
|
0827f2ed74
|
Merge pull request #381 from rashidkpc/master
More paging improvements, moved spy settings to general
|
2013-08-16 15:19:37 -07:00 |
|
Rashid Khan
|
2e74275b42
|
More paging improvements, moved spy settings to general
|
2013-08-16 15:17:57 -07:00 |
|
Rashid Khan
|
736a1aea08
|
Merge pull request #380 from rashidkpc/master
New panel tabs, upgraded momentjs, added _mapping to proxy samples
|
2013-08-16 12:46:45 -07:00 |
|
Rashid Khan
|
02f2ff29f1
|
Added _mapping proxy settings
|
2013-08-16 12:45:38 -07:00 |
|
Rashid Khan
|
93b48a7d29
|
added ability to add new tabs to editor panels
|
2013-08-16 12:45:22 -07:00 |
|
Rashid Khan
|
5aaa9d5876
|
Upgraded moment.js, added paneladd.html
|
2013-08-16 12:44:31 -07:00 |
|
Rashid Khan
|
03057e54d9
|
Merge pull request #373 from rashidkpc/master
Fixed bug in sorting
|
2013-08-14 16:30:22 -07:00 |
|
Rashid Khan
|
5fa49c6228
|
Fixed bug in sorting
|
2013-08-14 16:29:22 -07:00 |
|
Rashid Khan
|
0e38828af6
|
Merge pull request #372 from rashidkpc/master
Fields from mapping, fixed sorting on different timezones
|
2013-08-14 13:43:46 -07:00 |
|
Rashid Khan
|
39fa135fa4
|
Merge remote-tracking branch 'upstream/master'
|
2013-08-14 13:42:02 -07:00 |
|
Rashid Khan
|
a8c9af6583
|
Merge pull request #371 from rashidkpc/upstream
Update to m3
|
2013-08-14 13:35:03 -07:00 |
|
Rashid Khan
|
28445d5f7e
|
Update to m3
|
2013-08-14 13:34:18 -07:00 |
|
Rashid Khan
|
9d66d77d4f
|
Retrieve fields from mapping when index changes. Use sort[] response to sort table fields
|
2013-08-14 13:31:28 -07:00 |
|
Rashid Khan
|
e7203d40af
|
Update to m3
|
2013-08-14 09:48:11 -07:00 |
|
Rashid Khan
|
e57aba10da
|
Merge pull request #359 from rashidkpc/master
Fix for utc correction bug. Closes #337
|
2013-08-13 10:49:39 -07:00 |
|
Rashid Khan
|
d1b430faf5
|
Fix for utc correction bug. Closes #337
|
2013-08-13 10:48:49 -07:00 |
|
Rashid Khan
|
c92029aad4
|
Merge pull request #349 from rashidkpc/master
Closes #345
|
2013-08-09 11:37:22 -07:00 |
|
Rashid Khan
|
0f14d54584
|
Closes #345
|
2013-08-09 11:36:52 -07:00 |
|
Rashid Khan
|
bd7c363346
|
Merge pull request #338 from rashidkpc/master
table truncate setting, fix for histogram, fix for style 404
|
2013-08-07 14:39:27 -07:00 |
|
Rashid Khan
|
514ef4b6bd
|
added truncation configuration to table panel
|
2013-08-07 13:20:20 -07:00 |
|