Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 59 | -733/+18562 | |
| |\ \ \ \ | ||||||
| * | | | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 14 | -15/+338 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #685 from mattermost/update-style-guide | Harrison Healey | 2015-09-15 | 1 | -8/+11 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updating style guide | |||||
| * | | | | | | Updating style guide | Christopher Speller | 2015-09-15 | 1 | -8/+11 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #684 from mattermost/fix-text-overflow | Corey Hulen | 2015-09-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixing long channel name overflow by changing text to Edit | |||||
| * | | | | | | Fixing long channel name overflow by changing text to Edit | Christopher Speller | 2015-09-15 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #682 from mattermost/nc-patch | Joram Wilander | 2015-09-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fixing cutoff team name in new channel modal. | |||||
| * | | | | | Fixing cutoff team name in new channel modal | Christopher Speller | 2015-09-15 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #673 from apaatsio/clean-go-deps | Joram Wilander | 2015-09-15 | 1 | -0/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Clean installed Go dependencies | |||||
| * | | | | | Clean installed Go dependencies | Antti Ahti | 2015-09-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | If these are not cleaned it can cause problems when switching between different Go versions. Especially when downgrading Go. | |||||
* | | | | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 9 | -220/+308 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | MM-1900 Removed textToJsx | |||||
| * | | | | | Renamed text formatting tokens so that there should be significantly less ↵ | hmhealey | 2015-09-14 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | chance of having conflicting tokens | |||||
| * | | | | | Removed textToJsx! | hmhealey | 2015-09-14 | 1 | -199/+0 | |
| | | | | | | ||||||
| * | | | | | Removed all calls to textToJsx and replaced them with calls to TextFormatting | hmhealey | 2015-09-14 | 7 | -28/+39 | |
| | | | | | | ||||||
| * | | | | | Cleaned up TextFormatting and added a default click handler for hashtags and ↵ | hmhealey | 2015-09-14 | 1 | -47/+74 | |
| | | | | | | | | | | | | | | | | | | | | | | | | @mentions | |||||
| * | | | | | Added highlighting of search terms to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+41 | |
| | | | | | | ||||||
| * | | | | | Added autolinking of hashtags to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+48 | |
| | | | | | | ||||||
| * | | | | | Added autolinking of urls to the new text formatting | hmhealey | 2015-09-14 | 1 | -4/+35 | |
| | | | | | | ||||||
| * | | | | | Added highlighting when the current user is mentioned to the new text formatting | hmhealey | 2015-09-14 | 1 | -17/+69 | |
| | | | | | | ||||||
| * | | | | | Changed one instance of textToJsx to use new text formatting for testing ↵ | hmhealey | 2015-09-14 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | purposes | |||||
| * | | | | | Added handling for @mentions to the new text formatting | hmhealey | 2015-09-14 | 1 | -9/+54 | |
| | | | | | | ||||||
| * | | | | | Added skeleton for new text formatting code which will replace textToJsx | hmhealey | 2015-09-14 | 1 | -0/+36 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 27 | -627/+18350 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | |||||
| * | | | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 27 | -627/+18350 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 2 | -4/+4 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Blank Content-Type for file GETs. | |||||
| * | | | | | | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 2 | -4/+4 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #674 from Trozz/PLT-41 | Joram Wilander | 2015-09-14 | 4 | -7/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-41 Automatically convert uppercase letters to lowercase in username input box. | |||||
| * | | | | | | | update remaining web files tolowercase | Michael Leer | 2015-09-14 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | replace lowerName with name | Michael Leer | 2015-09-14 | 1 | -3/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator. | |||||
| * | | | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically convert uppercase letters to lowercase in username input box. Validator not changed. | |||||
* | | | | | | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 4 | -6/+21 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names. | |||||
| * | | | | | | | Allowing underscores in channel names. Added conversion of some slack ↵ | Christopher Speller | 2015-09-14 | 4 | -6/+21 | |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | channel names into valid mattermost names. | |||||
* | | | | | | | Merge pull request #671 from mattermost/it33-patch-1 | Christopher Speller | 2015-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Updating MaxUsersPerTeam error msg | |||||
| * | | | | | | Updating MaxUsersPerTeam error msg | it33 | 2015-09-13 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | | | | | | | 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. | |||||
* | | | | | | Merge pull request #668 from nickago/MM-1958 | Corey Hulen | 2015-09-14 | 1 | -0/+18 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | MM-1958 please read comment, base video player | |||||
| * | | | | | WIP Added base video player | nickago | 2015-09-12 | 1 | -0/+18 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 25 | -131/+1625 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-12: Work in progress for Admin Console UI | |||||
| * \ \ \ \ | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 8 | -33/+35 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN | =Corey Hulen | 2015-09-11 | 7 | -18/+18 | |
| | | | | | | | ||||||
| * | | | | | | Fixing help text based on feedback | =Corey Hulen | 2015-09-11 | 1 | -3/+3 | |
| | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Cleaning up html | =Corey Hulen | 2015-09-10 | 6 | -44/+53 | |
| | | | | | | ||||||
| * | | | | | merging | =Corey Hulen | 2015-09-10 | 52 | -238/+1464 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Fixing unit test | =Corey Hulen | 2015-09-10 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | re-enabling system_admin | =Corey Hulen | 2015-09-10 | 1 | -5/+0 | |
| | | | | | | | ||||||
| * | | | | | | Adding back admin unit test | =Corey Hulen | 2015-09-10 | 2 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 11 | -368/+924 | |
| | | | | | | | ||||||
| * | | | | | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 8 | -17/+25 | |
| | | | | | | | ||||||
| * | | | | | | Adding cmd line options | =Corey Hulen | 2015-09-04 | 11 | -96/+472 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-03 | 47 | -259/+436 | |
| |\ \ \ \ \ \ |