Commit Graph

485 Commits (5a13db41bab487205b9f94be8c4984be570ba119)

Author SHA1 Message Date
Tim Raymond 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
Jared Scheib 5df2a56ead Merge branch 'master' into update/news_feed_errors-1628 2017-08-01 16:18:05 -07:00
Jared Scheib a9789afe84 Fix link in changelog update for #1800 2017-08-01 16:17:11 -07:00
Jared Scheib c0f4f78a6d Update changelog 2017-08-01 16:16:04 -07:00
Andrew Watkins b9754fd5d5 Update CHANGELOG 2017-08-01 14:12:40 -07:00
Hunter Trujillo 6a9e1d2457 .
.
ç̥͈̺͕̯̌͐̂̋̉͘͝H̸̨͍̳̟̖̳̱͖͎̔͛̏̄̚͟͠a̡̨̻̘̪̝̤̻̳͛̋͊̾́͟͝N̷͉͇̤͔̈́̎̑̍͊̃̀̕̕̚͜ͅg̢͈͈̭̙̬̜̓̈́͊͛͠E̛̫͇͚̘̹̾́̂̐͋̆͘͢ļ̴̛̲̮͓͈̼͉̮͐̆́̓͘ͅŐ̸̢̨̧͕͖̾̒͂͗͋̎́̚͠ǵ̵̡͙̘̖̺͖͉͎̋͊͋̍͢͜Ẻ̳̥̲͇̻̍̇̄̆̚
.
.
2017-07-31 12:07:48 -06:00
Andrew Watkins 4fa7883882 Merge branch 'master' into bugfix/domain 2017-07-28 07:49:33 -07:00
Andrew Watkins 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
Jared Scheib 76614643ec Clarify changelog, fix method name typo 2017-07-27 16:49:18 -07:00
Jared Scheib 7abb6dc170 Clarify changelog 2017-07-27 16:35:18 -07:00
Hunter Trujillo f6b399d3a7 CHAMGELOG 2017-07-27 17:31:24 -06:00
Jared Scheib 3527ec19e3 Merge branch 'master' into enhancement/write-data-window 2017-07-27 16:30:11 -07:00
Hunter Trujillo 5b860daee4 CHANGELOG 2017-07-27 17:08:07 -06:00
Andrew Watkins 0878539edd Update CHANGELOG 2017-07-27 15:26:20 -07:00
Jared Scheib af29ece5ba Merge branch 'refs/heads/1.3.5.x' 2017-07-27 14:50:00 -07:00
Jared Scheib ddb170dcd6 Update release date 2017-07-27 14:48:18 -07:00
Andrew Watkins cb91c967ed Update CHANGELOG 2017-07-27 14:47:04 -07:00
Andrew Watkins d88247849b Update CHANGEOG 2017-07-27 13:41:44 -07:00
Andrew Watkins 67adc3b15e Update CHANGELOG 2017-07-27 12:55:48 -07:00
Hunter Trujillo b29ea3ad37 CHANGELOG. 2017-07-27 13:39:51 -06:00
Chris Goller 2d8b1ef340 Release 1.3.5.0 2017-07-25 15:08:02 -05:00
Alex Paxton 77e259bb7c Merge pull request #1779 from influxdata/misc-ui-fixes
Misc UI Fixes
2017-07-25 12:20:10 -07:00
Jared Scheib e1f95ab449 Merge branch 'master' into fix/disentagle_de_and_kap_qcs-1772 2017-07-25 12:12:20 -07:00
Alex P 9addb63247 Updoot changelog 2017-07-25 11:59:55 -07:00
Nathan Haugo 4720df245b Update changelog 2017-07-25 12:13:46 -05:00
Jared Scheib 7c8713cd72 Merge branch 'master' into fix/disentagle_de_and_kap_qcs-1772 2017-07-24 22:06:43 -07:00
Jared Scheib 39da043c4f Update changelog 2017-07-24 22:01:16 -07:00
Alex P a7bde5d5d0 Update changelog 2017-07-24 18:01:41 -07:00
Jared Scheib 7b882a12b2 Update changelog 2017-07-24 13:04:53 -07:00
Jared Scheib 03ab41a84c Update changelog 2017-07-21 20:15:07 -07:00
Jared Scheib 7a5a949862 Update changelog 2017-07-21 15:25:21 -07:00
Jared Scheib d6db7ee084 Merge pull request #1724 from influxdata/feature/pushover_support-1680
Add Pushover alert support
2017-07-21 14:04:22 -07:00
Jared Scheib 62096e7561 Fix PagerDuty kapacitor node typo bug (#1751)
* Fix pagerduty kapacitor node typo bug

* Update changelog
2017-07-21 13:54:49 -07:00
Andrew Watkins 1965ff0666 Merge branch 'master' into bugfix/cell-name 2017-07-21 13:30:25 -07:00
Jared Scheib 1879b0a1e4 Update changelog 2017-07-21 11:45:34 -07:00
Jared Scheib 200b24788b Merge branch 'master' into feature/pushover_support-1680 2017-07-20 16:23:54 -07:00
Jared Scheib fd91e650b0 Update changelog again 2017-07-20 15:55:05 -07:00
Chris Goller a4be2a25b0 Update CHANGELOG to mention adding shared secret JWT to InfluxDB 2017-07-19 01:45:31 -05:00
Andrew Watkins 0823f0232e Update CHANGELOG 2017-07-18 13:42:45 -07:00
Jared Scheib 7d93b93040 Update changelog 2017-07-14 17:34:02 -07:00
Andrew Watkins 47d5272489 Merge branch 'master' into feature/read-only-tickscript 2017-07-13 12:51:54 -07:00
Andrew Watkins 6134b91ec7 Update CHANGELOG 2017-07-13 12:47:32 -07:00
Hunter Trujillo 2a3ad3ac9a Merge pull request #1681 from influxdata/feature/1482-custom-time-range
Custom Time Ranges
2017-07-11 14:05:27 -06:00
Hunter Trujillo dfa769d7c3 Update CHANGELOG. Feature was in wrong release. 2017-07-10 16:22:56 -06:00
Hunter Trujillo 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
Alex P d7e6ddcc4d Update changelog 2017-07-10 13:21:40 -07:00
Alex P 6f38287f0e Fix accidental changelog mixup from merge 2017-07-10 13:01:41 -07:00
Alex P 51069eb3d6 Make changelog update more descriptive
Sorry to nitpick
2017-07-10 12:59:07 -07:00
Alex P 3e95cb1aad Move changelog update into correct version header 2017-07-10 12:56:41 -07:00
Alex Paxton 45f88c7db8 Merge branch 'master' into zindex 2017-07-10 12:52:08 -07:00
Andrew Maney 64e2716ad9 Update CHANGELOG message to present tense 2017-07-10 15:44:36 -04:00
Luke Morris 2533c76d6e Bump version, update changelog 2017-07-10 11:52:12 -07:00
Andrew Maney 7249c4728e CHANGELOG updated 2017-07-10 13:38:35 -04:00
Jared Scheib 5ec506b8fb Merge branch 'master' into feature/persist_datasource_flag-1555 2017-07-07 14:45:00 -07:00
Tim Raymond 5b5dbee078 Merge master into feature/tr-auth0-organizations
Conflicts were the addition of CLI flags from a concurrent branch.
2017-07-07 16:18:01 -04:00
Jared Scheib 4ce7e950a0 Update changelog 2017-07-07 13:14:01 -07:00
Alex P 0d387daf15 Updoot changelog 2017-07-05 12:34:20 -07:00
Hunter Trujillo 9519973690 Updoot CHANGELOOG~ 2017-06-30 17:54:52 -06:00
Tim Raymond f7ab54592f Update CHANGELOG for Auth0 organizations
Added an entry about adding support for Auth0 organizations
2017-06-28 16:44:33 -04:00
Alex Paxton 170b1f23ef Merge pull request #1664 from influxdata/find-better-home-for-version-number
Find better home for version number
2017-06-28 10:29:51 -07:00
Hunter Trujillo 2fec182927 Merge pull request #1647 from influxdata/feature/file-upload-de
Feature/file upload de
2017-06-28 10:42:22 -06:00
Alex P 357fa3655f Merge branch 'master' into find-better-home-for-version-number 2017-06-27 16:58:37 -07:00
Alex P 7321ed1edd Update changelog 2017-06-27 10:45:36 -07:00
Jared Scheib f064342440 Merge remote-tracking branch 'origin/master' into feature/custom_user_links-1550 2017-06-26 18:05:22 -07:00
Jared Scheib 7da6ca8918 Update changelog 2017-06-26 17:23:01 -05:00
Alex P 86b11d75f9 Update changelog 2017-06-23 11:32:25 -07:00
Alex P 3989949e46 Rebase and fix conflicts 2017-06-23 11:05:23 -07:00
Timothy J. Raymond 04bed9a266 Merge pull request #1612 from influxdata/feature/tr-no-internal
Remove system databases from "Write Data" dropdown
2017-06-23 13:18:29 -04:00
Andrew Watkins fd9f4fc2e0 Update CHANGELOG 2017-06-23 10:05:42 -07:00
Alex P f743f38777 Merge branch 'master' into misc-ui-polish 2017-06-22 16:35:38 -07:00
Andrew Watkins febdbfb3a0 Merge branch 'master' into sticky-alert-table 2017-06-22 15:53:38 -07:00
Andrew Watkins 1b57e8141f Merge pull request #1581 from influxdata/feature/refresh-tvars
Refresh templates on dashboard load
2017-06-22 14:50:02 -07:00
Timothy J. Raymond 8b755857ba Merge pull request #1645 from influxdata/feature/tr-aw-auth0
Add Auth0 to supported OAuth2 providers
2017-06-22 15:58:04 -04:00
Andrew Watkins d43c898202 Merge pull request #1641 from influxdata/bugfix/enable-disable
Fix enable / disable bug
2017-06-22 11:54:57 -07:00
Tim Raymond 25119298fa Add CHANGELOG entry for Auth0
This adds an entry for #1645, where we added Auth0 support.
2017-06-22 14:47:57 -04:00
Tim Raymond 356a24498f Update CHANGELOG for #1612
This updates the changelog indicating that it's not longer possible for
users to write to system databases (those whose names prefixed with an
underscore)
2017-06-22 11:41:53 -04:00
Jared Scheib 088cd74874 Update changelog for additional changes 2017-06-21 18:55:36 -07:00
Jared Scheib f0ad522669 Fix changelog for two other hot fixes 2017-06-21 18:36:59 -07:00
Jared Scheib 26112c942e Update changelog 2017-06-21 18:36:40 -07:00
Nathan Haugo 51b6ac3235 Fix verb tense in changelog 2017-06-21 17:43:04 -07:00
Nathan Haugo ee3316cae4 Fix the changelog release 2017-06-21 17:14:02 -07:00
Nathan Haugo 21f8fe6842 Update changelog 2017-06-21 16:59:47 -07:00
Andrew Watkins 2795e78cf5 Update CHANGELOG 2017-06-21 14:49:53 -07:00
Andrew Watkins cf3b3182a3 Update CHANGELOG 2017-06-21 14:11:41 -07:00
Alex P e98460a068 Merge remote-tracking branch 'origin/master' into sticky-alert-table 2017-06-20 14:20:15 -07:00
Jared Scheib 8bafe10a9a Add back empty 1.3.4.0 to changelog 2017-06-20 14:06:50 -07:00
Alex P fd47dda8ab Update changelog 2017-06-20 13:52:11 -07:00
Andrew Watkins 7a07fa4e70 Merge branch 'master' into bugfix/enable-disable 2017-06-20 13:15:35 -07:00
Jared Scheib fe0890f134 Merge pull request #1642 from influxdata/fix/basepath_json_feed-1640
Do not prefix basepath to external link for news feed
2017-06-20 12:44:44 -07:00
Hunter Trujillo d592977515 Merge pull request #1639 from influxdata/feature/1597-hover-lines-performance
Feature/1597 hover lines performance
2017-06-20 13:40:04 -06:00
Jared Scheib 2df7a7d6ad Update changelog 2017-06-20 12:12:14 -07:00
Andrew Watkins 68e303c6ab Update CHANGELOG 2017-06-20 11:14:53 -07:00
Alex P 08fa7135ac Merge branch 'master' into rule-creator-function-selector 2017-06-19 16:17:53 -07:00
Hunter Trujillo a7261faa9b CHANGELOG. 2017-06-19 17:12:17 -06:00
Luke Morris d8bd6fd959 Update version number 2017-06-19 11:13:35 -07:00
Jared Scheib 926a3a5448 Update changelog retroactively for PR 1609 2017-06-16 18:03:51 -07:00
Jared Scheib 7df4a6ed1a Merge branch 'master' into feature/status_page-1556 2017-06-16 17:52:16 -07:00
Alex P e7ba879a9c Update changelog 2017-06-16 15:18:31 -07:00
Tim Raymond fad1d744b7 Merge branch 'master' into feature/tr-auto-group-by 2017-06-15 20:45:30 -04:00
Luke Morris e95e0d28e7 Revert "Merge pull request #1585 from influxdata/revert-auto-func"
This reverts commit 85376edc1f, reversing
changes made to cdde4ff4dc.
2017-06-15 17:43:35 -04:00