532a6a8c48
Merge branch 'master' into feature/1602-graph-bounds-setting
...
Also removed LegacyBounds marshaling since it was no longer necessary
Conflicts resolved:
bolt/internal/internal.go
bolt/internal/internal.pb.go
bolt/internal/internal.proto
bolt/internal/internal_test.go
chronograf.go
server/cells_test.go
server/dashboards_test.go
server/swagger.json
2017-08-02 11:29:29 -04:00
5df2a56ead
Merge branch 'master' into update/news_feed_errors-1628
2017-08-01 16:18:05 -07:00
a9789afe84
Fix link in changelog update for #1800
2017-08-01 16:17:11 -07:00
c0f4f78a6d
Update changelog
2017-08-01 16:16:04 -07:00
b9754fd5d5
Update CHANGELOG
2017-08-01 14:12:40 -07:00
4fa7883882
Merge branch 'master' into bugfix/domain
2017-07-28 07:49:33 -07:00
b8435cd4b8
Merge pull request #1799 from influxdata/bugfix/syncronize
...
Dont sync graphs if there is only one graph
2017-07-28 07:48:27 -07:00
76614643ec
Clarify changelog, fix method name typo
2017-07-27 16:49:18 -07:00
7abb6dc170
Clarify changelog
2017-07-27 16:35:18 -07:00
3527ec19e3
Merge branch 'master' into enhancement/write-data-window
2017-07-27 16:30:11 -07:00
0878539edd
Update CHANGELOG
2017-07-27 15:26:20 -07:00
af29ece5ba
Merge branch 'refs/heads/1.3.5.x'
2017-07-27 14:50:00 -07:00
ddb170dcd6
Update release date
2017-07-27 14:48:18 -07:00
cb91c967ed
Update CHANGELOG
2017-07-27 14:47:04 -07:00
d88247849b
Update CHANGEOG
2017-07-27 13:41:44 -07:00
67adc3b15e
Update CHANGELOG
2017-07-27 12:55:48 -07:00
2d8b1ef340
Release 1.3.5.0
2017-07-25 15:08:02 -05:00
77e259bb7c
Merge pull request #1779 from influxdata/misc-ui-fixes
...
Misc UI Fixes
2017-07-25 12:20:10 -07:00
e1f95ab449
Merge branch 'master' into fix/disentagle_de_and_kap_qcs-1772
2017-07-25 12:12:20 -07:00
9addb63247
Updoot changelog
2017-07-25 11:59:55 -07:00
4720df245b
Update changelog
2017-07-25 12:13:46 -05:00
7c8713cd72
Merge branch 'master' into fix/disentagle_de_and_kap_qcs-1772
2017-07-24 22:06:43 -07:00
39da043c4f
Update changelog
2017-07-24 22:01:16 -07:00
a7bde5d5d0
Update changelog
2017-07-24 18:01:41 -07:00
7b882a12b2
Update changelog
2017-07-24 13:04:53 -07:00
03ab41a84c
Update changelog
2017-07-21 20:15:07 -07:00
7a5a949862
Update changelog
2017-07-21 15:25:21 -07:00
d6db7ee084
Merge pull request #1724 from influxdata/feature/pushover_support-1680
...
Add Pushover alert support
2017-07-21 14:04:22 -07:00
62096e7561
Fix PagerDuty kapacitor node typo bug ( #1751 )
...
* Fix pagerduty kapacitor node typo bug
* Update changelog
2017-07-21 13:54:49 -07:00
1965ff0666
Merge branch 'master' into bugfix/cell-name
2017-07-21 13:30:25 -07:00
1879b0a1e4
Update changelog
2017-07-21 11:45:34 -07:00
200b24788b
Merge branch 'master' into feature/pushover_support-1680
2017-07-20 16:23:54 -07:00
fd91e650b0
Update changelog again
2017-07-20 15:55:05 -07:00
a4be2a25b0
Update CHANGELOG to mention adding shared secret JWT to InfluxDB
2017-07-19 01:45:31 -05:00
0823f0232e
Update CHANGELOG
2017-07-18 13:42:45 -07:00
7d93b93040
Update changelog
2017-07-14 17:34:02 -07:00
47d5272489
Merge branch 'master' into feature/read-only-tickscript
2017-07-13 12:51:54 -07:00
6134b91ec7
Update CHANGELOG
2017-07-13 12:47:32 -07:00
2a3ad3ac9a
Merge pull request #1681 from influxdata/feature/1482-custom-time-range
...
Custom Time Ranges
2017-07-11 14:05:27 -06:00
dfa769d7c3
Update CHANGELOG. Feature was in wrong release.
2017-07-10 16:22:56 -06:00
025af5c1ca
Merge branch 'master' into feature/1482-custom-time-range
...
# Conflicts:
# ui/src/style/pages/dashboards.scss
2017-07-10 16:09:14 -06:00
d7e6ddcc4d
Update changelog
2017-07-10 13:21:40 -07:00
6f38287f0e
Fix accidental changelog mixup from merge
2017-07-10 13:01:41 -07:00
51069eb3d6
Make changelog update more descriptive
...
Sorry to nitpick
2017-07-10 12:59:07 -07:00
3e95cb1aad
Move changelog update into correct version header
2017-07-10 12:56:41 -07:00
45f88c7db8
Merge branch 'master' into zindex
2017-07-10 12:52:08 -07:00
64e2716ad9
Update CHANGELOG message to present tense
2017-07-10 15:44:36 -04:00
2533c76d6e
Bump version, update changelog
2017-07-10 11:52:12 -07:00
7249c4728e
CHANGELOG updated
2017-07-10 13:38:35 -04:00
5ec506b8fb
Merge branch 'master' into feature/persist_datasource_flag-1555
2017-07-07 14:45:00 -07:00
Tim Raymond
Jared Scheib
Jared Scheib
Andrew Watkins
Chris Goller
Alex Paxton
Alex P
Nathan Haugo
Hunter Trujillo
Andrew Maney
Luke Morris