summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #458 from rgarmsen2295/mm-1983Christopher Speller2015-08-251-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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=Corey Hulen2015-08-241-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #459 from nickago/MM-1966Corey Hulen2015-08-241-0/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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
|\ \ \ \ \
| * | | | | Fixed issue with site tryinng to load profile pictures without having profile...Reed Garmsen2015-08-241-1/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #452 from CtrlZvi/starttls_authJoram Wilander2015-08-241-0/+3
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Removes 'for' from the edit channel description modal title when editing the ...Reed Garmsen2015-08-241-1/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #451 from CtrlZvi/log_feedback_email_errorCorey Hulen2015-08-241-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Log invalid feedback email before overwriting with defaultZvi "Viz" Effron2015-08-231-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #449 from rgarmsen2295/mm-1933Corey Hulen2015-08-242-7/+12
|\ \ \ \ \ \
| * | | | | | Fixes issue with profile pictures not updating w/o refresh and prevents more ...Reed Garmsen2015-08-222-1/+6
| * | | | | | Fixed issue with logout in active sessions not working in ie10Reed Garmsen2015-08-221-0/+2
| * | | | | | Added cache: false to ajax calls that caused problems with ie10Reed Garmsen2015-08-221-6/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #457 from rgarmsen2295/mm-1833Corey Hulen2015-08-241-2/+2
|\ \ \ \ \ \
| * | | | | | Changes the max number of characters for a channel title/handle to 22Reed Garmsen2015-08-241-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #455 from nickago/MM-1604Corey Hulen2015-08-241-6/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Changed 1 hour expire time to 30 daysnickago2015-08-241-6/+7
| |/ / / /
* | | | | Merge pull request #453 from asaadmahmoodspin/masterCorey Hulen2015-08-242-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MM-1831 - Fixing channel name and having channel name in bold for edit channe...Asaad Mahmood2015-08-242-2/+2
|/ / / /
* | | | Merge pull request #450 from mattermost/it33-patch-5Christopher Speller2015-08-241-0/+23
|\ \ \ \
| * | | | Adding info on supported browsersit332015-08-231-0/+23
| |/ / /
* | | | Merge remote-tracking branch 'origin/it33-patch-1'Christopher Speller2015-08-241-14/+14
|\ \ \ \
| * | | | Clarifying wording on upgrade instructionsit332015-08-211-14/+14
| | |_|/ | |/| |
* | | | Merge pull request #439 from nickago/MM-1822Joram Wilander2015-08-243-0/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added help text to profile picture screennickago2015-08-213-0/+8
| |/ /
* | | Merge pull request #440 from nickago/MM-1803Corey Hulen2015-08-232-0/+14
|\ \ \
| * | | remove search term after the RHS is closednickago2015-08-212-0/+14
| |/ /
* | | Merge pull request #448 from mattermost/it33-patch-4Corey Hulen2015-08-231-1/+1
|\ \ \
| * | | Changing "Features"->"Advanced" in Team Settingsit332015-08-211-1/+1
| | |/ | |/|
* | | Merge pull request #447 from mattermost/it33-patch-2Corey Hulen2015-08-231-2/+2
|\ \ \
| * | | Renaming "Feature Settings"->"Advanced Features"it332015-08-211-2/+2
| |/ /
* | | Merge pull request #444 from nickago/MM-1795Corey Hulen2015-08-231-1/+2
|\ \ \
| * | | Added fullscreen capability to youtube embednickago2015-08-211-1/+2
| | |/ | |/|
* | | Merge pull request #442 from asaadmahmoodspin/masterCorey Hulen2015-08-231-0/+3
|\ \ \ | |_|/ |/| |
| * | MM-1989 - Hiding Cancel text in LHS that messes up the RHSAsaad Mahmood2015-08-211-0/+3
* | | Merge pull request #443 from mattermost/fixing-buildCorey Hulen2015-08-211-4/+10
|\ \ \ | |/ / |/| |
| * | Fixes race condition=Corey Hulen2015-08-211-4/+10
|/ /
* | Merge pull request #427 from asaadmahmoodspin/mm-1696Harrison Healey2015-08-213-9/+37
|\ \
| * | Updating setting_uploadAsaad Mahmood2015-08-211-12/+0
| * | Merge branch 'mm-1696' of https://github.com/asaadmahmoodspin/platform into m...Asaad Mahmood2015-08-210-0/+0
| |\ \
| | * | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-213-9/+37
| * | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1696Asaad Mahmood2015-08-217-45/+122
| |\ \ \
| * | | | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-213-9/+37