summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixing JS bug with droid=Corey Hulen2016-02-171-12/+16
* Merge pull request #2146 from ttyniwa/feature/PLT-1908Corey Hulen2016-02-143-17/+118
|\
| * add translated messages to es.json.Tatsuya Niwa2016-02-121-0/+4
| * delete not translated messages in es.jsonTatsuya Niwa2016-02-121-4/+0
| * Add a warning when demoting yourself from System Administrator from the team ...Tatsuya Niwa2016-02-113-17/+118
* | Merge pull request #2168 from ZBoxApp/permalink-spanishCorey Hulen2016-02-141-0/+2
|\ \
| * | RHS spanish translations for permalinkElias Nahum2016-02-141-0/+2
* | | Merge pull request #2165 from ZBoxApp/update-locsCorey Hulen2016-02-142-2/+2
|\ \ \ | |/ / |/| |
| * | Update loc stringsElias Nahum2016-02-122-2/+2
* | | Merge pull request #2123 from hmhealey/plt1711Joram Wilander2016-02-141-0/+1
|\ \ \
| * | | Prevent the admin console from switching to a team that is being removed from...hmhealey2016-02-091-0/+1
* | | | Merge pull request #2138 from rgarmsen2295/plt-1672Joram Wilander2016-02-144-1/+48
|\ \ \ \
| * | | | Added permalink feature to posts in the RHSReed Garmsen2016-02-124-1/+48
| | |/ / | |/| |
* | | | Merge branch 'release-2.0'Christopher Speller2016-02-136-17/+52
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2161 from mattermost/load-more-fixChristopher Speller2016-02-131-1/+1
| |\ \ \
| | * | | Fix load more messages being broken by getPostsSince callJoramWilander2016-02-121-1/+1
| * | | | Merge pull request #2164 from mattermost/unread-tab-fixChristopher Speller2016-02-133-6/+8
| |\ \ \ \
| | * | | | Fix badge and tab */(1) not disappearing until switching away from channelJoramWilander2016-02-123-6/+8
| | |/ / /
| * | | | Merge pull request #2166 from mattermost/esethna-patch-1Christopher Speller2016-02-131-8/+18
| |\ \ \ \
| | * | | | Update Changelog.md with more known issuesEric Sethna2016-02-121-8/+18
| | |/ / /
| * | | | Merge pull request #2167 from mattermost/gitlab-sso-fixChristopher Speller2016-02-131-2/+25
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make sure the GitLab user has the required fieldsJoramWilander2016-02-121-2/+25
| |/ / /
* | | | Merge pull request #2152 from asaadmahmoodspin/ui-fixesChristopher Speller2016-02-1212-69/+91
|\ \ \ \ | |/ / / |/| | |
| * | | Adding import instead of require for fastclickAsaad Mahmood2016-02-121-1/+1
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2016-02-1217-38/+60
| |\ \ \ | |/ / / |/| | |
* | | | Updating dockerfile for v2.0.0-rc2Christopher Speller2016-02-121-1/+1
* | | | Merge pull request #2157 from mattermost/ie-cache-fixChristopher Speller2016-02-126-6/+4
|\ \ \ \
| * | | | Fixing IE expire issue=Corey Hulen2016-02-116-6/+4
* | | | | Merge pull request #2158 from mattermost/fix-socket-locChristopher Speller2016-02-111-7/+7
|\ \ \ \ \
| * | | | | Fixing so the loc tool can use these=Corey Hulen2016-02-111-7/+7
| |/ / / /
* | | | | Merge pull request #2155 from ZBoxApp/PLT-1948Christopher Speller2016-02-112-5/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | eslint no-shadow resolvedElias Nahum2016-02-112-2/+2
| * | | | Fix duplicate am/pm on last password updateElias Nahum2016-02-112-5/+7
* | | | | Merge pull request #2150 from ZBoxApp/PLT-1963Christopher Speller2016-02-111-4/+5
|\ \ \ \ \
| * | | | | Fixing intl console error on Outgoing webhook editElias Nahum2016-02-111-4/+5
* | | | | | Merge pull request #2154 from mattermost/plt-1933Christopher Speller2016-02-111-0/+1
|\ \ \ \ \ \
| * | | | | | Emit change after setting preferences in head.htmlJoramWilander2016-02-111-0/+1
* | | | | | | Merge pull request #2153 from mattermost/plt-1939Christopher Speller2016-02-112-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix localization error for team invitesJoramWilander2016-02-112-3/+3
| |/ / / / /
* | | | | | Merge pull request #2145 from mattermost/PLT-1956Christopher Speller2016-02-111-1/+13
|\ \ \ \ \ \
| * | | | | | PLT-1956=Corey Hulen2016-02-101-1/+13
* | | | | | | Merge pull request #2148 from mattermost/missing-posts-2.0Christopher Speller2016-02-112-19/+11
|\ \ \ \ \ \ \
| * | | | | | | Switch to using create_at for latest postJoramWilander2016-02-111-1/+1
| * | | | | | | If we have less than CHUNK_SIZE posts, then get the first pageJoramWilander2016-02-111-1/+3
| * | | | | | | Fix case where channel has a postlist but no postsJoramWilander2016-02-111-1/+6
| * | | | | | | Fixing the elusive missing post bugJoramWilander2016-02-112-19/+4
| |/ / / / / /
* | | | | | | Merge pull request #2151 from mattermost/fix-socketChristopher Speller2016-02-112-7/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixing socket store loc=Corey Hulen2016-02-112-7/+21
|/ / / / / /
* | | | | | Merge pull request #2149 from mattermost/plt-1949Christopher Speller2016-02-111-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixing cacheing issue on IE for admin consoleChristopher Speller2016-02-111-0/+2
|/ / / / /