Граф коммитов

4269 Коммитов

Автор SHA1 Сообщение Дата
Yi EungJun
4aef32d998 Add unofficial guide for GitHub SSO
SSO for Github Enterprise was added at 6d63f57, but it seemed not to work with
GitHub.

The curlpits were:

* The url to get the authenticate user is /user, not /api/v3/user.
* Users should set their public email for GitHub.

Describe the detail in GitHub.md and rename the original Github.md to
GitHub-Enterprise.md.
2015-12-03 18:19:22 +09:00
Corey Hulen
b8940eee71 Merge pull request #1584 from mattermost/lfbrock-patch-3
Update Sign-in.md
2015-12-02 20:16:11 -08:00
lfbrock
715af3716b Update Sign-in.md 2015-12-02 14:48:54 -05:00
Christopher Speller
8c7dd0561d Merge pull request #1581 from mattermost/font-fix
Stop firefox from crashing due to fonts
2015-12-02 12:25:15 -05:00
JoramWilander
13e55cd8ec Stop firefox from crashing due to fonts 2015-12-02 12:11:55 -05:00
Joram Wilander
2b7ce16ea9 Merge pull request #1577 from mattermost/plt-1307
PLT-1307 Make proper async calls when switching channels
2015-12-02 11:29:51 -05:00
JoramWilander
2abb0ae354 Minor change 2015-12-02 11:16:10 -05:00
Harrison Healey
ac3f0335be Merge pull request #1578 from mattermost/emitter-leak
Fix emitter leak
2015-12-02 11:11:49 -05:00
JoramWilander
d0578f73bf Fix emitter leak 2015-12-02 10:56:48 -05:00
Joram Wilander
5e51de6f2c Merge pull request #1576 from mattermost/remove-scroll
Remove perfectscrollbar from center channel
2015-12-02 10:36:30 -05:00
JoramWilander
9adcbe58fe Remove logging 2015-12-02 10:35:17 -05:00
JoramWilander
5a34218efe Add bind 2015-12-02 10:33:18 -05:00
JoramWilander
2494d59864 Remove perfectscrollbar from center channel 2015-12-02 10:25:14 -05:00
JoramWilander
14804965b5 Make proper async calls when switching channels 2015-12-02 10:22:39 -05:00
Christopher Speller
2aa78002fe Merge pull request #1535 from florianorben/PLT-1233
PLT-1233: "Display Font" option in Account Settings > Display
2015-12-02 10:18:42 -05:00
Joram Wilander
7678d4aafa Merge pull request #1556 from npcode/sso-github-ent
Make the Gitlab SSO Support compatible with Github Enterprise
2015-12-02 08:08:27 -05:00
Corey Hulen
5925d31180 Merge pull request #1563 from esethna/patch-33
Create README.md
2015-12-01 21:10:44 -08:00
Corey Hulen
0f4e13d51f Merge pull request #1566 from esethna/patch-34
Create test-markdown-lists.md
2015-12-01 21:10:30 -08:00
Corey Hulen
de234080fd Merge pull request #1567 from esethna/patch-36
Update test-markdown.md
2015-12-01 21:10:19 -08:00
Yi EungJun
ff664e44ec Note that the Github Enterprise SSO is unofficial
Since the GitLab SSO UI is used for GitHub Enterprise SSO, it's potentially
confusing.

Suggested-by: it33 <iantien@gmail.com>
2015-12-02 13:24:38 +09:00
Yi EungJun
6d63f5703c Make the Gitlab SSO Support compatible with Github Enterprise
See doc/integrations/Single-Sign-On/Github.md for the usage.

