summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added cache: false to ajax calls that caused problems with ie10Reed Garmsen2015-08-221-6/+4
|
* 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #431 from nickago/MM-1797Christopher Speller2015-08-211-8/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1797 Removed state holding functionality when switching to access history or session view
| * | | | | | | Removed state holding functionality when switching to access history or ↵nickago2015-08-201-8/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | session view
* | | | | | | Merge pull request #432 from nickago/MM-1804Joram Wilander2015-08-211-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1804 Updated navbar to more accurately mirror desktop preformance
| * | | | | | | Updated navbar to more accurately mirror desktop preformancenickago2015-08-201-0/+3
| |/ / / / / /
* | | | | | | Merge pull request #437 from mattermost/it33-patch-4Christopher Speller2015-08-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adjusting "Find Your Team" instructions
| * | | | | | | Adjusting "Find Your Team" instructionsit332015-08-211-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #435 from mattermost/it33-patch-2Christopher Speller2015-08-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixing typo "Summery" -> "Summary"
| * | | | | | | Fixing typo "Summery" -> "Summary"it332015-08-201-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #434 from mattermost/it33-patch-1Christopher Speller2015-08-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixing typo "SelectFile" -> "Select File"
| * | | | | | | Fixing typo "SelectFile" -> "Select File"it332015-08-201-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #425 from rgarmsen2295/mm-1901Joram Wilander2015-08-212-35/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1901 When a user joins a channel that channel is now automatically opened for them
| * | | | | | | Fixed issue with channel name in url and added loading icon to replace ↵Reed Garmsen2015-08-202-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Join' button for slow connections
| * | | | | | | Cosmetic reformatting of more_channels.jsxReed Garmsen2015-08-201-29/+62
| | | | | | | |
| * | | | | | | Users are now placed in the channel after joining it from the 'More...' ↵Reed Garmsen2015-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | channel menu
* | | | | | | | Merge pull request #429 from nickago/MM-1859Joram Wilander2015-08-211-0/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | MM-1859 Added updating of username based mentions on username change
| * | | | | | | Added updating of username based mentions on username changenickago2015-08-201-0/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #433 from nickago/MM-1840Corey Hulen2015-08-201-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | MM-1840 Changed title of the edit channel modal
| * | | | | | changed title of edit_channel modalnickago2015-08-201-1/+1
| |/ / / / /
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 13:56:14 +0000