summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Changed one instance of textToJsx to use new text formatting for testing purp...hmhealey2015-09-141-1/+9
* Added handling for @mentions to the new text formattinghmhealey2015-09-141-9/+54
* Added skeleton for new text formatting code which will replace textToJsxhmhealey2015-09-141-0/+36
* Merge pull request #648 from mattermost/PLT-12Christopher Speller2015-09-1413-34/+1134
|\
| * Merge branch 'master' into PLT-12=Corey Hulen2015-09-116-20/+28
| |\
| * | Cleaning up html=Corey Hulen2015-09-106-44/+53
| * | merging=Corey Hulen2015-09-1028-184/+626
| |\ \
| * | | PLT-12 UI framework for admin console=Corey Hulen2015-09-108-353/+901
| * | | Adding unit tests for cmd line=Corey Hulen2015-09-041-1/+1
| * | | Merge branch 'master' into PLT-12=Corey Hulen2015-09-0345-257/+434
| |\ \ \
| * | | | Adding initial admin console html pages=Corey Hulen2015-09-033-0/+545
| * | | | Adding initial admin console html pages=Corey Hulen2015-09-037-41/+33
* | | | | PLT-217 - Improving horizontal scrollbar in LHS menuAsaad Mahmood2015-09-142-1/+6
* | | | | Merge pull request #654 from hmhealey/plt198Corey Hulen2015-09-111-2/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | PLT-198 Added a small delay to one of the web tests to allow the server to ge...hmhealey2015-09-111-2/+7
* | | | | Merge pull request #657 from mattermost/fix-npm-packageCorey Hulen2015-09-111-14/+14
|\ \ \ \ \
| * | | | | Change versioning to exact versions in package.jsonChristopher Speller2015-09-111-14/+14
| |/ / / /
* / / / / Fix load more posts bug.JoramWilander2015-09-112-4/+10
|/ / / /
* | | / Updating UI for modals and notification barAsaad Mahmood2015-09-113-2/+4
| |_|/ |/| |
* | | Removing border from first tr tds in more modalAsaad Mahmood2015-09-101-0/+5
* | | PM-183 and PM-162 - Updating UI for more modal and unread notification barAsaad Mahmood2015-09-102-7/+8
* | | Merge release branch 'release-0.7.0'Christopher Speller2015-09-101-0/+1
|\ \ \
| * | | Set EmailVerified to true for users signing up with SSO.JoramWilander2015-09-101-0/+1
* | | | Fixing attachment button in RHSAsaad Mahmood2015-09-101-7/+12
* | | | Merge pull request #635 from hmhealey/plt159Christopher Speller2015-09-101-3/+5
|\ \ \ \
| * | | | PLT-159 Changed unread posts indicator to not be shown for the current channelhmhealey2015-09-091-3/+5
* | | | | Merge pull request #633 from asaadmahmoodspin/ui-changesJoram Wilander2015-09-103-3/+11
|\ \ \ \ \
| * | | | | PLT-188 - Moving attachment button to the left and fixing buttons in modal he...Asaad Mahmood2015-09-093-3/+11
| |/ / / /
* | | | | Adding minor hover changes for settingsAsaad Mahmood2015-09-092-1/+14
* | | | | MM-1825 - Improving UI for settingsAsaad Mahmood2015-09-094-24/+28
* | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866Asaad Mahmood2015-09-098-25/+42
|\| | | |
| * | | | Fix race condition where switching between two channels that both had new mes...JoramWilander2015-09-091-3/+7
| * | | | Merge pull request #625 from asaadmahmoodspin/ui-changesChristopher Speller2015-09-097-22/+35
| |\ \ \ \
| | * | | | Adding symbol instead of × for close iconAsaad Mahmood2015-09-091-1/+1
| | * | | | Removing jsx container from × in team_import_tab.jsxAsaad Mahmood2015-09-092-2/+2
| | * | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changesAsaad Mahmood2015-09-097-1/+160
| | |\ \ \ \
| | * | | | | Improving formatting in team_import_tab.jsxAsaad Mahmood2015-09-081-5/+7
| | * | | | | UI changes for various ticketsAsaad Mahmood2015-09-087-18/+29
* | | | | | | MM-1866 - Adding download icon and adding download link for both file title a...Asaad Mahmood2015-09-092-4/+24
|/ / / / / /
* | | | | | Merge pull request #628 from mattermost/mm-2127Christopher Speller2015-09-093-20/+60
|\ \ \ \ \ \
| * | | | | | Added send icon button to create post control for mobile view.JoramWilander2015-09-083-20/+60
| |/ / / / /
* | | | | | Merge pull request #623 from mattermost/plt-35Christopher Speller2015-09-098-106/+250
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add post list container to hold mounted post lists for faster rendering/chann...JoramWilander2015-09-088-106/+250
| |/ / / /
* | | | | Merge pull request #626 from mattermost/mm-2125Christopher Speller2015-09-081-0/+5
|\ \ \ \ \
| * | | | | Resize create post control when file previews are added.JoramWilander2015-09-081-0/+5
| |/ / / /
* | | | | Merge pull request #602 from mattermost/mm-1409Joram Wilander2015-09-084-0/+118
|\ \ \ \ \
| * | | | | Adding ability to export data from mattermostChristopher Speller2015-09-044-0/+118
| | |_|_|/ | |/| | |
* | | | | Merge pull request #593 from nickago/MM-1892Corey Hulen2015-09-082-1/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added refactoring to pass style checknickago2015-09-041-5/+6
| * | | | Added help text to username, nickname, and fullnamenickago2015-09-042-1/+36