Note: I thought it should work also with Github.com but it failed with "Bad
token type" error.
2015-12-02 13:23:57 +09:00
Eric Sethna
6439ac2926 Update test-markdown.md
1) Add many corner cases we've hit in the past
2) Remove tables to put it in it's own .md test file
3) Remove lists as I've submitted a PR for a new .md file for those cases
2015-12-01 17:20:01 -07:00
Eric Sethna
7579d57405 Create test-markdown-lists.md
Tests for Numbered and Bulleted Lists.
2015-12-01 14:48:13 -07:00
Joram Wilander
c8f642a499 Merge pull request #1565 from mattermost/plt-1270
Minor fix
2015-12-01 15:00:53 -05:00
JoramWilander
b8a1894b00 Minor fix 2015-12-01 14:53:42 -05:00
Christopher Speller
e99437aa3b Merge pull request #1560 from mattermost/plt-1270
PLT-1270 Fix channel creation errors
2015-12-01 14:47:19 -05:00
Corey Hulen
d0b73c0267 Merge pull request #1562 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2015-12-01 11:32:06 -08:00
Harrison Healey
74211401dd Merge pull request #1559 from mattermost/plt-510
PLT-510 Updated OAuth2 app register modal
2015-12-01 13:43:56 -05:00
Joram Wilander
096bb150fb Merge pull request #1522 from tamtamchik/patch-1
Update Setup.md
2015-12-01 13:42:05 -05:00
Harrison Healey
4896e626e7 Merge pull request #1561 from florianorben/PLT-1182
PLT-1182: "Recent Mention" search brings up username as "[username]undefined
2015-12-01 13:40:00 -05:00
Eric Sethna
f1258ce158 Create README.md
Instructions on how to use the test .md files.
2015-12-01 11:33:19 -07:00
Asaad Mahmood
179451b1ac Multiple UI Improvements 2015-12-01 23:20:12 +05:00
Florian Orben
dd079733fd PLT-1182: "Recent Mention" search brings up username as "[username]undefined" 2015-12-01 18:43:08 +01:00
JoramWilander
362b9f2f94 Fix channel creation errors 2015-12-01 11:59:35 -05:00
Joram Wilander
2b2ee62a1d Merge pull request #1512 from rgarmsen2295/plt-995b
PLT-995 Applies name display preference setting in more places
2015-12-01 11:34:53 -05:00
Corey Hulen
272ed29a85 Merge pull request #1558 from mattermost/lfbrock-patch-3
Update overview.md
2015-12-01 08:33:56 -08:00
Corey Hulen
e460bc2665 Merge pull request #1555 from mattermost/PLT-902
PLT-902 switching to push proxy server
2015-12-01 08:33:23 -08:00
Reed Garmsen
478af4bf75 Enabled name display settings in more places 2015-12-01 08:21:58 -08:00
JoramWilander
5707df39bf Updated oauth2 app register modal 2015-12-01 11:13:58 -05:00
lfbrock
ff8573cfdf Update overview.md 2015-12-01 10:07:08 -05:00
Christopher Speller
62c96514bf Merge pull request #1548 from mattermost/plt-1268
PLT-1268 Fix webhook post aggregation and pending/failed post aggregation
2015-12-01 08:50:28 -05:00
Christopher Speller
2bfb3493f4 Merge pull request #1546 from mattermost/plt-1281
PLT-1281 Make sure to have latest posts for the view when switching to a channel
2015-12-01 08:49:26 -05:00
Christopher Speller
6e542efb8b Merge pull request #1532 from hmhealey/prepare
Added .prepare step to make test
2015-12-01 08:44:29 -05:00
=Corey Hulen
f5907e21ca fixing other configs 2015-11-30 22:43:16 -08:00
=Corey Hulen
68765a8f21 PLT-902 switching to push proxy server 2015-11-30 22:38:38 -08:00
Corey Hulen
b717a8100c Merge pull request #1553 from esethna/patch-32
Update Configuration-Settings.md
2015-11-30 20:37:08 -08:00
Corey Hulen
6e99595e89 Merge pull request #1551 from esethna/patch-30
Update README.md
2015-11-30 20:36:35 -08:00
Corey Hulen
0d3f0f3481 Merge pull request #1547 from asaadmahmoodspin/ui-improvements
Ui improvements
2015-11-30 20:35:47 -08:00
Corey Hulen
441c9991ff Merge pull request #1543 from florianorben/GFM-Tasklist
Support Tasklists like GitHub does
2015-11-30 20:35:13 -08:00
Corey Hulen
f8fa1af4b8 Merge pull request #1538 from florianorben/PLT-199
PLT-199: Add scroll bar to center channel
2015-11-30 20:34:44 -08:00