Commit graph

3213 commits

Author SHA1 Message Date
Sasha Klizhentas 7b87c73f6b fix cluster name fix 2017-10-19 00:36:32 +00:00
Russell Jones 3634291bd9 Add ClusterName to discovery request. 2017-10-19 00:36:03 +00:00
Alexey Kontsevoy b1ecf50769 Merge pull request #1419 from gravitational/alexey/update-e-ref
update e-reference
2017-10-18 13:05:14 -04:00
Alexey Kontsevoy bee56b2d67 update e-reference 2017-10-18 12:54:13 -04:00
Alexey Kontsevoy 384f5849f5 Merge pull request #1399 from gravitational/alexey/feature/settings
Alexey/feature/settings
2017-10-18 12:23:01 -04:00
Alexey Kontsevoy a49b7bdb8b (web) dist 2017-10-18 11:56:07 -04:00
Alexey Kontsevoy 83982a58d0 (web) adding settings feature 2017-10-18 11:55:32 -04:00
Alexey Kontsevoy c7cfceb77c Merge pull request #1417 from gravitational/alexey/terminal/title
fix terminal title when connected to unlisted server
2017-10-17 17:58:44 -04:00
Alexey Kontsevoy acc4e1487a Merge branch 'master' into alexey/terminal/title 2017-10-17 17:55:08 -04:00
Roman Tkachenko 8619f074ef Merge pull request #1408 from gravitational/roman/plugins
Use modules instead of "is enterprise" flag
2017-10-17 11:14:17 -07:00
Roman Tkachenko 93114149c9 Update submodule reference 2017-10-17 11:05:53 -07:00
Roman Tkachenko 67087b81de Merge branch 'master' into roman/plugins 2017-10-17 09:32:28 -07:00
Ev Kontsevoy f72050612d Merge pull request #1415 from gravitational/ev/final-2.3.5
2.3.5
2017-10-16 18:18:12 -07:00
Alexey Kontsevoy 6167380704 fix terminal title when connected to unlisted server 2017-10-16 21:08:24 -04:00
Ev Kontsevoy 95a1bff6d2 2.3.5
- Updated the changelong
- Version bump to 2.3.5
2017-10-16 17:58:58 -07:00
Ev Kontsevoy 07eebbc5c8 Merge pull request #1412 from gravitational/alexey/unlisted/ssh
use hostname to find an existing server
2017-10-16 17:44:39 -07:00
Alexey Kontsevoy 992b953a8c Merge branch 'master' of github.com:gravitational/teleport into fixes 2017-10-16 20:38:06 -04:00
Alexey Kontsevoy 24f1312c16 use hostname to find an existing server 2017-10-16 20:37:13 -04:00
Ev Kontsevoy 3b62c7dda6 Merge pull request #1413 from gravitational/ev/sample-config
Removed `oidc_connectors` from sample configuration
2017-10-16 17:33:11 -07:00
Ev Kontsevoy 33b5cf0fcb Removed oidc_connectors from sample configuration
Problem:

`teleport configure` prints `oidc_connectors` for sample configuration
file (even for OSS version).

This property has been deprecated long time ago. I added 'omitempty' to
JSON serialization.
2017-10-16 17:30:21 -07:00
Roman Tkachenko aeea8e9e8a Merge branch 'master' into roman/plugins 2017-10-16 16:55:54 -07:00
Roman Tkachenko 96a249de14 Rename plugins to modules 2017-10-16 16:55:39 -07:00
Ev Kontsevoy 1c9ae204d4 Merge pull request #1409 from gravitational/ev-release-fixes
Cherry-picked commits from 2.3 branch
2017-10-16 14:24:38 -07:00
Ev Kontsevoy 57ac02f381 Minor tweaks for 2.3.5
- Documentation edit (closes #1404)
- Updated logging level for configuration (closes #1403)
2017-10-16 14:10:38 -07:00
Roman Tkachenko 764db9d015 Add test 2017-10-16 13:49:30 -07:00
Roman Tkachenko d127c4fdb6 Merge branch 'master' into roman/plugins 2017-10-16 11:42:42 -07:00
Roman Tkachenko 668243d144 Plugins interface 2017-10-16 11:42:01 -07:00
Alexander Klizhentas 519ea801f8 Merge pull request #1394 from gravitational/sasha/curiosity
Sasha/curiosity
2017-10-16 09:53:45 -07:00
Sasha Klizhentas 0938ce2dfb fix typo 2017-10-16 09:38:06 -07:00
Sasha Klizhentas 13e23a8b67 Merge branch 'master' into sasha/curiosity 2017-10-13 19:27:28 -07:00
Sasha Klizhentas 039249507d update according to code review comments 2017-10-13 19:26:49 -07:00
Roman Tkachenko e0b992986d Merge branch 'master' into roman/plugins 2017-10-13 17:33:44 -07:00
Roman Tkachenko 5dbda4f41b Use plugins mechanism instead of oss/e flag 2017-10-13 17:32:45 -07:00
Alexey Kontsevoy 97e05b29f6 Merge pull request #1401 from gravitational/alexey/bugfix
(web) fixing expired invite link error
2017-10-13 20:14:29 -04:00
Alexey Kontsevoy 2029c3930f (web) fixing expired invite link error 2017-10-13 20:09:50 -04:00
Russell Jones 7ff5fdbc29 Merge pull request #1396 from gravitational/rjones/fix-cert-verify
Validate self-signed certificates upon startup correctly.
2017-10-13 15:22:58 -07:00
Russell Jones 7a46471553 Validate self-signed certificates upon startup correctly. 2017-10-13 22:19:21 +00:00
Alexey Kontsevoy 28e2eece1b Merge pull request #1397 from gravitational/alexey/changepassword
adding  password change API endpoint
2017-10-13 17:19:46 -04:00
Alexey Kontsevoy c6f42c49d9 adding password change API endpoint 2017-10-13 17:02:40 -04:00
Sasha Klizhentas d69f88978b fix data race in tun client 2017-10-13 11:51:14 -07:00
Sasha Klizhentas 4b36d77f31 remove data race on channel close 2017-10-13 10:21:10 -07:00
Sasha Klizhentas 6471bc32da fix data race 2017-10-13 09:11:13 -07:00
Sasha Klizhentas b2ed270bb6 fix data race and update lock file digest 2017-10-12 17:38:58 -07:00
Sasha Klizhentas 9543bf2208 Merge branch 'master' into sasha/curiosity 2017-10-12 16:57:41 -07:00
Sasha Klizhentas e461b4e6bd fix tests 2017-10-12 16:51:18 -07:00
Ev Kontsevoy 081d952e5b Merge pull request #1393 from gravitational/ev/configs
Ev/configs
2017-10-12 16:05:06 -07:00
Ev Kontsevoy a17a0219ef Updated "sample config" to match what Teleport actually uses by default
Closes #1374
2017-10-12 15:56:11 -07:00
Ev Kontsevoy a43487f5b3 Fixed Docket-based documentation generation 2017-10-12 15:56:11 -07:00
Sasha Klizhentas 0290cccb57 integration tests for proxies 2017-10-12 10:35:46 -07:00
Russell Jones 9936ae2073 Merge pull request #1389 from gravitational/rjones/fix-st
Corrected static token handling.
2017-10-11 18:19:43 -07:00