summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
|/ / / / /
| | * / / Multiple UI ImprovementsAsaad Mahmood2016-02-1112-69/+91
| |/ / / |/| | |
* | | | Merge pull request #2144 from ZBoxApp/PLT-1928Christopher Speller2016-02-111-1/+9
|\ \ \ \
| * | | | Fix localization on floating timestampElias Nahum2016-02-101-1/+9
| |/ / /
* | | | Merge pull request #2143 from ZBoxApp/PLT-1932Christopher Speller2016-02-112-4/+4
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge pull request #2137 from mattermost/esethna-patch-1Christopher Speller2016-02-111-0/+3
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improving UI for slash commandsAsaad Mahmood2016-02-101-2/+2
|/ / / /
* | | | Merge pull request #2135 from asaadmahmoodspin/release-2.0Christopher Speller2016-02-102-6/+4
|\ \ \ \
| * | | | Fixing codespan inline issueAsaad Mahmood2016-02-102-6/+4
| | |_|/ | |/| |
* | | | Merge pull request #2130 from hmhealey/extrainfoChristopher Speller2016-02-103-3/+42
|\ \ \ \
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ | | |/ | |/|
| * | 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
|\
| * Replaced Permalink popover with a Permalink modalhmhealey2016-02-098-80/+97
* | Merge pull request #2121 from ZBoxApp/PLT-1925Christopher Speller2016-02-092-2/+2
|\ \
| * | Fix delete_post_modal showing unnecessary $ signElias Nahum2016-02-092-2/+2
* | | Merge pull request #2120 from mattermost/slash-helpChristopher Speller2016-02-094-172/+167
|\ \ \
| * | | Fixing slash command help=Corey Hulen2016-02-094-172/+167
* | | | Merge pull request #2119 from mattermost/esethna-patch-1Christopher Speller2016-02-091-0/+68
|\ \ \ \ | |_|/ / |/| | |