summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-2765-395/+1881
|\ | | | | | | ui-improvements
| * Added known issue for deleted channelsit332015-10-271-1/+2
| |
| * Merge pull request #1197 from rgarmsen2295/plt-166Christopher Speller2015-10-271-1/+6
| |\ | | | | | | PLT-166 Fixed issue with missing help text for @all and @channel in mention list
| | * Fixed issue with missing help text for @all and @channel in mention listReed Garmsen2015-10-261-1/+6
| | |
| * | Merge pull request #1184 from girishso/add-trailing-slashChristopher Speller2015-10-271-0/+7
| |\ \ | | | | | | | | adds trailing slash if missing from Directory in config.json
| | * | adds trailing slash if missing from Directory in config.jsonGirish S2015-10-271-0/+7
| | | | | | | | | | | | | | | | | | | | does it only if "DriverName" == model.IMAGE_DRIVER_LOCAL, not sure if required for other drivers too
| * | | Merge pull request #1174 from florianorben/member-popoverChristopher Speller2015-10-274-67/+215
| |\ \ \ | | | | | | | | | | Add styling to channel member popover
| | * | | add helper method to initiate a direct channel chatFlorian Orben2015-10-263-87/+66
| | | | |
| | * | | use 'Overlay' instead if 'OverlayTrigger'Florian Orben2015-10-261-22/+28
| | | | |
| | * | | Add some to channel member popoverFlorian Orben2015-10-262-2/+165
| | | | |
| * | | | Merge pull request #1154 from girishso/username_symbolsChristopher Speller2015-10-272-4/+15
| |\ \ \ \ | | |_|/ / | |/| | | auto-link mentions with user names having symbols
| | * | | auto-link mentions with user names having symbolsGirish S2015-10-272-4/+15
| |/ / / | | | | | | | | | | | | this also handles the case where user_name having '_'
| * | | Merge pull request #1194 from mattermost/webhook-requestCorey Hulen2015-10-262-7/+25
| |\ \ \ | | | | | | | | | | Parse incoming webhook requests into model instead of string map
| | * | | Remove unused iconemoji fieldJoramWilander2015-10-261-1/+0
| | | | |
| | * | | Parse incoming webhook requsets into model instead of string mapJoramWilander2015-10-262-7/+26
| | | | |
| * | | | Merge pull request #1178 from mattermost/update-web-socket-helpCorey Hulen2015-10-262-2/+2
| |\ \ \ \ | | | | | | | | | | | | Update web socket help
| | * | | | Update helpit332015-10-251-1/+1
| | | | | |
| | * | | | Update websocket errorit332015-10-251-1/+1
| | | | | | | | | | | | | | | | | | Getting this error when websockets is properly configured and connection is just slow
| * | | | | Update Troubleshooting.mdit332015-10-261-0/+8
| | |_|_|/ | |/| | |
| * | | | Update README.mdit332015-10-261-0/+6
| | | | |
| * | | | Merge pull request #1192 from mattermost/PLT-828Christopher Speller2015-10-264-8/+12
| |\ \ \ \ | | |_|_|/ | |/| | | PLT-828 fixing db upgrade code
| | * | | PLT-828 fixing db upgrade code=Corey Hulen2015-10-264-8/+12
| | | | |
| * | | | Merge pull request #1164 from hmhealey/plt778Corey Hulen2015-10-267-87/+195
| |\ \ \ \ | | | | | | | | | | | | PLT-778 Changed post searching to allow searching by multiple users/channels
| | * | | | Moved logic for searching for posts by multiple users/channels into the sql ↵hmhealey2015-10-263-49/+73
| | | | | | | | | | | | | | | | | | | | | | | | query
| | * | | | Changed post searching to allow searching by multiple users/channelshmhealey2015-10-236-75/+159
| | | | | |
| * | | | | Merge pull request #1193 from hmhealey/plt798Corey Hulen2015-10-264-8/+38
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | PLT-798 Prevent image files larger than 4k resolution from being uploaded
| | * | | | Prevented image files larger than 4k resolution from being uploadedhmhealey2015-10-262-5/+29
| | | | | |
| | * | | | Fixed file upload and profile picture upload error display to work for ↵hmhealey2015-10-262-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | serverside errors
| * | | | | Merge pull request #1191 from mattermost/PLT-564Joram Wilander2015-10-261-12/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | PLT-564 removing auto-hide from error bar
| | * | | | | PLT-564 removing auto-hide from error bar=Corey Hulen2015-10-261-12/+0
| | | | | | |
| * | | | | | Merge pull request #1189 from mattermost/plt-762Joram Wilander2015-10-263-3/+4
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | PLT-762 Fix error message on leaving channel
| | * | | | | Fix error message on leaving channelJoramWilander2015-10-263-3/+4
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #1173 from florianorben/PLT-642Corey Hulen2015-10-261-13/+51
| |\ \ \ \ \ | | |_|/ / / | |/| | | | PLT-642: Browser tab alerts
| | * | | | rename methods and varibles to a more meaningful nameFlorian Orben2015-10-261-12/+13
| | | | | |
| | * | | | PLT-642: Browser tab alertsFlorian Orben2015-10-261-12/+49
| | | | | |
| * | | | | Merge pull request #1172 from florianorben/PLT-703Joram Wilander2015-10-264-18/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | PLT-703: Support multiple users being shown as typing underneath input boxes.
| | * | | | | rename getTypingText to updateTypingText and set component's state in itFlorian Orben2015-10-261-10/+16
| | | | | | |
| | * | | | | use constant value to check if to send a typing event for commentsFlorian Orben2015-10-261-1/+1
| | | | | | |
| | * | | | | PLT-703: Support multiple users being shown as typing underneath input boxes.Florian Orben2015-10-263-17/+35
| | |/ / / /
| * | | | | Merge pull request #1186 from mattermost/nginx-improvementCorey Hulen2015-10-261-5/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | | Adding more secure nginx instructions
| | * | | | Adding more secure nginx instructionsChristopher Speller2015-10-261-5/+6
| | | | | |
| * | | | | Adding linkit332015-10-261-1/+1
| | | | | |
| * | | | | Adding more GitLab 8.1 instructionsit332015-10-261-3/+18
| | |/ / / | |/| | |
| * | | | Merge pull request #1171 from ↵Harrison Healey2015-10-261-14/+48
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | trashcan/github-1130-handle-trailing-characters-after-user Handle trailing characters after user
| | * | | Fix highlighting of trailing punctuation for own usernamePat Lathem2015-10-251-4/+4
| | | | |
| | * | | Fix off by one errorPat Lathem2015-10-241-7/+7
| | | | |
| | * | | Remove trailing punctuation when parsing @username referencesPat Lathem2015-10-241-13/+47
| | | | |
| * | | | Merge pull request #1170 from florianorben/PLT-395Harrison Healey2015-10-2613-1/+219
| |\ \ \ \ | | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks
| | * | | | Add java and ini languageFlorian Orben2015-10-242-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common
| | * | | | fix markup if code is of unknown languageFlorian Orben2015-10-241-1/+1
| | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-17 15:37:53 +0000