| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge async_client getMe changes | JoramWilander | 2015-08-14 | 1 | -6/+6 |
| | | |||||
| * | reformat login.jsx to meet style guide | JoramWilander | 2015-08-14 | 1 | -48/+54 |
| | | |||||
| * | incorporate asaad's UI updates for google sign-up | JoramWilander | 2015-08-14 | 3 | -1/+18 |
| | | |||||
| * | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 9 | -63/+85 |
| | | |||||
| * | initial server implementation for using google as a single-sign-on oauth service | JoramWilander | 2015-08-14 | 1 | -3/+6 |
| | | |||||
| * | Merge pull request #360 from rgarmsen2295/mm-375d | Joram Wilander | 2015-08-14 | 19 | -119/+2065 |
| |\ | | | | | MM-375 Adds text formatting features using a modified version of the marked js library | ||||
| | * | Cosmetic refactoring of the notifyMe function in utils.jsx and removed ↵ | Reed Garmsen | 2015-08-12 | 3 | -452/+24 |
| | | | | | | | | | unnecessary files | ||||
| | * | Minor change to bold and italic parsing to be more similar to code parsing | Reed Garmsen | 2015-08-12 | 1 | -2/+2 |
| | | | |||||
| | * | Cosmetic refactoring of post_body.jsx | Reed Garmsen | 2015-08-12 | 5 | -66/+46 |
| | | | |||||
| | * | Cosmetic refactoring of textToJsx function | Reed Garmsen | 2015-08-12 | 1 | -82/+131 |
| | | | |||||
| | * | Implemented basic text formatting package using a modfied version of the ↵ | Reed Garmsen | 2015-08-12 | 21 | -42/+2387 |
| | | | | | | | | | marked js library. Supports *bold*, _italics_, and `code` | ||||
| * | | Merge pull request #370 from hmhealey/mm1812 | Christopher Speller | 2015-08-14 | 8 | -292/+511 |
| |\ \ | | | | | | | MM-1812 Provide warnings on team invite screens when email is disabled | ||||
| | * | | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵ | hmhealey | 2015-08-13 | 3 | -23/+4 |
| | | | | | | | | | | | | | to use ConfigStore | ||||
| | * | | Added ConfigStore that is populated from the server | hmhealey | 2015-08-13 | 6 | -3/+107 |
| | | | | |||||
| | * | | Reformatted code to match the style guide | hmhealey | 2015-08-11 | 3 | -262/+306 |
| | | | | |||||
| | * | | Disabled the invite members dialog when email is disabled on the server | hmhealey | 2015-08-11 | 2 | -11/+56 |
| | | | | |||||
| | * | | Disabled the invite email portion of the team setup when email is disabled ↵ | hmhealey | 2015-08-11 | 1 | -23/+47 |
| | | | | | | | | | | | | | on the server | ||||
| | * | | Added initial api to allow clientside code to query serverside configuration | hmhealey | 2015-08-11 | 1 | -0/+21 |
| | | | | |||||
| * | | | Merge pull request #365 from mattermost/mm-1700 | Christopher Speller | 2015-08-14 | 10 | -365/+549 |
| |\ \ \ | | | | | | | | | MM-1700 don't pull all channel data all the time | ||||
| | * | | | removed underscores from function names in channel_store | JoramWilander | 2015-08-13 | 1 | -34/+34 |
| | | | | | |||||
| | * | | | merge fix | JoramWilander | 2015-08-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | switch to channel after creation | JoramWilander | 2015-08-11 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | format channel_store to more closely match style guide and sort channels in ↵ | JoramWilander | 2015-08-11 | 2 | -226/+230 |
| | | | | | | | | | | | | | | | | | channel store over sidebar | ||||
| | * | | | don't refresh page on channel creation and ignore case when sorting channels ↵ | JoramWilander | 2015-08-11 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | in sidebar | ||||
| | * | | | update rename channel modal to not refresh page on channel name change | JoramWilander | 2015-08-11 | 3 | -13/+39 |
| | | | | | |||||
| | * | | | incorporate channel updateAt into channel counts and pull channel data on ↵ | JoramWilander | 2015-08-11 | 3 | -4/+5 |
| | | | | | | | | | | | | | | | | | channel update | ||||
| | * | | | added getChannelCounts service and refactored the client to more ↵ | JoramWilander | 2015-08-11 | 6 | -165/+243 |
| | | | | | | | | | | | | | | | | | intelligently pull channel data | ||||
| | * | | | added getChannel api service and use that over getChannels where appropriate ↵ | JoramWilander | 2015-08-11 | 6 | -8/+83 |
| | |/ / | | | | | | | | | | on client | ||||
| * | | | Merge pull request #371 from nickago/MM-1229 | Joram Wilander | 2015-08-13 | 1 | -19/+36 |
| |\ \ \ | | | | | | | | | MM-1229 Mobile client display public link in same tab instead of new tab | ||||
| | * | | | Added cosmetic refactoring | nickago | 2015-08-13 | 1 | -17/+23 |
| | | | | | |||||
| | * | | | get public link now displays in the same window pane on mobile, but in a new ↵ | nickago | 2015-08-11 | 1 | -3/+14 |
| | |/ / | | | | | | | | | | tab on desktop. Also added proptypes | ||||
| * | | | Merge pull request #368 from nickago/MM-1911 | Harrison Healey | 2015-08-12 | 2 | -17/+18 |
| |\ \ \ | | | | | | | | | MM 1911 Added support for .jpeg in addition to .jpg | ||||
| | * | | | Cosmetic refactoring | nickago | 2015-08-11 | 1 | -10/+17 |
| | | | | | |||||
| | * | | | Added server side validation of jpegs as images | nickago | 2015-08-11 | 1 | -6/+0 |
| | | | | | |||||
| | * | | | Added jpeg's to list of image types | nickago | 2015-08-11 | 1 | -1/+1 |
| | |/ / | |||||
| * | / | Changed Image to File since we preview files | nickago | 2015-08-12 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Fixed typo | nickago | 2015-08-11 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #359 from hmhealey/mm1770 | Christopher Speller | 2015-08-11 | 7 | -287/+397 |
| |\ | | | | | MM-1770 Add the ability to cancel in-progress file uploads | ||||
| | * | Changed PostStore.getDraft/getCommentDraft to return an empty draft instead ↵ | hmhealey | 2015-08-11 | 3 | -95/+15 |
| | | | | | | | | | of null when no draft is found | ||||
| | * | Formatted CreateComment, CreatePost, and FileUpload React components to ↵ | hmhealey | 2015-08-10 | 3 | -150/+208 |
| | | | | | | | | | match the style guide | ||||
| | * | Changed file upload components to properly remove previews for failed uploads | hmhealey | 2015-08-10 | 3 | -6/+36 |
| | | | |||||
| | * | Changed post drafts to maintain a store a unique id for each file upload to ↵ | hmhealey | 2015-08-10 | 5 | -57/+71 |
| | | | | | | | | | fix issues with duplicate file names | ||||
| | * | Added the ability to cancel file uploads on comments | hmhealey | 2015-08-10 | 1 | -5/+15 |
| | | | |||||
| | * | Added the ability to cancel file uploads on posts | hmhealey | 2015-08-10 | 4 | -10/+62 |
| | | | |||||
| | * | Changed post drafts to maintain a list of the names of uploading files ↵ | hmhealey | 2015-08-10 | 5 | -105/+131 |
| | | | | | | | | | instead of just a count | ||||
| * | | Merge pull request #354 from nickago/MM-1598 | Christopher Speller | 2015-08-11 | 1 | -99/+124 |
| |\ \ | | | | | | | MM-1598 Left and right arrow keys now scroll through pictures/files in preview mode | ||||
| | * | | Added event to window scope so react can autobind | nickago | 2015-08-10 | 1 | -10/+11 |
| | | | | |||||
| | * | | Added cosmetic refactoring | nickago | 2015-08-06 | 1 | -100/+113 |
| | | | | |||||
| | * | | Left and right arrows now scroll through files | nickago | 2015-08-06 | 1 | -0/+11 |
| | | | | |||||
| * | | | Merge pull request #353 from hmhealey/mm401 | Christopher Speller | 2015-08-11 | 2 | -80/+159 |
| |\ \ \ | | | | | | | | | MM-401 Add indicators to the sidebar for offscreen unread channels | ||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |