Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #472 from rgarmsen2295/mm-1853 | Christopher Speller | 2015-08-27 | 6 | -8/+72 | |
|\ \ \ \ | | | | | | | | | | | MM-1853 Prevents users from typing more than 4000 characters into any any post/comment | |||||
| * | | | | Moved duplicate code into functions and added better handling of large paste ↵ | Reed Garmsen | 2015-08-26 | 4 | -31/+34 | |
| | | | | | | | | | | | | | | | | | | | | text dumps | |||||
| * | | | | Fixed issue with carriage returns being counted improperly in non-ie ↵ | Reed Garmsen | 2015-08-25 | 4 | -8/+43 | |
| | | | | | | | | | | | | | | | | | | | | browsers and updated error messages to be appropriate to what is being typed (message vs. post vs. edit) | |||||
| * | | | | Prevents users from typing more than 4000 characters into any 'textbox' ↵ | Reed Garmsen | 2015-08-25 | 5 | -6/+32 | |
| | | | | | | | | | | | | | | | | | | | | (posts, comments, and post/comment edits). Also adds new error message for when users hit exactly 4000 characters so they know the limit. | |||||
* | | | | | Merge pull request #481 from BastienDurel/master | Joram Wilander | 2015-08-27 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add Date header in mail so it will be sorted correctly | |||||
| * | | | | Use better format for date, as RFC1123 re-defined it over RFC822, and states ↵ | Bastien Durel | 2015-08-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | 'implementations SHOULD use numeric timezones instead of timezone names' | |||||
| * | | | | missing tab | Bastien Durel | 2015-08-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:mattermost/platform | Bastien Durel | 2015-08-26 | 1 | -0/+11 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | tabify | Bastien Durel | 2015-08-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | add date header in mail | Bastien Durel | 2015-08-26 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #471 from nickago/MM-1803 | Christopher Speller | 2015-08-27 | 1 | -0/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1803 Added clearing of search bar on close of comment section of RHS | |||||
| * | | | | | Added clearing of search bar on close of comment section of RHS | nickago | 2015-08-25 | 1 | -0/+7 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #470 from nickago/MM-1945 | Joram Wilander | 2015-08-27 | 2 | -4/+18 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | MM-1945 Added a link to error page that returns users to the root page | |||||
| * | | | | | Added a link to error page that returns users to the root page | nickago | 2015-08-25 | 2 | -4/+18 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #478 from rgarmsen2295/mm-2007 | Christopher Speller | 2015-08-26 | 1 | -0/+11 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-2007 Clears the 'New Channel' dialogue box of errors and previous input on exit | |||||
| * | | | | Clears the 'new channel' dialogue box of errors and previous input on exit | Reed Garmsen | 2015-08-25 | 1 | -0/+11 | |
|/ / / / | ||||||
* | | | | Merge pull request #476 from rgarmsen2295/mm-1915 | Corey Hulen | 2015-08-25 | 2 | -0/+5 | |
|\ \ \ \ | |_|_|/ |/| | | | MM-1915 Added white background to non-image file previews | |||||
| * | | | Added white background to non-image files (was previously transparent | Reed Garmsen | 2015-08-25 | 2 | -0/+5 | |
|/ / / | ||||||
* | | | fixing build | =Corey Hulen | 2015-08-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #466 from mattermost/mm-1912 | Corey Hulen | 2015-08-25 | 7 | -35/+131 | |
|\ \ \ | |_|/ |/| | | Fixes mm-1912 move get file info into its own web service call | |||||
| * | | Fixes mm-1912 move get file info into its own web service call | =Corey Hulen | 2015-08-24 | 7 | -35/+131 | |
| | | | ||||||
* | | | Merge pull request #467 from mattermost/mm-2021 | Christopher Speller | 2015-08-25 | 1 | -3/+1 | |
|\ \ \ | |_|/ |/| | | Fixes mm-2021 removes hard coded port for SSL | |||||
| * | | Fixes mm-2021 removes hard coded port | =Corey Hulen | 2015-08-24 | 1 | -2/+1 | |
| | | | ||||||
| * | | Fixes mm-2021 removes hard coded port | =Corey Hulen | 2015-08-24 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge pull request #456 from mattermost/mm-1960 | Joram Wilander | 2015-08-25 | 7 | -2/+30 | |
|\ \ \ | | | | | | | | | Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk | |||||
| * \ \ | Merging from master | =Corey Hulen | 2015-08-24 | 11 | -18/+67 | |
| |\ \ \ | ||||||
| * | | | | Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk | =Corey Hulen | 2015-08-24 | 7 | -2/+30 | |
| | | | | | ||||||
* | | | | | Merge pull request #464 from rgarmsen2295/mm-1895 | Joram Wilander | 2015-08-25 | 4 | -5/+28 | |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1895 Adds email help text | |||||
| * | | | | | Added email help text and added licensing info | Reed Garmsen | 2015-08-24 | 4 | -5/+28 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #445 from rgarmsen2295/mm-1995 | Joram Wilander | 2015-08-25 | 7 | -134/+236 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1995 Moved the ability to rename a team into the team settings modal and fixed valet regression | |||||
| * | | | | | | Moved the ability to rename a team into the team settings modal; fixed ↵ | Reed Garmsen | 2015-08-24 | 7 | -134/+236 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | issues with valet settings | |||||
* | | | | | | Merge pull request #460 from nickago/MM-1996 | Joram Wilander | 2015-08-25 | 1 | -9/+8 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1996 exapnded form tag to include submission button | |||||
| * | | | | | | exapnded form tag to include submission button | nickago | 2015-08-24 | 1 | -9/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #458 from rgarmsen2295/mm-1983 | Christopher Speller | 2015-08-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | MM-1983 Fixed issue with timestamp incorrectly displaying single digit minutes | |||||
| * | | | | | Fixed issue with timestamp incorrectly displaying single digit minutes | Reed Garmsen | 2015-08-24 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #463 from mattermost/mm-1991 | Corey Hulen | 2015-08-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixes mm-1991 Allow ability to white label | |||||
| * | | | | | | Fixes mm-1991 Allow ability to white label | =Corey Hulen | 2015-08-24 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #459 from nickago/MM-1966 | Corey Hulen | 2015-08-24 | 1 | -0/+17 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | MM-1966 Re-enabled enter key submission for send invites page | |||||
| * | | | | | Re-enabled enter key submission for send invites page | nickago | 2015-08-24 | 1 | -0/+17 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #465 from rgarmsen2295/prof-img-fix | Corey Hulen | 2015-08-24 | 1 | -1/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixes issue with site trying to load profile pictures without having profile information | |||||
| * | | | | | Fixed issue with site tryinng to load profile pictures without having ↵ | Reed Garmsen | 2015-08-24 | 1 | -1/+6 | |
| | |/ / / | |/| | | | | | | | | | | | | | profile information | |||||
* | | | | | Merge pull request #452 from CtrlZvi/starttls_auth | Joram Wilander | 2015-08-24 | 1 | -0/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add SMTP auth to STARTTLS connections | |||||
| * | | | | | Add SMTP auth to STARTTLS connections | Zvi "Viz" Effron | 2015-08-23 | 1 | -0/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #441 from nickago/MM-1893 | Joram Wilander | 2015-08-24 | 3 | -5/+7 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1893 Upon exiting edit post modal, focus is placed on the respective text input field | |||||
| * | | | | | | Upon exiting edit post modal, foucs is placed on the respective text input field | nickago | 2015-08-21 | 3 | -5/+7 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #446 from rgarmsen2295/mm-1999 | Joram Wilander | 2015-08-24 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1999 Removes 'for' from the edit channel description title when the channel has no title | |||||
| * | | | | | | | Removes 'for' from the edit channel description modal title when editing the ↵ | Reed Garmsen | 2015-08-24 | 1 | -1/+6 | |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | description of a private message channel | |||||
* | | | | | | | Merge pull request #451 from CtrlZvi/log_feedback_email_error | Corey Hulen | 2015-08-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Log invalid feedback email before overwriting with default | |||||
| * | | | | | | Log invalid feedback email before overwriting with default | Zvi "Viz" Effron | 2015-08-23 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #449 from rgarmsen2295/mm-1933 | Corey Hulen | 2015-08-24 | 2 | -7/+12 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Multiple fixes for IE10 & Edge browsers primarily due to aggressive ajax call caching on the browser |