Mitsuhiro Tanda
caccacf52b
don't calculate cumulative value if series overrides stack to false
2015-08-13 13:40:16 +09:00
Torkel Ödegaard
5aee981590
Merge branch 'master' of https://github.com/mattttt/grafana
...
Conflicts:
docs/sources/installation/debian.md
docs/sources/installation/ldap.md
2015-08-12 16:30:48 +02:00
Torkel Ödegaard
e6d09b3266
fix(db): remove stars and tags when removing user or dashboard, fixes #2016
2015-08-12 09:23:46 +02:00
Torkel Ödegaard
8fcaa4997d
feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457
2015-08-12 08:59:39 +02:00
Torkel Ödegaard
7370af9a82
Merge pull request #2492 from agilgur5/master
...
docs(ldap): Clarify LDAP features and sample config
2015-08-12 08:20:00 +02:00
Anton Gilgur
e4baef94bc
docs(ldap): Clarify LDAP features and sample config
...
* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings
2015-08-11 19:57:53 -07:00
Trent White
8c05f9cf3e
Merge pull request #11 from mattttt/trent-update
...
add text panel page
2015-08-11 16:52:15 -04:00
Trent White
ebcab0f26e
add text panel page
2015-08-11 16:50:33 -04:00
Matt
14996bd08b
Update templating.md
2015-08-11 15:57:36 -04:00
Matt
dd9fb9d526
Update templating.md
2015-08-11 15:56:18 -04:00
Matt
f3ffed673b
Merge pull request #10 from mattttt/build-patch-1
...
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:47:38 -04:00
Matt Toback
5b342dd229
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:41:12 -04:00
Trent White
e626bbf415
Merge pull request #9 from mattttt/trent-update
...
formatting tweak, added datasource overview blurb.
2015-08-11 15:31:03 -04:00
Trent White
04795709a3
formatting tweak, added datasource overview blurb.
2015-08-11 15:30:13 -04:00
Torkel Ödegaard
745162c589
fix(graphite): Import dashboard from graphite is working again, fixes #2490
2015-08-11 21:20:20 +02:00
Torkel Ödegaard
089508db8e
fix(influxdb 0.9): removed function from function dropdown as this function does not exist in InfluxDB 0.9
2015-08-11 21:10:15 +02:00
Matt
a912323d01
Merge pull request #8 from mattttt/ct-additions
...
Added patch from ct
2015-08-11 14:59:59 -04:00
Matt Toback
511a592ec8
Added patch from ct
2015-08-11 14:58:30 -04:00
Matt
d132d3abfd
Merge pull request #7 from mattttt/mattttt-docs
...
Mattttt docs
2015-08-11 14:41:21 -04:00
Trent White
fb9b5e4274
Merge pull request #6 from mattttt/trent-docs-update
...
openTSDB image was broken
2015-08-11 14:32:03 -04:00
Trent White
8dcc5645db
openTSDB image was broken
2015-08-11 14:26:32 -04:00
raj dutt
c6798892b8
Update screencasts.md
...
tweaks
2015-08-11 14:26:04 -04:00
Matt Toback
eea5b026ce
Sanity checked and verified for merge
2015-08-11 14:17:56 -04:00
raj dutt
331e858ed3
Update gettingstarted.md
2015-08-11 14:04:14 -04:00
Trent White
3d602a2558
Merge remote-tracking branch 'origin/master'
2015-08-11 14:01:03 -04:00
Trent White
14386a2f62
Merge branch 'trent-docs'
...
Conflicts:
docs/sources/reference/templating.md
2015-08-11 13:59:46 -04:00
raj dutt
4e91e05470
Update gettingstarted.md
2015-08-11 13:58:44 -04:00
Trent White
ea0bec8bf2
update content on annotations
2015-08-11 13:51:27 -04:00
raj dutt
c2e8a1d733
Update singlestat.md
2015-08-11 13:49:24 -04:00
raj dutt
c6155723a1
Update playlist.md
2015-08-11 13:43:36 -04:00
Trent White
8c64afc81e
update to templating doc
2015-08-11 13:42:40 -04:00
raj dutt
eafd1d8c53
Update templating.md
2015-08-11 13:33:01 -04:00
raj dutt
df0673f907
Update templating.md
2015-08-11 13:31:49 -04:00
Torkel Ödegaard
fe093c6385
feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186
2015-08-11 19:16:45 +02:00
raj dutt
ed536f18ee
Update basic_concepts.md
2015-08-11 13:07:30 -04:00
Matt Toback
96590f591c
Updates to dashlist article
2015-08-11 12:34:18 -04:00
Trent White
32bfcbcdbc
updates to screencasts page, with descriptions of each
2015-08-11 11:43:45 -04:00
Torkel Ödegaard
82feeff3aa
tech(emails): small update to grunt watch for emails
2015-08-11 16:40:23 +02:00
Trent White
3af451caeb
Merge pull request #4 from mattttt/trent-docs
...
added pages, touched up some images and content in data-sources section
2015-08-11 10:15:59 -04:00
Trent White
ae953f2420
added pages, touched up some images and content in data-sources section
2015-08-11 10:12:58 -04:00
Torkel Ödegaard
43ef9f909a
feat(admin): admin page for all grafana organizations (list / edit view), #2457
2015-08-11 15:20:50 +02:00
Mitsuhiro Tanda
4f42dae3cb
change behavior of dimension value suggestion
2015-08-11 20:43:34 +09:00
Torkel Ödegaard
e01c68dcea
fix(logging): removed db connection string from being printed in logs at app startup, fixes #2488
2015-08-11 11:26:28 +02:00
Torkel Ödegaard
234d1291f9
Merge branch 'invite'
...
Conflicts:
public/css/less/gfbox.less
public/emails/reset_password.html
public/emails/welcome_on_signup.html
2015-08-11 11:22:43 +02:00
Torkel Ödegaard
90169d6a05
Bumped master version to 2.2.0-pre1
2015-08-11 11:18:39 +02:00
Torkel Ödegaard
809562c874
updated install docs for 2.1.1 release
2015-08-11 11:12:06 +02:00
Torkel Ödegaard
be7a3a0940
pumped version to 2.1.1
2015-08-11 10:48:19 +02:00
Torkel Ödegaard
1ea0b5371a
feat(invite): new user invites are now also added to correct org after sign up is completed, #2353
2015-08-11 10:45:03 +02:00
Torkel Ödegaard
74932e6311
feat(invite): added specific email for invites to existing grafana users
2015-08-11 10:35:10 +02:00
Torkel Ödegaard
b0b96aa410
Moved reset password and welcome on sign up email to new email build template system
2015-08-11 10:01:52 +02:00
