Filip Barl
c0c04c2e2b
Replaced react-tooltip with own component.
2017-09-28 13:18:20 +02:00
Damien Lespiau
46c5fca7ce
Merge pull request #2867 from weaveworks/2017-09-26-mixpanel-cleanup.2
...
tracking: Fix in-flight collision of two related PRs
2017-09-26 13:36:19 +01:00
Damien Lespiau
53f1890ad7
tracking: Fix in-flight collision of two related PRs
...
Unfortunately, I forgot to rebase before renaming trackMixpanelEvent() and a PR
adding a new trace point was already in-flight.
More precisely:
- https://github.com/weaveworks/scope/pull/2861 renames trackMixpanelEvent()
to trackAnalysticsEent()
- https://github.com/weaveworks/scope/pull/2857 add a new
trackMixpanelEvent() call.
Each PR is fine, but with the merge of both without rebasing any, we end up
with master having a dandling call to trackMixpanelEvent().
2017-09-26 12:59:29 +01:00
Damien Lespiau
c74e683a26
Merge pull request #2868 from weaveworks/2017-09-26-golint-update
...
lint: Fix 2 sites failing a recently introduced golint check
2017-09-26 12:59:00 +01:00
Damien Lespiau
466927ce68
lint: Fix 2 sites failing a recently introduced golint check
...
golint has gained a new check and we don't freeze the golint version so CI was
failing on unrelated PRs:
app/multitenant/consul_client.go:69:2: redundant if ...; err != nil check, just return error instead.
report/marshal.go:188:2: redundant if ...; err != nil check, just return error instead.
Fix those!
2017-09-26 12:15:09 +01:00
Alfonso Acosta
a3803cb292
Merge pull request #2859 from weaveworks/release-1.6
...
Release 1.6.5
2017-09-25 15:49:40 +02:00
Damien Lespiau
03475cec83
Merge pull request #2861 from weaveworks/tracking-with-segment
...
tracking: Use segment for tracking
2017-09-25 14:36:32 +01:00
Damien Lespiau
cbfe63dc78
tracking: Fix now out of date comment
2017-09-25 14:03:09 +01:00
Damien Lespiau
a205f6ecb7
tracking: Rename trackMixpanelEvent() to trackAnalyticsEvent()
...
Might as well not mention Mixpanel now that we're sending all events to
Segment.
Commit done with:
git grep trackMixpanelEvent | cut -d : -f 1 | sort -u | \
xargs sed -e s/trackMixpanelEvent/trackAnalyticsEvent/g
2017-09-25 13:57:00 +01:00
Damien Lespiau
74c0c782ac
Merge pull request #2857 from weaveworks/2017-09-21-control-tracking
...
tracking: Add Mixpanel event on Control clicks
2017-09-25 12:06:19 +01:00
Damien Lespiau
3f6faa5371
tracking: Use segment for tracking
...
Align scope to the rest of the platform.
2017-09-22 16:51:37 +01:00
Damien Lespiau
802559e527
tracking: Add Mixpanel event on Control clicks
...
We'd like to gain some insight on how controls are used.
2017-09-22 16:39:37 +01:00
Jonathan Lange
75c8b6a269
Merge pull request #2860 from weaveworks/2853-billing-optional
...
Continue processing reports if billing fails
2017-09-22 12:57:32 +01:00
Jonathan Lange
f9e37a21f5
Continue processing reports if billing fails
2017-09-22 12:20:10 +01:00
Alfonso Acosta
3e92a73312
Update Scope version in docs
2017-09-22 08:27:45 +00:00
Alfonso Acosta
61f95f4960
Add release 1.6.5 to CHANGELOG
2017-09-22 08:27:45 +00:00
Mike Lang
2da9ec089d
Merge pull request #2856 from weaveworks/mike/ecs/fix-test
...
Fix test broken by #2854
2017-09-19 06:37:41 -07:00
Mike Lang
1c6fbffc69
Fix test broken by #2854
2017-09-19 03:54:13 -07:00
Mike Lang
b7db604875
Merge pull request #2854 from galindro/ecs-region
...
Adds ECS Cluster Region option
2017-09-18 16:46:32 -07:00
Bruno Galindro da Costa
cd21bafa2e
Adds ECS Cluster Region option
2017-09-18 20:14:44 -03:00
Bryan Boreham
b0cd1805ef
Merge pull request #2852 from weaveworks/s3-connections
...
AWS connection keep-alive
2017-09-18 10:29:54 +01:00
Alfonso Acosta
bfd741edcb
Merge pull request #2846 from weaveworks/update-ECS-AMI-docs
...
Update ECS AMI docs
2017-09-15 16:02:32 +02:00
Bryan Boreham
fd35ac055d
Use the aws config routine from weaveworks/common
...
so it will allow multiple keep-alive connections to the same
destination
2017-09-15 10:47:38 +00:00
Bryan Boreham
5defa75721
Update to latest weaveworks/common
2017-09-15 10:29:55 +00:00
Filip Barl
1cb82ad401
Merge pull request #2851 from weaveworks/2850-fix-graph-edge-path-undefined
...
Fix edges disappearing in graph mode
2017-09-14 11:09:31 +02:00
Filip Barl
687d061939
Cleanup and revert to optimized waypoints recalculation.
2017-09-12 12:16:30 +02:00
Filip Barl
75e0d383fe
Simplified spring usage.
2017-09-11 18:50:23 +02:00
Filip Barl
736770c978
Fix edges disappearing.
2017-09-11 18:10:42 +02:00
Alfonso Acosta
b3894327b6
Update ECS AMI docs
2017-09-07 15:41:18 +00:00
Matthias Radestock
60844e2eab
Merge pull request #2843 from weaveworks/more-precise-compose-instructions
...
More precise compose instructions
2017-09-01 18:01:32 +01:00
Matthias Radestock
5ada73b843
fix typo
2017-09-01 17:06:39 +01:00
Matthias Radestock
87bd49bdfb
tell users to copy compose fragments to docker-compose.yml
2017-09-01 17:06:00 +01:00
Aaron Kirkbride
fd719b53de
Merge pull request #2841 from weaveworks/fix-circle-yml-1
...
Fix circle.yml syntax
2017-09-01 15:07:35 +01:00
Aaron Kirkbride
5c5d645c76
Fix circle.yml syntax
...
Fix typo introduced by #2837
2017-09-01 13:55:04 +01:00
Aaron Kirkbride
1f0133123f
Merge pull request #2837 from weaveworks/unconditional-ui-upload
...
make circleci ui-upload unconditional
2017-09-01 13:21:48 +01:00
Filip Barl
e9c3970408
Merge pull request #2839 from weaveworks/2829-fix-header-elements-responsiveness
...
Fixed header elements responsiveness
2017-08-31 19:02:29 +02:00
Alfonso Acosta
c3755756b4
Merge pull request #2840 from weaveworks/release-1.6
...
Release 1.6.4
2017-08-31 15:26:55 +02:00
Alfonso Acosta
a5689814d4
Update documentation to 1.6.4
2017-08-31 12:55:36 +00:00
Alfonso Acosta
c9844f5926
Release 1.6.4
2017-08-31 12:55:14 +00:00
Filip Barl
569757c1c0
Fixed header elements responsiveness.
2017-08-31 13:50:31 +02:00
Matthias Radestock
433ef24390
Merge pull request #2836 from johananl/feature/update_readme
...
Fix phrasing in readme
2017-08-31 12:09:03 +01:00
Matthias Radestock
48996aad6a
make circleci ui-upload unconditional
...
It doesn't depend on $DOCKER_USER. Also, because it was tagged on
without a &&, it was masking errors in the dockerhub image uploads.
2017-08-31 10:26:08 +01:00
Johanan Liebermann
b2a6c7d43d
Fix phrasing in readme
2017-08-31 02:34:36 +03:00
Alfonso Acosta
d887d58465
Merge pull request #2834 from weaveworks/release-1.6
...
Release 1.6.3
2017-08-25 12:46:38 +02:00
Filip Barl
a00dbab832
Merge pull request #2828 from weaveworks/update-topology-data-when-time-travelling
...
Update topologies and namespaces when time travelling
2017-08-25 10:08:32 +02:00
Alfonso Acosta
3557410cb2
Update documentation to 1.6.3
2017-08-24 18:28:18 +00:00
Alfonso Acosta
8220e46998
Update CHANGELOG for 1.6.3
2017-08-24 18:25:42 +00:00
Alfonso Acosta
c264b81922
Merge pull request #2833 from weaveworks/release-1.6
...
Release 1.6.2
2017-08-24 18:47:33 +02:00
Filip Barl
f8343c189d
Added one more comment.
2017-08-24 18:14:43 +02:00
Filip Barl
16e520da5e
Proper handling of namespace selection when time travelling.
2017-08-24 18:11:46 +02:00
