summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #487 from rgarmsen2295/mm-2000Christopher Speller2015-08-272-3/+3
|\ | | | | MM-2000 Added links to the teams listed in the 'Find your teams' email
| * Added links to the teams listed in the 'Find your teams' emailReed Garmsen2015-08-262-3/+3
| |
* | Merge pull request #472 from rgarmsen2295/mm-1853Christopher Speller2015-08-276-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 Garmsen2015-08-264-31/+34
| | | | | | | | | | | | text dumps
| * | Fixed issue with carriage returns being counted improperly in non-ie ↵Reed Garmsen2015-08-254-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 Garmsen2015-08-255-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/masterJoram Wilander2015-08-271-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 Durel2015-08-271-1/+1
| | | | | | | | | | | | | | | | 'implementations SHOULD use numeric timezones instead of timezone names'
| * | | missing tabBastien Durel2015-08-261-1/+1
| | | |
| * | | Merge branch 'master' of github.com:mattermost/platformBastien Durel2015-08-261-0/+11
| |\ \ \ | | | |/ | | |/|
| * | | tabifyBastien Durel2015-08-261-1/+1
| | | |
| * | | add date header in mailBastien Durel2015-08-261-0/+2
| | | |
* | | | Merge pull request #471 from nickago/MM-1803Christopher Speller2015-08-271-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 RHSnickago2015-08-251-0/+7
| | | | |
* | | | | Merge pull request #470 from nickago/MM-1945Joram Wilander2015-08-272-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 pagenickago2015-08-252-4/+18
| |/ / /
* | | | Merge pull request #478 from rgarmsen2295/mm-2007Christopher Speller2015-08-261-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 exitReed Garmsen2015-08-251-0/+11
|/ / /
* | | Merge pull request #476 from rgarmsen2295/mm-1915Corey Hulen2015-08-252-0/+5
|\ \ \ | | | | | | | | MM-1915 Added white background to non-image file previews
| * | | Added white background to non-image files (was previously transparentReed Garmsen2015-08-252-0/+5
|/ / /
* | | fixing build=Corey Hulen2015-08-251-1/+1
| | |
* | | Merge pull request #466 from mattermost/mm-1912Corey Hulen2015-08-257-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 Hulen2015-08-247-35/+131
| | |
* | | Merge pull request #467 from mattermost/mm-2021Christopher Speller2015-08-251-3/+1
|\ \ \ | |_|/ |/| | Fixes mm-2021 removes hard coded port for SSL
| * | Fixes mm-2021 removes hard coded port=Corey Hulen2015-08-241-2/+1
| | |
| * | Fixes mm-2021 removes hard coded port=Corey Hulen2015-08-241-1/+0
| | |
* | | Merge pull request #456 from mattermost/mm-1960Joram Wilander2015-08-257-2/+30
|\ \ \ | | | | | | | | Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk
| * \ \ Merging from master=Corey Hulen2015-08-2411-18/+67
| |\ \ \
| * | | | Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk=Corey Hulen2015-08-247-2/+30
| | | | |
* | | | | Merge pull request #464 from rgarmsen2295/mm-1895Joram Wilander2015-08-254-5/+28
|\ \ \ \ \ | | | | | | | | | | | | MM-1895 Adds email help text
| * | | | | Added email help text and added licensing infoReed Garmsen2015-08-244-5/+28
| | | | | |
* | | | | | Merge pull request #445 from rgarmsen2295/mm-1995Joram Wilander2015-08-257-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 Garmsen2015-08-247-134/+236
| | |_|/ / / | |/| | | | | | | | | | | | | | | | issues with valet settings
* | | | | | Merge pull request #460 from nickago/MM-1996Joram Wilander2015-08-251-9/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1996 exapnded form tag to include submission button
| * | | | | | exapnded form tag to include submission buttonnickago2015-08-241-9/+8
| |/ / / / /
* | | | | | Merge pull request #458 from rgarmsen2295/mm-1983Christopher Speller2015-08-251-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | MM-1983 Fixed issue with timestamp incorrectly displaying single digit minutes
| * | | | | Fixed issue with timestamp incorrectly displaying single digit minutesReed Garmsen2015-08-241-1/+1
| | | | | |
* | | | | | Merge pull request #463 from mattermost/mm-1991Corey Hulen2015-08-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes mm-1991 Allow ability to white label
| * | | | | | Fixes mm-1991 Allow ability to white label=Corey Hulen2015-08-241-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #459 from nickago/MM-1966Corey Hulen2015-08-241-0/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | MM-1966 Re-enabled enter key submission for send invites page
| * | | | | Re-enabled enter key submission for send invites pagenickago2015-08-241-0/+17
| | |_|/ / | |/| | |
* | | | | Merge pull request #465 from rgarmsen2295/prof-img-fixCorey Hulen2015-08-241-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 Garmsen2015-08-241-1/+6
| | |/ / / | |/| | | | | | | | | | | | | profile information
* | | | | Merge pull request #452 from CtrlZvi/starttls_authJoram Wilander2015-08-241-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add SMTP auth to STARTTLS connections
| * | | | | Add SMTP auth to STARTTLS connectionsZvi "Viz" Effron2015-08-231-0/+3
| | | | | |
* | | | | | Merge pull request #441 from nickago/MM-1893Joram Wilander2015-08-243-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 fieldnickago2015-08-213-5/+7
| | | | | | |
* | | | | | | Merge pull request #446 from rgarmsen2295/mm-1999Joram Wilander2015-08-241-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 Garmsen2015-08-241-1/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | description of a private message channel
* | | | | | | Merge pull request #451 from CtrlZvi/log_feedback_email_errorCorey Hulen2015-08-241-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Log invalid feedback email before overwriting with default