| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixed issue with site tryinng to load profile pictures without having ↵ | Reed Garmsen | 2015-08-24 | 1 | -1/+6 |
| | | | | | profile information | ||||
| * | 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 | ||||
| | * | Fixes issue with profile pictures not updating w/o refresh and prevents more ↵ | Reed Garmsen | 2015-08-22 | 2 | -1/+6 |
| | | | | | | | | | ie10 ajax caching issues | ||||
| | * | Fixed issue with logout in active sessions not working in ie10 | Reed Garmsen | 2015-08-22 | 1 | -0/+2 |
| | | | |||||
| | * | Added cache: false to ajax calls that caused problems with ie10 | Reed Garmsen | 2015-08-22 | 1 | -6/+4 |
| | | | |||||
| * | | Merge pull request #457 from rgarmsen2295/mm-1833 | Corey Hulen | 2015-08-24 | 1 | -2/+2 |
| |\ \ | | | | | | | MM-1833 Changes the max number of characters for a channel title/handle to 22 | ||||
| | * | | Changes the max number of characters for a channel title/handle to 22 | Reed Garmsen | 2015-08-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #455 from nickago/MM-1604 | Corey Hulen | 2015-08-24 | 1 | -6/+7 |
| |\ \ \ | | | | | | | | | MM-1604 Changed 1 hour expire time to 30 days | ||||
| | * | | | Changed 1 hour expire time to 30 days | nickago | 2015-08-24 | 1 | -6/+7 |
| | |/ / | |||||
| * | | | Merge pull request #453 from asaadmahmoodspin/master | Corey Hulen | 2015-08-24 | 2 | -2/+2 |
| |\ \ \ | |/ / |/| | | MM-1831 - Fixing channel name | ||||
| | * | | MM-1831 - Fixing channel name and having channel name in bold for edit ↵ | Asaad Mahmood | 2015-08-24 | 2 | -2/+2 |
| |/ / | | | | | | | channel modal | ||||
| * | | Merge pull request #450 from mattermost/it33-patch-5 | Christopher Speller | 2015-08-24 | 1 | -0/+23 |
| |\ \ | | | | | | | Adding info on supported browsers | ||||
| | * | | Adding info on supported browsers | it33 | 2015-08-23 | 1 | -0/+23 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'origin/it33-patch-1' | Christopher Speller | 2015-08-24 | 1 | -14/+14 |
| |\ \ | |||||
| | * | | Clarifying wording on upgrade instructions | it33 | 2015-08-21 | 1 | -14/+14 |
| | | | | | | | | | | Also capitalizing "Docker" when it's in a sentence and not command. | ||||
| * | | | Merge pull request #439 from nickago/MM-1822 | Joram Wilander | 2015-08-24 | 3 | -0/+8 |
| |\ \ \ | | | | | | | | | MM-1822 Added help text to profile picture screen | ||||
| | * | | | Added help text to profile picture screen | nickago | 2015-08-21 | 3 | -0/+8 |
| | |/ / | |||||
| * | | | Merge pull request #440 from nickago/MM-1803 | Corey Hulen | 2015-08-23 | 2 | -0/+14 |
| |\ \ \ | | | | | | | | | MM-1803 Remove search term after the RHS is closed | ||||
| | * | | | remove search term after the RHS is closed | nickago | 2015-08-21 | 2 | -0/+14 |
| | |/ / | |||||
| * | | | Merge pull request #448 from mattermost/it33-patch-4 | Corey Hulen | 2015-08-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Changing "Features"->"Advanced" in Team Settings | ||||
| | * | | | Changing "Features"->"Advanced" in Team Settings | it33 | 2015-08-21 | 1 | -1/+1 |
| | | |/ | |/| | | | | Also changing order of menu items, so Advanced (least used) is at the bottom) | ||||
| * | | | Merge pull request #447 from mattermost/it33-patch-2 | Corey Hulen | 2015-08-23 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Renaming "Feature Settings"->"Advanced Features" | ||||
| | * | | | Renaming "Feature Settings"->"Advanced Features" | it33 | 2015-08-21 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Merge pull request #444 from nickago/MM-1795 | Corey Hulen | 2015-08-23 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | MM-1795 Added fullscreen capability to youtube embed | ||||
| | * | | | Added fullscreen capability to youtube embed | nickago | 2015-08-21 | 1 | -1/+2 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #442 from asaadmahmoodspin/master | Corey Hulen | 2015-08-23 | 1 | -0/+3 |
| |\ \ \ | |_|/ |/| | | MM-1989 - Hiding Cancel text in LHS that messes up the RHS | ||||
| | * | | MM-1989 - Hiding Cancel text in LHS that messes up the RHS | Asaad Mahmood | 2015-08-21 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge pull request #443 from mattermost/fixing-build | Corey Hulen | 2015-08-21 | 1 | -4/+10 |
| |\ \ \ | |/ / |/| | | Fixes race condition | ||||
| | * | | Fixes race condition | =Corey Hulen | 2015-08-21 | 1 | -4/+10 |
| |/ / | |||||
| * | | Merge pull request #427 from asaadmahmoodspin/mm-1696 | Harrison Healey | 2015-08-21 | 3 | -9/+37 |
| |\ \ | | | | | | | MM-1696 - Improvements for Slack Import | ||||
| | * | | Updating setting_upload | Asaad Mahmood | 2015-08-21 | 1 | -12/+0 |
| | | | | |||||
| | * | | Merge branch 'mm-1696' of https://github.com/asaadmahmoodspin/platform into ↵ | Asaad Mahmood | 2015-08-21 | 0 | -0/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | mm-1696 Conflicts: web/react/components/setting_upload.jsx | ||||
| | | * | | MM-1696 - Improvements for Slack Import | Asaad Mahmood | 2015-08-21 | 3 | -9/+37 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1696 | Asaad Mahmood | 2015-08-21 | 7 | -45/+122 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx | ||||
| | * | | | | MM-1696 - Improvements for Slack Import | Asaad Mahmood | 2015-08-21 | 3 | -9/+37 |
| | | | | | | |||||
| * | | | | | Merge pull request #428 from mattermost/mm-1923 | Corey Hulen | 2015-08-21 | 1 | -0/+39 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixes MM-1923 Documenting email setup | ||||
| | * \ \ \ \ | Merging | =Corey Hulen | 2015-08-21 | 23 | -288/+740 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Documenting email setup | =Corey Hulen | 2015-08-20 | 1 | -2/+12 |
| | | | | | | | |||||
| | * | | | | | Documenting email setup | =Corey Hulen | 2015-08-20 | 1 | -0/+29 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #430 from mattermost/fixing-build | Corey Hulen | 2015-08-21 | 5 | -3/+20 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Fixing race condition | ||||
| | * | | | | Fixing audit log to wait for confirm | =Corey Hulen | 2015-08-20 | 1 | -11/+11 |
| | | | | | | |||||
| | * | | | | Removing my enviroment | =Corey Hulen | 2015-08-20 | 2 | -22/+0 |
| | | | | | | |||||
| | * | | | | Fixing race condition | =Corey Hulen | 2015-08-20 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | Fixing bug | =Corey Hulen | 2015-08-20 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Fixing build | =Corey Hulen | 2015-08-20 | 3 | -7/+17 |
| | | | | | | |||||
| | * | | | | Merge branch 'enviro' into fixing-build | =Corey Hulen | 2015-08-20 | 3 | -0/+26 |
| | |\ \ \ \ | |||||
| | | * | | | | Adding enviroment files | =Corey Hulen | 2015-08-19 | 3 | -0/+26 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #420 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-08-21 | 12 | -30/+76 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Multiple UI Improvements | ||||
| | * | | | | | Merge branch 'ui-changes' of https://github.com/asaadmahmoodspin/platform ↵ | Asaad Mahmood | 2015-08-21 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ui-changes Conflicts: web/sass-files/sass/partials/_modal.scss | ||||
| | | * | | | | | Updating intro text for channels | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 |
| | | | | | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |