summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Moving CHANGELOG to docsit332016-03-141-1299/+1
* Merge branch 'release-2.1'Christopher Speller2016-03-1420-55/+122
|\
| * Merge pull request #2412 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-125-4/+38
| |\
| | * Adding or separator between ldap, username, email, githubAsaad Mahmood2016-03-115-4/+38
| * | Merge pull request #2416 from rodrigocorsi2/pt_translationsChristopher Speller2016-03-112-18/+36
| |\ \ | | |/ | |/|
| | * standardized terminology for sign in and sign upRodrigo Corsi2016-03-102-15/+15
| | * added missing translationsRodrigo Corsi2016-03-102-3/+21
| * | Merge pull request #2417 from hmhealey/plt2264Christopher Speller2016-03-111-6/+14
| |\ \
| | * | Disabled embed toggle when it's disabled in user settingsHarrison Healey2016-03-101-6/+14
| * | | Merge pull request #2414 from mattermost/bluebar-fixChristopher Speller2016-03-112-8/+8
| |\ \ \
| | * | | Fixing blue bar on iOS=Corey Hulen2016-03-102-8/+8
| * | | | Merge pull request #2413 from asaadmahmoodspin/themeFixChristopher Speller2016-03-113-17/+18
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Small fix for search loading icon on mobileAsaad Mahmood2016-03-111-2/+1
| | * | | Fixing padding issueAsaad Mahmood2016-03-101-1/+0
| | * | | Removing consoleAsaad Mahmood2016-03-101-1/+0
| | * | | PLT-2138 - Fixing theme sharing boxAsaad Mahmood2016-03-102-15/+19
| |/ / /
| * / / Fixing docker automation issueChristopher Speller2016-03-101-1/+1
| |/ /
| * | Bumping version to: 2.1.0-rc1Mattermost Build2016-03-091-0/+1
| * | Docker updates for 2.1.0-rc1Mattermost Build2016-03-098-3/+8
| |/
* | Merge pull request #2331 from mattermost/plt-1680Christopher Speller2016-03-14183-5084/+3426
|\ \
| * | Convering client to react-router.Christopher Speller2016-03-14183-5084/+3426
| |/
* | Removing items not in T0it332016-03-111-14/+0
* | Merge pull request #2411 from peasead/masterChristopher Speller2016-03-101-1/+1
|\ \ | |/ |/|
| * updated the 2.0 Dockerfile to include the proper location of mm gzippeasead2016-03-101-1/+1
|/
* Merge pull request #2404 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-092-24/+31
|\
| * Disabling help stuff and moving preview out of itAsaad Mahmood2016-03-092-24/+31
* | Merge pull request #2405 from mattermost/changelog-2.1Christopher Speller2016-03-091-0/+139
|\ \
| * | Update Changelog.md for v2.1Eric Sethna2016-03-091-0/+139
| |/
* | Fixing minor issueChristopher Speller2016-03-091-0/+25
* | Merge pull request #2403 from ZBoxApp/license-es-locChristopher Speller2016-03-092-1/+3
|\ \ | |/ |/|
| * Add license locs in spanishElias Nahum2016-03-092-1/+3
|/
* Merge pull request #2391 from mattermost/fix-about-modalJoram Wilander2016-03-094-21/+33
|\
| * Fix spellingChristopher Speller2016-03-084-8/+8
| * Improving the about dialog for licencingChristopher Speller2016-03-084-22/+34
* | Merge pull request #2394 from ZBoxApp/es-locsJoram Wilander2016-03-092-18/+34
|\ \
| * | Add missing server spanish locsElias Nahum2016-03-082-18/+34
* | | Merge pull request #2397 from mattermost/plt-2185Christopher Speller2016-03-094-10/+10
|\ \ \
| * | | Fix ... for usernames on first page loadJoramWilander2016-03-094-10/+10
* | | | Merge pull request #2399 from mattermost/test-searchChristopher Speller2016-03-091-1/+2
|\ \ \ \
| * | | | Update test-search.md with more markdown hashtagsEric Sethna2016-03-091-1/+2
| |/ / /
* | | | Merge pull request #2400 from mattermost/license-upload-uiChristopher Speller2016-03-094-26/+63
|\ \ \ \ | |/ / / |/| | |
| * | | Show filename for license settings, add locJoramWilander2016-03-093-15/+34
| * | | Updating button classAsaad Mahmood2016-03-091-1/+1
| * | | Improvements to license pageAsaad Mahmood2016-03-092-13/+31
|/ / /
* | | Merge pull request #2392 from hmhealey/plt1960Christopher Speller2016-03-081-0/+1
|\ \ \
| * | | Added proper click handler to search result textHarrison Healey2016-03-081-0/+1
| |/ /
* | | Merge pull request #2390 from hmhealey/plt2259Christopher Speller2016-03-082-0/+3
|\ \ \ | |/ / |/| |
| * | Added target='_blank' to all attachment download linksHarrison Healey2016-03-082-0/+3
* | | Merge pull request #2383 from rodrigocorsi2/pt_translationsHarrison Healey2016-03-082-17/+34
|\ \ \
| * | | Added missing web and server portuguese locsRodrigo Corsi2016-03-082-0/+10