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 |
|
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 |
|
Matt
|
e53c8100a3
|
Merge pull request #3 from mattttt/mattttt-docs
Adding additional pages and updates from google doc
|
2015-08-10 23:20:15 -04:00 |
|
Matt Toback
|
2b59724ea8
|
Adding additional pages and updates from google doc
|
2015-08-10 18:19:56 -04:00 |
|
Trent White
|
aa4d6d6f0f
|
Merge pull request #2 from mattttt/trent-docs
add basic concpets doc
|
2015-08-10 17:52:38 -04:00 |
|
Trent White
|
ca65671553
|
add basic concpets doc
|
2015-08-10 17:51:29 -04:00 |
|
Trent White
|
2d99308219
|
Merge pull request #1 from mattttt/trent-docs
adding Raj edits/additions as well as initial round of pages I created
|
2015-08-10 17:46:51 -04:00 |
|
Trent White
|
a4be75f410
|
adding Raj edits/additions as well as initial round of pages I created
|
2015-08-10 17:44:08 -04:00 |
|
Torkel Ödegaard
|
4439545428
|
feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353
|
2015-08-10 21:24:47 +02:00 |
|
Torkel Ödegaard
|
835fd383ad
|
fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896
|
2015-08-10 20:25:01 +02:00 |
|
Torkel Ödegaard
|
dfd1bff389
|
feat(invite): began work on email template build system, and css inlining
|
2015-08-10 17:50:02 +02:00 |
|
Torkel Ödegaard
|
e53c1e39d3
|
feat(invite): can now add org user with sername again, #2353
|
2015-08-10 14:03:08 +02:00 |
|
Torkel Ödegaard
|
775e044e69
|
feat(invite): progress on invite feature, #2353
|
2015-08-10 13:47:06 +02:00 |
|
Torkel Ödegaard
|
4f3a3329e2
|
added postgres test docker fig block
|
2015-08-10 12:56:11 +02:00 |
|
Torkel Ödegaard
|
19f64bc561
|
fix(data source proxy): clear proxies request from cookies, fixes #2470
|
2015-08-10 12:11:18 +02:00 |
|
Torkel Ödegaard
|
1b2c1270a8
|
updated changelog with info about merged PR #2483
|
2015-08-10 09:14:45 +02:00 |
|
Torkel Ödegaard
|
4b849243ce
|
Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns
|
2015-08-10 09:11:19 +02:00 |
|