summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with timestamp incorrectly displaying single digit minutesReed Garmsen2015-08-241-1/+1
|
* Merge pull request #453 from asaadmahmoodspin/masterCorey Hulen2015-08-242-2/+2
|\ | | | | MM-1831 - Fixing channel name
| * MM-1831 - Fixing channel name and having channel name in bold for edit ↵Asaad Mahmood2015-08-242-2/+2
|/ | | | channel modal
* Merge pull request #450 from mattermost/it33-patch-5Christopher Speller2015-08-241-0/+23
|\ | | | | Adding info on supported browsers
| * 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
| | | | | | | | | Also capitalizing "Docker" when it's in a sentence and not command.
* | | Merge pull request #439 from nickago/MM-1822Joram Wilander2015-08-243-0/+8
|\ \ \ | | | | | | | | MM-1822 Added help text to profile picture screen
| * | | Added help text to profile picture screennickago2015-08-213-0/+8
| |/ /
* | | Merge pull request #440 from nickago/MM-1803Corey Hulen2015-08-232-0/+14
|\ \ \ | | | | | | | | MM-1803 Remove search term after the RHS is closed
| * | | 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 Settings
| * | | Changing "Features"->"Advanced" in Team Settingsit332015-08-211-1/+1
| | |/ | |/| | | | Also changing order of menu items, so Advanced (least used) is at the bottom)
* | | Merge pull request #447 from mattermost/it33-patch-2Corey Hulen2015-08-231-2/+2
|\ \ \ | | | | | | | | Renaming "Feature Settings"->"Advanced Features"
| * | | Renaming "Feature Settings"->"Advanced Features"it332015-08-211-2/+2
| |/ /
* | | Merge pull request #444 from nickago/MM-1795Corey Hulen2015-08-231-1/+2
|\ \ \ | | | | | | | | MM-1795 Added fullscreen capability to youtube embed
| * | | 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 RHS
| * | 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
| * | Fixes race condition=Corey Hulen2015-08-211-4/+10
|/ /
* | Merge pull request #427 from asaadmahmoodspin/mm-1696Harrison Healey2015-08-213-9/+37
|\ \ | | | | | | MM-1696 - Improvements for Slack Import
| * | Updating setting_uploadAsaad Mahmood2015-08-211-12/+0
| | |
| * | Merge branch 'mm-1696' of https://github.com/asaadmahmoodspin/platform into ↵Asaad Mahmood2015-08-210-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | mm-1696 Conflicts: web/react/components/setting_upload.jsx
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx
| * | | | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-213-9/+37
| | | | |
* | | | | Merge pull request #428 from mattermost/mm-1923Corey Hulen2015-08-211-0/+39
|\ \ \ \ \ | | | | | | | | | | | | Fixes MM-1923 Documenting email setup
| * \ \ \ \ Merging=Corey Hulen2015-08-2123-288/+740
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Documenting email setup=Corey Hulen2015-08-201-2/+12
| | | | | |
| * | | | | Documenting email setup=Corey Hulen2015-08-201-0/+29
| | |_|_|/ | |/| | |
* | | | | Merge pull request #430 from mattermost/fixing-buildCorey Hulen2015-08-215-3/+20
|\ \ \ \ \ | |_|/ / / |/| | | | Fixing race condition
| * | | | Fixing audit log to wait for confirm=Corey Hulen2015-08-201-11/+11
| | | | |
| * | | | Removing my enviroment=Corey Hulen2015-08-202-22/+0
| | | | |
| * | | | Fixing race condition=Corey Hulen2015-08-201-2/+3
| | | | |
| * | | | Fixing bug=Corey Hulen2015-08-201-1/+3
| | | | |
| * | | | Fixing build=Corey Hulen2015-08-203-7/+17
| | | | |
| * | | | Merge branch 'enviro' into fixing-build=Corey Hulen2015-08-203-0/+26
| |\ \ \ \
| | * | | | Adding enviroment files=Corey Hulen2015-08-193-0/+26
| | | | | |
* | | | | | Merge pull request #420 from asaadmahmoodspin/ui-changesJoram Wilander2015-08-2112-30/+76
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Multiple UI Improvements
| * | | | | Merge branch 'ui-changes' of https://github.com/asaadmahmoodspin/platform ↵Asaad Mahmood2015-08-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ui-changes Conflicts: web/sass-files/sass/partials/_modal.scss
| | * | | | | Updating intro text for channelsAsaad Mahmood2015-08-211-2/+2
| | | | | | |
| | * | | | | Removing getDOMNode from view_imageAsaad Mahmood2015-08-201-2/+2
| | | | | | |
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changesAsaad Mahmood2015-08-202-30/+88
| | |\ \ \ \ \
| | * | | | | | Multiple UI ImprovementsAsaad Mahmood2015-08-2011-30/+73
| | | | | | | |
| * | | | | | | Solving conflicts and also fixing css for MM-1752Asaad Mahmood2015-08-213-2/+5
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changesAsaad Mahmood2015-08-215-211/+552
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/channel_notifications.jsx
| * | | | | | | Updating intro text for channelsAsaad Mahmood2015-08-211-2/+2
| | | | | | | |
| * | | | | | | Removing getDOMNode from view_imageAsaad Mahmood2015-08-211-2/+2
| | | | | | | |
| * | | | | | | Multiple UI ImprovementsAsaad Mahmood2015-08-2111-30/+73
| | |_|_|_|_|/ | |/| | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-08-06 06:08:10 +0000