Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #370 from hmhealey/mm1812 | Christopher Speller | 2015-08-14 | 10 | -292/+546 |
|\ | | | | | MM-1812 Provide warnings on team invite screens when email is disabled | ||||
| * | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵ | hmhealey | 2015-08-13 | 4 | -28/+4 |
| | | | | | | | | to use ConfigStore | ||||
| * | Added ConfigStore that is populated from the server | hmhealey | 2015-08-13 | 7 | -3/+123 |
| | | |||||
| * | 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 | 3 | -0/+45 |
| | | |||||
* | | Merge pull request #365 from mattermost/mm-1700 | Christopher Speller | 2015-08-14 | 18 | -367/+869 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | fixed channel counts etag to only update when appropriate | JoramWilander | 2015-08-11 | 2 | -4/+13 |
| | | | |||||
| * | | fix channelIdWithCountAndUpdateAt naming to be proper camel case | JoramWilander | 2015-08-11 | 1 | -2/+2 |
| | | | |||||
| * | | change getChannel api service to not register as user activity | JoramWilander | 2015-08-11 | 1 | -1/+1 |
| | | | |||||
| * | | add etag cache testing to api GetChannelCounts unit test | JoramWilander | 2015-08-11 | 1 | -0/+7 |
| | | | |||||
| * | | added api unit test for GetChannelCounts | JoramWilander | 2015-08-11 | 2 | -0/+43 |
| | | | |||||
| * | | added store unit test for GetChannelCounts | JoramWilander | 2015-08-11 | 1 | -0/+47 |
| | | | |||||
| * | | incorporate channel updateAt into channel counts and pull channel data on ↵ | JoramWilander | 2015-08-11 | 5 | -11/+22 |
| | | | | | | | | | | | | channel update | ||||
| * | | added getChannelCounts service and refactored the client to more ↵ | JoramWilander | 2015-08-11 | 10 | -165/+340 |
| | | | | | | | | | | | | intelligently pull channel data | ||||
| * | | added getChannel api service and use that over getChannels where appropriate ↵ | JoramWilander | 2015-08-11 | 10 | -10/+190 |
| |/ | | | | | | | 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 | 3 | -19/+20 |
|\ \ | | | | | | | MM 1911 Added support for .jpeg in addition to .jpg | ||||
| * | | Fixed typo | nickago | 2015-08-12 | 1 | -1/+1 |
| | | | |||||
| * | | Cosmetic refactoring | nickago | 2015-08-11 | 1 | -10/+17 |
| | | | |||||
| * | | Added server side validation of jpegs as images | nickago | 2015-08-11 | 2 | -8/+2 |
| | | | |||||
| * | | Added jpeg's to list of image types | nickago | 2015-08-11 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #373 from nickago/MM-1868 | Joram Wilander | 2015-08-12 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1868 Changed wording for broader definition of what is previewed | ||||
| * | | Changed Image to File since we preview files | nickago | 2015-08-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #367 from mattermost/mm-1884 | Joram Wilander | 2015-08-12 | 7 | -9/+317 |
|\ \ \ | | | | | | | | | MM-1184 Updating dockerfiles for latest master and osx | ||||
| * | | | Updating dockerfiles to allow for previewing of latest master and fixing ↵ | Christopher Speller | 2015-08-11 | 7 | -9/+317 |
| | | | | | | | | | | | | | | | | local docker build so it works on osx | ||||
* | | | | Merge pull request #363 from mattermost/travis-s3-deploy | Joram Wilander | 2015-08-12 | 1 | -7/+22 |
|\ \ \ \ | |_|/ / |/| | | | Adding S3 deployment to travis ci | ||||
| * | | | Adding S3 deployment to travis ci | Christopher Speller | 2015-08-10 | 1 | -7/+22 |
| | | | | |||||
* | | | | Merge pull request #366 from nickago/MM-1914 | Joram Wilander | 2015-08-12 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | MM-1914 Fixed typo | ||||
| * | | | Fixed typo | nickago | 2015-08-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #359 from hmhealey/mm1770 | Christopher Speller | 2015-08-11 | 9 | -288/+405 |
|\ \ \ | | | | | | | | | 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 | 7 | -58/+79 |
| | | | | | | | | | | | | | | | | 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 |
| | | | | |