summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merging=Corey Hulen2016-01-154-31/+15
|\
| * Remove extra config infoJoramWilander2016-01-141-24/+1
| |
| * Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-142-4/+4
| |\ | | | | | | Release 1.4
| | * Fixing dockerfile for release=Corey Hulen2016-01-141-1/+1
| | |
| | * Merge pull request #1892 from mattermost/sso-email-fixCorey Hulen2016-01-141-3/+3
| | |\ | | | | | | | | Encode url query properly for SSO switching
| | | * Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
| | |/
| * | Merge pull request #1888 from mattermost/fix-droidCorey Hulen2016-01-141-3/+10
| |\ \ | | | | | | | | Fixing android push
| | * \ Merge branch 'master' into fix-droid=Corey Hulen2016-01-142-2/+2
| | |\ \ | | |/ / | |/| |
| | * | Fixing android push=Corey Hulen2016-01-141-3/+10
| | | |
* | | | finishing up commands UI=Corey Hulen2016-01-144-70/+310
| | | |
* | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-14104-847/+1940
|\| | |
| * | | Fix old l4g referencesJoramWilander2016-01-142-2/+2
| |/ /
| * | Minor fixJoramWilander2016-01-141-5/+0
| | |
| * | Merge pull request #1887 from mattermost/editionsJoram Wilander2016-01-1424-43/+900
| |\ \ | | | | | | | | Editions
| | * | Final updatesJoramWilander2016-01-147-27/+86
| | | |
| | * | Fix error messageJoramWilander2016-01-141-5/+10
| | | |
| | * | Minor update to about modalJoramWilander2016-01-141-4/+1
| | | |
| | * | Remove bin from gitignoreJoramWilander2016-01-142-2/+0
| | | |
| | * | Add some unit testsJoramWilander2016-01-144-10/+105
| | | |
| | * | Added license validation and settingsJoramWilander2016-01-1420-33/+736
| |/ /
| * | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-134-7/+45
| |\ \ | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
| | * | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-114-7/+45
| | | |
| * | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-135-6/+20
| |\ \ \ | | | | | | | | | | Adding away icon and changing online and offline icons
| | * | | Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-115-6/+20
| | | | |
| * | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-132-2/+4
| |\ \ \ \ | | | | | | | | | | | | Documenting how Preview Mode is disabled
| | * | | | Update email_settings.jsxit332016-01-091-1/+1
| | | | | |
| | * | | | Update Configuration-Settings.mdit332016-01-091-1/+3
| | | | | |
| | * | | | Documenting how Preview Mode turns offit332016-01-091-1/+1
| | | | | |
| * | | | | Merge pull request #1878 from mattermost/release-1.4Corey Hulen2016-01-123-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | Fixing docker files for 1.4 RC2
| | * | | | Fixing config file=Corey Hulen2016-01-121-2/+19
| | | | | |
| | * | | | Fixing docker files for 1.4 RC2=Corey Hulen2016-01-124-21/+4
| | | | | |
| * | | | | Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-126-5/+10
| |\| | | | | | | | | | | | | | | | Release 1.4 RC2
| | * | | | Update docker to 1.4 RC2=Corey Hulen2016-01-123-2/+2
| | | | | |
| | * | | | Merge pull request #1872 from mattermost/plt-1667Corey Hulen2016-01-122-2/+4
| | |\ \ \ \ | | | | | | | | | | | | | | PLT-1667 Support old OAuth routes
| | | * | | | Add removal commentsJoramWilander2016-01-121-2/+2
| | | | | | |
| | | * | | | Support old oauth routesJoramWilander2016-01-122-2/+4
| | | | | | |
| | * | | | | Merge pull request #1862 from mattermost/lfbrock-patch-1Corey Hulen2016-01-121-0/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Update changelog.md
| | | * | | | Update CHANGELOG.mdlfbrock2016-01-111-0/+1
| | | | | | |
| | | * | | | Update CHANGELOG.mdlfbrock2016-01-111-1/+1
| | | | | | |
| | | * | | | Update CHANGELOG.mdlfbrock2016-01-111-1/+0
| | | | | | |
| | | * | | | Update CHANGELOG.mdlfbrock2016-01-111-0/+3
| | | | | | |
| | * | | | | Merge pull request #1866 from mattermost/fix-docker-14Corey Hulen2016-01-111-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fixing dockerfile
| | | * | | | | Fixing dockerfile=Corey Hulen2016-01-111-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #1830 from rgarmsen2295/plt-1599Joram Wilander2016-01-121-2/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-1599 Help text in invite member modal now reflects the default channel name
| | * | | | | | Help text in invite member modal now updates according to town-square ↵Reed Garmsen2016-01-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display name
| * | | | | | | Merge pull request #1857 from esethna/patch-51Joram Wilander2016-01-121-14/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update test-attachments.md
| | * | | | | | | Update test-attachments.mdEric Sethna2016-01-111-14/+13
| | | |_|/ / / / | | |/| | | | | | | | | | | | | Update test doc after changes were made to how some audio and video files display and preview.
| * | | | | | | Merge pull request #1863 from esethna/patch-53Joram Wilander2016-01-121-0/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update test-markdown-basics.md
| | * | | | | | | Update test-markdown-basics.mdEric Sethna2016-01-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add carriage return tests
| * | | | | | | | Merge pull request #1873 from mattermost/lfbrock-patch-2Joram Wilander2016-01-121-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update test-markdown-basics.md
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 15:49:03 +0000