Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 | 26 | -623/+18344 |
|\ \ | | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | ||||
| * | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 26 | -623/+18344 |
| | | | |||||
* | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -4/+3 |
|\ \ \ | | | | | | | | | Blank Content-Type for file GETs. | ||||
| * | | | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 1 | -4/+3 |
| | | | | |||||
* | | | | 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 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | 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 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | channel names into valid mattermost names. | ||||
* | | | 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 | 13 | -34/+1134 |
|\ \ | | | | | | | PLT-12: Work in progress for Admin Console UI | ||||
| * \ | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 6 | -20/+28 |
| |\ \ | |||||
| * | | | Cleaning up html | =Corey Hulen | 2015-09-10 | 6 | -44/+53 |
| | | | | |||||
| * | | | merging | =Corey Hulen | 2015-09-10 | 28 | -184/+626 |
| |\ \ \ | |||||
| * | | | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 8 | -353/+901 |
| | | | | | |||||
| * | | | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-03 | 45 | -257/+434 |
| |\ \ \ \ | |||||
| * | | | | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 3 | -0/+545 |
| | | | | | | |||||
| * | | | | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 7 | -41/+33 |
| | | | | | | |||||
* | | | | | | PLT-217 - Improving horizontal scrollbar in LHS menu | Asaad Mahmood | 2015-09-14 | 2 | -1/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #654 from hmhealey/plt198 | Corey Hulen | 2015-09-11 | 1 | -2/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-198 Fix unit tests on Go 1.5.1 | ||||
| * | | | | PLT-198 Added a small delay to one of the web tests to allow the server to ↵ | hmhealey | 2015-09-11 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | get fully set up | ||||
* | | | | | Merge pull request #657 from mattermost/fix-npm-package | Corey Hulen | 2015-09-11 | 1 | -14/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Change versioning to exact versions in package.json | ||||
| * | | | | | Change versioning to exact versions in package.json | Christopher Speller | 2015-09-11 | 1 | -14/+14 |
| |/ / / / | |||||
* / / / / | Fix load more posts bug. | JoramWilander | 2015-09-11 | 2 | -4/+10 |
|/ / / / | |||||
* | | / | Updating UI for modals and notification bar | Asaad Mahmood | 2015-09-11 | 3 | -2/+4 |
| |_|/ |/| | | |||||
* | | | Removing border from first tr tds in more modal | Asaad Mahmood | 2015-09-10 | 1 | -0/+5 |
| | | | |||||
* | | | PM-183 and PM-162 - Updating UI for more modal and unread notification bar | Asaad Mahmood | 2015-09-10 | 2 | -7/+8 |
| | | | |||||
* | | | Merge release branch 'release-0.7.0' | Christopher Speller | 2015-09-10 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Set EmailVerified to true for users signing up with SSO. | JoramWilander | 2015-09-10 | 1 | -0/+1 |
| | | | | |||||
* | | | | Fixing attachment button in RHS | Asaad Mahmood | 2015-09-10 | 1 | -7/+12 |
| | | | |