Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ported AccessHistoryModal and ActivityLogModal to React-Bootstrap | hmhealey | 2015-11-02 | 4 | -108/+75 |
| | |||||
* | Ported ConfirmModal and InviteMemberModal to React-Bootstrap | hmhealey | 2015-11-02 | 6 | -144/+142 |
| | |||||
* | Merge pull request #1249 from mattermost/plt-823 | Harrison Healey | 2015-11-02 | 22 | -1006/+1065 |
|\ | | | | | PLT-823 Refactor of center channel | ||||
| * | Removing useless resize alert function in PostBody | Christopher Speller | 2015-11-02 | 3 | -10/+2 |
| | | |||||
| * | Some renaming | Christopher Speller | 2015-11-02 | 11 | -54/+54 |
| | | |||||
| * | Hooking up external components | Christopher Speller | 2015-11-02 | 10 | -62/+217 |
| | | |||||
| * | Refactoring center channel | Christopher Speller | 2015-11-02 | 5 | -790/+676 |
| | | |||||
| * | Creating hierarchy | Christopher Speller | 2015-11-02 | 7 | -122/+148 |
| | | |||||
* | | Merge pull request #1268 from mattermost/plt-514 | Christopher Speller | 2015-11-02 | 2 | -16/+25 |
|\ \ | | | | | | | PLT-514 Validate callback urls on the server and add help text to outgoing webhooks | ||||
| * | | Validate callback urls on the server and add help text to outgoing webhooks | JoramWilander | 2015-11-02 | 2 | -16/+25 |
| | | | |||||
* | | | Merge pull request #1259 from stasvovk/PLT-639 | Christopher Speller | 2015-11-02 | 4 | -6/+120 |
|\ \ \ | |/ / |/| | | PLT-639: display full name, nickname or username in direct messages | ||||
| * | | fixed errors in displayUsername | Stas Vovk | 2015-11-02 | 1 | -3/+3 |
| | | | |||||
| * | | display full name, nickname or username in direct messages | Stas Vovk | 2015-11-01 | 4 | -6/+120 |
| | | | |||||
* | | | Merge pull request #1260 from vinnymac/fix/browser-detection | Harrison Healey | 2015-11-02 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | fix isBrowserEdge typo | ||||
| * | | fix isBrowserEdge typo | Vincent Taverna | 2015-11-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1264 from girishso/team-name-lt4 | Christopher Speller | 2015-11-02 | 2 | -2/+5 |
|\ \ | | | | | | | PLT-835: Show error message when team name is fewer than 4 characters | ||||
| * | | Update the UI to check for 4 characters to match the server | Girish S | 2015-11-02 | 2 | -4/+4 |
| | | | | | | | | | | | | fixes PLT-692 | ||||
| * | | Show error message when team name is fewer than 4 characters | Girish S | 2015-11-02 | 1 | -0/+3 |
| |/ | | | | | | | | | I have still kept the length validation in team_signup_url_page.jsx in case user chooses the url shorter than 4 characters | ||||
* | | Merge pull request #1222 from rgarmsen2295/plt-550 | Joram Wilander | 2015-11-02 | 2 | -1/+6 |
|\ \ | | | | | | | PLT-550 Fixed various issues with commenting on recently deleted posts | ||||
| * | | Fixed various issues with commenting on recently deleted posts | Reed Garmsen | 2015-10-30 | 2 | -1/+6 |
| | | | |||||
* | | | Merge pull request #1257 from florianorben/align_channel_header | Christopher Speller | 2015-11-02 | 3 | -2/+8 |
|\ \ \ | | | | | | | | | correctly align channel header with sidebar header | ||||
| * | | | correctly align channel header with sidebar header | Florian Orben | 2015-10-31 | 3 | -2/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #1253 from rgarmsen2295/plt-799 | Christopher Speller | 2015-11-02 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | PLT-799 Turn-off browser auto-completion in the search bar | ||||
| * | | | Turn-off default auto-completion in the search bar | Reed Garmsen | 2015-10-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | Update about.html | it33 | 2015-11-01 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1248 from mattermost/it33-patch-1 | Corey Hulen | 2015-10-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed typo | ||||
| * | | | Fixed typo | it33 | 2015-10-30 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1251 from rgarmsen2295/plt-941 | Corey Hulen | 2015-10-30 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | PLT-941 Adds Safari 7 and IE10 to the list of unsupported browsers | ||||
| * | | Added Safari 7 and IE10 to the list of unsupported browsers | Reed Garmsen | 2015-10-30 | 1 | -2/+2 |
| |/ | |||||
* / | Fixing eslint not recursing | Christopher Speller | 2015-10-30 | 3 | -8/+6 |
|/ | |||||
* | Merge pull request #1238 from girishso/webhook-creator-notifs | Corey Hulen | 2015-10-30 | 1 | -1/+1 |
|\ | | | | | display webhook notifications to the creator of webhook | ||||
| * | display webhook notifications to the creator of webhook | Girish S | 2015-10-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1236 from girishso/webhook-notification | Corey Hulen | 2015-10-30 | 1 | -1/+3 |
|\ \ | | | | | | | Show usernames overridden by Incoming Webhooks in notification messages. | ||||
| * | | Show usernames overridden by Incoming Webhooks in notification messages. | Girish S | 2015-10-30 | 1 | -1/+3 |
| |/ | | | | | | | fixes PLT-856 | ||||
* | | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 15 | -72/+545 |
|\ \ | | | | | | | PLT-340 allow team directory and open invites | ||||
| * | | Adding error when enabling team dir without global prop being set. | =Corey Hulen | 2015-10-29 | 1 | -2/+9 |
| | | | |||||
| * | | Moving single team redirect to backend | =Corey Hulen | 2015-10-28 | 2 | -8/+5 |
| | | | |||||
| * | | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-28 | 4 | -13/+10 |
| |\ \ | |||||
| * | | | Removing console.log | =Corey Hulen | 2015-10-27 | 1 | -2/+0 |
| | | | | |||||
| * | | | PLT-340 | =Corey Hulen | 2015-10-27 | 15 | -72/+543 |
| | | | | |||||
* | | | | Merge pull request #1220 from florianorben/PLT-395 | Harrison Healey | 2015-10-30 | 14 | -2/+231 |
|\ \ \ \ | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks | ||||
| * | | | | allow code theme to be shareable | Florian Orben | 2015-10-29 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | use XML syntax highlighting if provided language is html | Florian Orben | 2015-10-29 | 1 | -4/+10 |
| | | | | | |||||
| * | | | | escape user input | Florian Orben | 2015-10-29 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add java and ini language | Florian Orben | 2015-10-29 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common | ||||
| * | | | | fix markup if code is of unknown language | Florian Orben | 2015-10-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | code style theme chooser | Florian Orben | 2015-10-29 | 9 | -2/+111 |
| | | | | | |||||
| * | | | | highlight code in markdown blocks | Florian Orben | 2015-10-29 | 6 | -0/+103 |
| | | | | | |||||
* | | | | | Merge pull request #1233 from hmhealey/plt600 | Christopher Speller | 2015-10-30 | 2 | -5/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-600 Added help text for the channel header and purpose dialogs | ||||
| * | | | | Added help text for the channel header and purpose dialogs | hmhealey | 2015-10-29 | 2 | -5/+12 |
| |/ / / |