=Corey Hulen
9a3f67a9c9
Fixing eslint issues
2015-09-14 17:18:47 -07:00
=Corey Hulen
3bd350dcaf
Merge branch 'master' into PLT-12-log
2015-09-14 16:59:24 -07:00
Corey Hulen
bfebb41bc0
Merge pull request #678 from mattermost/mm-1589
...
PLT-171 MM-1589 New add channel modal using react-bootstrap.
2015-09-14 16:57:54 -07:00
Harrison Healey
c447db6e78
Merge pull request #679 from mattermost/fix-file-content-type
...
Blank Content-Type for file GETs.
2015-09-14 16:17:22 -04:00
hmhealey
4c9ae22b62
Renamed text formatting tokens so that there should be significantly less chance of having conflicting tokens
2015-09-14 15:08:13 -04:00
Joram Wilander
312f7d7656
Merge pull request #674 from Trozz/PLT-41
...
PLT-41 Automatically convert uppercase letters to lowercase in username input box.
2015-09-14 14:45:33 -04:00
Joram Wilander
125b7dc71b
Merge pull request #677 from mattermost/plt-50
...
PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
2015-09-14 14:32:15 -04:00
Michael Leer
c961c529af
update remaining web files tolowercase
2015-09-14 19:29:56 +01:00
JoramWilander
0654b0c06b
Blank Content-Type for file GETs.
2015-09-14 14:18:01 -04:00
Christopher Speller
0d8e27ce94
Merge pull request #671 from mattermost/it33-patch-1
...
Updating MaxUsersPerTeam error msg
2015-09-14 14:12:45 -04:00
Christopher Speller
0ea0233c50
New add channel modal using react-bootstrap.
2015-09-14 13:56:58 -04:00
Corey Hulen
8d021a13f8
Merge pull request #668 from nickago/MM-1958
...
MM-1958 please read comment, base video player
2015-09-14 10:18:24 -07:00
hmhealey
d8779efc99
Removed textToJsx!
2015-09-14 12:22:02 -04:00
hmhealey
15aa853da5
Removed all calls to textToJsx and replaced them with calls to TextFormatting
2015-09-14 12:22:02 -04:00
hmhealey
3e3b52554a
Cleaned up TextFormatting and added a default click handler for hashtags and @mentions
2015-09-14 12:21:58 -04:00
Christopher Speller
7b3c2d6d85
Allowing underscores in channel names. Added conversion of some slack channel names into valid mattermost names.
2015-09-14 12:18:38 -04:00
Michael Leer
90ef55b428
replace lowerName with name
2015-09-14 16:10:31 +01:00
Michael Leer
5fbd1e9860
PLT-41
...
Removed lowercase from the error wording.
Removed additional toLowerCase within validator.
2015-09-14 15:15:48 +01:00
Michael Leer
ffbe185d82
PLT-41
...
Automatically convert uppercase letters to lowercase in username input box.
Validator not changed.
2015-09-14 14:54:36 +01:00
hmhealey
214e48835a
Added highlighting of search terms to the new text formatting
2015-09-14 09:19:27 -04:00
hmhealey
e1797c7d55
Added autolinking of hashtags to the new text formatting
2015-09-14 09:19:27 -04:00
hmhealey
3ab2814af3
Added autolinking of urls to the new text formatting
2015-09-14 09:19:26 -04:00
hmhealey
5d28ffa444
Added highlighting when the current user is mentioned to the new text formatting
2015-09-14 09:19:26 -04:00
hmhealey
56312f8f53
Changed one instance of textToJsx to use new text formatting for testing purposes
2015-09-14 09:19:26 -04:00
hmhealey
91f258c725
Added handling for @mentions to the new text formatting
2015-09-14 09:19:26 -04:00
hmhealey
2d2939576c
Added skeleton for new text formatting code which will replace textToJsx
2015-09-14 09:19:26 -04:00
Christopher Speller
c3742aef71
Merge pull request #648 from mattermost/PLT-12
...
PLT-12: Work in progress for Admin Console UI
2015-09-14 08:58:53 -04:00
Joram Wilander
75721b5cb5
Merge pull request #672 from asaadmahmoodspin/ui-changes
...
PLT-217 - Improving horizontal scrollbar in LHS menu
2015-09-14 08:54:34 -04:00
Antti Ahti
406ea2370a
Clean installed Go dependencies
...
If these are not cleaned it can cause problems when switching between different Go versions. Especially when downgrading Go.
2015-09-14 15:30:51 +03:00
Christopher Speller
b2378f433e
Merge pull request #663 from mattermost/it33-patch-4
...
Link Code Contribution Guidelines from TOC
2015-09-14 08:21:42 -04:00
Christopher Speller
f765ceb918
Merge pull request #660 from mattermost/it33-patch-3
...
Update CHANGELOG with info on recent commits
2015-09-14 08:21:24 -04:00
Christopher Speller
447363262e
Merge pull request #655 from mattermost/content-type
...
Set default Content-Type to application/json for all API requests
2015-09-14 08:19:51 -04:00
Asaad Mahmood
45b859ca74
PLT-217 - Improving horizontal scrollbar in LHS menu
2015-09-14 14:19:31 +05:00
it33
d707de14d7
Updating MaxUsersPerTeam error msg
...
This message is displayed to a person attempting to sign-up for a new team, and "You've reached the limit" phrasing is confusing because it refers to the team, not the person signing up for the team.
2015-09-13 07:27:58 -07:00
nickago
543ce8b4be
WIP Added base video player
2015-09-12 18:19:17 -07:00
Chengwei Yang
fda314f27f
Fix coding style: replace tab with whitespace in mattermost config
...
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com >
2015-09-13 08:02:53 +08:00
it33
a9a7efbe98
Merge pull request #664 from mattermost/it33-patch-1
...
Removing "Alpha" from Docker Hub README
2015-09-12 11:16:18 -07:00
it33
f3798a983d
Removing "Alpha" from Docker Hub README
2015-09-12 11:09:29 -07:00
it33
e59fb27b86
Merge pull request #662 from mattermost/it33-patch-1
...
Adding "Get Involved" section to README
2015-09-12 09:19:29 -07:00
it33
18858f4c79
Link Code Contribution Guidelines from TOC
2015-09-12 09:14:28 -07:00
it33
465aa13504
Adding "Get Involved" section to README
2015-09-12 09:09:15 -07:00
JoramWilander
27e59c32f9
Set default Content-Type to application/json for all API requests
2015-09-12 10:26:24 -04:00
Joram Wilander
7f491bdb17
Merge pull request #658 from mattermost/it33-patch-1
...
Fixed broken links in doc/README.md
2015-09-12 10:14:59 -04:00
it33
186bb7d239
Update CHANGELOG with info on recent commits
2015-09-12 00:57:47 -07:00
it33
7ec3e74f8c
Merge pull request #659 from mattermost/it33-patch-1-1
...
Create code-contribution.md
2015-09-12 00:49:32 -07:00
it33
3d597905fb
Create code-contribution.md
2015-09-12 00:43:03 -07:00
it33
efca6fb463
Fixed broken links in doc/README.md
2015-09-12 00:14:48 -07:00
Corey Hulen
3b4002bc14
Merge pull request #656 from lfbrock/patch-7
...
Updated developer install instructions
2015-09-11 16:48:57 -07:00
Corey Hulen
1ceb6c619a
Merge pull request #654 from hmhealey/plt198
...
PLT-198 Fix unit tests on Go 1.5.1
2015-09-11 11:44:54 -07:00
=Corey Hulen
714f47e015
Merge branch 'master' into PLT-12
2015-09-11 09:59:32 -07:00
