Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DO NOT MERGE -- Sync with TWC master-keystone? #9

Open
wants to merge 1,514 commits into
base: grafana3
Choose a base branch
from
Open

DO NOT MERGE -- Sync with TWC master-keystone? #9

wants to merge 1,514 commits into from

Conversation

jobrs
Copy link

@jobrs jobrs commented Oct 6, 2016

should we?

torkelo and others added 30 commits November 8, 2016 20:57
@torkelo
docs(): fix title
20d789c
@torkelo
change(graph): change default line width from 2 to 1
652eb05
@bergquist
feat(influxdb): add alias to query
24a3a10
@bergquist
feat(influxdb): add support for serie alias replacement
c897d39 
ref grafana#6510
@bergquist
feat(influxdb): cleanup influxdb query editor options
9727151
@torkelo
ux(tv mode): added 1 second delay animation
2164bbd
@torkelo
docs(): minor docs change
33664b0
@torkelo
Merge branch 'issue-2912' of https://github.com/benrubson/grafana int…
485980e 
…o benrubson-issue-2912
@torkelo
panel(graph): stacking can now handle null values, grafana#6287
a9c6bdc
@torkelo
changelog(): updated with entry for grafana#2912 and grafana#6287, cl…
bfed566 
…oses grafana#2912
@torkelo
updated version to beta1
d1bedfc
@bergquist
feat(influxdb): backend support for alias by segment
f0a0e64 
ref grafana#6510
@torkelo
fix(testdata): fixed query in default grafana data source
1d4cace
@torkelo
docs(): updated install links with beta links as well
fff2608
@bergquist
feat(influxdb): disable debug logging in appmode
82e1d3f
@bergquist
fix(shortcuts): CTRL on windows or linux
6a81389
@bergquist
fix(influxdb): fixes possible nil pointer
ef08a24 
closes grafana#6531
@torkelo
Add some comments about some previous modifications (grafana#6533)
2443326
@torkelo
Correct timeStep in case of missing values (grafana#6526)
6495ba1 
* Correct timeStep in case of missing values

* Comment
@torkelo
fix(graph): fixed issue with bar width when used in series override, f…
71eb0f3 
…ixes grafana#6528
@bergquist
fix(influxdb): add default operator
4f3c8c6 
ref grafana#6523
@bergquist
tech(build): switch to golang 1.7.3
70b9ba2 
tls/cipher fixes
https://github.com/golang/go/issues?q=milestone%3AGo1.7.3
@torkelo
fix(ui/browser): fixed border not showing in safari, fixes grafana#6530
316d754
@torkelo
fix(graph): fixed issue log base scale on right y axis, option was no…
6767bdd 
…t applied at all, also issue with log scale and max value calculation fixed, fixes grafana#6534
@bergquist
Merge branch 'master' into influxdb_alias_seriename
ecba23e
@bergquist
Merge pull request grafana#6515 from grafana/influxdb_alias_seriename
a825e63 
[Influxdb] Backend support for seriename alias
@torkelo
docs(): minor docs fix
9f7d086
@bergquist
fix(influxdb): fixes broken raw query usage
a948dfe
@bergquist
tech(influxdb): refactor query builder
f924b24 
trying to reduce the amounts of moving parts for influxdb
@bergquist
feat(alertlist): make it possible to filter on alerts from current da…
abb8f33 
…shboard
bergquist and others added 30 commits December 2, 2016 21:10
@bergquist
update latest.json to 4.0.1
3688898
@bergquist
fix(influxdb): align tsdb.influxdb with dataproxy
f70d7ff 
ref grafana#6784
@bergquist
change to golang 1.7.4
96cd130
@bergquist
feat(webhook): adds alert rule message to webhook
9dd6cf4 
close grafana#6807
@bergquist
tech(): replace spaces to handle input more graceful
c9b7f86
@bergquist
feat(alerting): calculate avg of valid points
6c9cf87
@bergquist
Merge pull request grafana#6795 from hvnsweeting/patch-1
fbf2113 
Use space to separate multiple modes
@bergquist
docs(readme): remove link to old CLA page
b88478a
@bergquist
feat(webhook): adds alert rule message to webhook
0403f53 
close grafana#6807
@bergquist
changelog: add note about closing grafana#6807
ea82998
@bergquist
changelog: add bugfix header
1b68116
@bergquist
webhook: adds json content-type
87dbdb8 
closes grafana#6822
@bergquist
changelog: adds note about closing grafana#6822
4a2a935
@bergquist
webhook: adds json content-type
b81e97c 
closes grafana#6822
@torkelo
Use correct domain in render.js (grafana#6813)
48a14cb 
Phantomjs is always rendering login page because domain is not considered. According to http://phantomjs.org/api/webpage/method/add-cookie.html a correct domain must be passed. Probably this change is now necessary due to grafana#6660
@torkelo
fix(rendering): minor fix for server side rendering when using non de…
ab07667 
…fault http addr setting and non default domain setting, grafana#6813
@torkelo
Merge branch 'v4.0.x'
d1feaaf
@torkelo
Merge branch 'master' of github.com:grafana/grafana
e1d5290
@torkelo
fix(influxdb): Fix for Ad-Hoc Filters variable & changing dashboards, f…
a9c0f66 
…ixes grafana#6821
@torkelo
Merge branch 'v4.0.x'
c5ff1e4
@torkelo
fix(rendering): fixed server side rendering issue when sertting enfor…
cc46b81 
…ce_domain to true, fixes grafana#6769
@torkelo
Merge branch 'v4.0.x'
1f50c6d
@torkelo
updated changelog
80f7a6a
@torkelo
feat(playlist): added support for kiosk mode & minor polish/fix, closes
890e5ce 
grafana#6727
@torkelo
Merge branch 'v4.0.x'
5002225
@torkelo
updated changelog
37c1a49
@jsoriano @torkelo
Add 'Last 2 days' option to quick ranges (grafana#6758)
f2d5829
@torkelo
change(Timepicker): removed last 90 days to make room for Last 2 days, …
aea3093 
…grafana#6758
@torkelo
cleanup(): removed unused (old) migrate stuff
4c406de
Merge remote-tracking branch 'upstream/master' into master-keystone
f7dfc6a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.