Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #447 from mattermost/it33-patch-2 | Corey Hulen | 2015-08-23 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | 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 | |
|\ \ \ | ||||||
| * | | | 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 | 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 | =Corey Hulen | 2015-08-21 | 1 | -4/+10 | |
|/ / | ||||||
* | | Merge pull request #427 from asaadmahmoodspin/mm-1696 | Harrison Healey | 2015-08-21 | 3 | -9/+37 | |
|\ \ | ||||||
| * | | Updating setting_upload | Asaad Mahmood | 2015-08-21 | 1 | -12/+0 | |
| * | | Merge branch 'mm-1696' of https://github.com/asaadmahmoodspin/platform into m... | Asaad Mahmood | 2015-08-21 | 0 | -0/+0 | |
| |\ \ | ||||||
| | * | | 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 | |
| |\ \ \ | ||||||
| * | | | | 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 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | 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 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 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Merge branch 'ui-changes' of https://github.com/asaadmahmoodspin/platform int... | Asaad Mahmood | 2015-08-21 | 0 | -0/+0 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Updating intro text for channels | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 | |
| | * | | | | | Removing getDOMNode from view_image | Asaad Mahmood | 2015-08-20 | 1 | -2/+2 | |
| | * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-08-20 | 2 | -30/+88 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-08-20 | 11 | -30/+73 | |
| * | | | | | | | Solving conflicts and also fixing css for MM-1752 | Asaad Mahmood | 2015-08-21 | 3 | -2/+5 | |
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-08-21 | 5 | -211/+552 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Updating intro text for channels | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 | |
| * | | | | | | | Removing getDOMNode from view_image | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 | |
| * | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-08-21 | 11 | -30/+73 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #431 from nickago/MM-1797 | Christopher Speller | 2015-08-21 | 1 | -8/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Removed state holding functionality when switching to access history or sessi... | nickago | 2015-08-20 | 1 | -8/+2 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #432 from nickago/MM-1804 | Joram Wilander | 2015-08-21 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Updated navbar to more accurately mirror desktop preformance | nickago | 2015-08-20 | 1 | -0/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #437 from mattermost/it33-patch-4 | Christopher Speller | 2015-08-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Adjusting "Find Your Team" instructions | it33 | 2015-08-21 | 1 | -2/+2 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #435 from mattermost/it33-patch-2 | Christopher Speller | 2015-08-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixing typo "Summery" -> "Summary" | it33 | 2015-08-20 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #434 from mattermost/it33-patch-1 | Christopher Speller | 2015-08-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixing typo "SelectFile" -> "Select File" | it33 | 2015-08-20 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #425 from rgarmsen2295/mm-1901 | Joram Wilander | 2015-08-21 | 2 | -35/+91 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed issue with channel name in url and added loading icon to replace 'Join'... | Reed Garmsen | 2015-08-20 | 2 | -13/+35 | |
| * | | | | | | | Cosmetic reformatting of more_channels.jsx | Reed Garmsen | 2015-08-20 | 1 | -29/+62 |