summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2157 from mattermost/ie-cache-fixChristopher Speller2016-02-126-6/+4
|\ | | | | Fixing IE expire issue
| * 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
| * | 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
|\ \ | |/ |/| PLT-1948: Fix duplicate am/pm on last password update
| * 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
|\ \ | | | | | | PLT-1963: Fixing intl console error on Outgoing webhook edit
| * | 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
|\ \ \ | | | | | | | | RC2 PLT-1933 Emit change after setting preferences in head.html
| * | | 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
|\ \ \ \ | |/ / / |/| | | RC2 PLT-1939 Fix localization error for team invites
| * | | 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 Infinite "Loading..." Animation for Webhooks/Slash Commands UI
| * | | PLT-1956=Corey Hulen2016-02-101-1/+13
| | | |
* | | | Merge pull request #2148 from mattermost/missing-posts-2.0Christopher Speller2016-02-112-19/+11
|\ \ \ \ | | | | | | | | | | RC2 PLT-1774 Fixing the elusive missing post bug
| * | | | 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
| * | | Fixing socket store loc=Corey Hulen2016-02-112-7/+21
|/ / /
* | | Merge pull request #2149 from mattermost/plt-1949Christopher Speller2016-02-111-0/+2
|\ \ \ | |_|/ |/| | PLT-1949 Fixing cacheing issue on IE for admin console
| * | Fixing cacheing issue on IE for admin consoleChristopher Speller2016-02-111-0/+2
|/ /
* | Merge pull request #2144 from ZBoxApp/PLT-1928Christopher Speller2016-02-111-1/+9
|\ \ | | | | | | PLT-1928: Fix localization on floating timestamp
| * | Fix localization on floating timestampElias Nahum2016-02-101-1/+9
| |/
* | Merge pull request #2143 from ZBoxApp/PLT-1932Christopher Speller2016-02-112-4/+4
|\ \ | | | | | | PLT-1932: Fix change email subject
| * | Need to set as template.HTMLElias Nahum2016-02-101-2/+2
| | |
| * | Change body info from String to HTMLElias Nahum2016-02-102-2/+2
| | |
| * | Fix change email subjectElias Nahum2016-02-101-1/+1
| |/
* | Merge pull request #2141 from rgarmsen2295/fix-search-map-errorChristopher Speller2016-02-111-6/+9
|\ \ | | | | | | RC2 - Fix issue with searching for short strings
| * | Fix issue with searching for short stringsReed Garmsen2016-02-101-6/+9
| | |
| * | Merge branch 'release-2.0'Christopher Speller2016-02-1018-319/+32
| |\ \
| * \ \ Merge pull request #2125 from ZBoxApp/new-locsCorey Hulen2016-02-092-12/+37
| |\ \ \ | | | | | | | | | | A few cmds strings
* | \ \ \ Merge pull request #2137 from mattermost/esethna-patch-1Christopher Speller2016-02-111-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add Commands Table to CHANGELOG.md for v2.0
| * | | | | Add Commands Table to CHANGELOG.md for v2.0Eric Sethna2016-02-101-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2136 from asaadmahmoodspin/release-2.0Christopher Speller2016-02-111-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | PLT-1941 - Improving UI for slash commands
| * | | | Improving UI for slash commandsAsaad Mahmood2016-02-101-2/+2
|/ / / /
* | | | Merge pull request #2135 from asaadmahmoodspin/release-2.0Christopher Speller2016-02-102-6/+4
|\ \ \ \ | | | | | | | | | | PLT-1935 - Fixing codespan inline issue
| * | | | Fixing codespan inline issueAsaad Mahmood2016-02-102-6/+4
| | |_|/ | |/| |
* | | | Merge pull request #2130 from hmhealey/extrainfoChristopher Speller2016-02-103-3/+42
|\ \ \ \ | | | | | | | | | | RC2 - Stopped returning inactive members with getExtraInfo calls
| * | | | Stopped returning inactive members with getExtraInfo callshmhealey2016-02-103-3/+42
| |/ / /
* | | | Merge pull request #2132 from mattermost/no-theme-fix2Christopher Speller2016-02-101-1/+4
|\ \ \ \ | |/ / / |/| | | RC2 - Fix canceling themes when user has no theme
| * | | Fix canceling themes when user has no themeJoramWilander2016-02-101-1/+4
|/ / /
* | | Merge pull request #2126 from ZBoxApp/new-locsChristopher Speller2016-02-102-12/+37
|\ \ \ | | |/ | |/| RC2 - A few cmds strings
| * | A few cmds stringsElias Nahum2016-02-092-12/+37
| |/
* | Fixing version unit testChristopher Speller2016-02-091-10/+5
| |
* | Updating version.go for 2.0Christopher Speller2016-02-091-0/+1
| |
* | Updating dockerfiles for 2.0Christopher Speller2016-02-0916-309/+26
|/
* Merge pull request #2122 from hmhealey/plt1544Christopher Speller2016-02-098-80/+97
|\ | | | | PLT-1544 Replaced Permalink popover with a Permalink modal