summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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
|/ / / / /
| | * / / Multiple UI ImprovementsAsaad Mahmood2016-02-1112-69/+91
| |/ / / |/| | |
* | | | 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
| * Replaced Permalink popover with a Permalink modalhmhealey2016-02-098-80/+97
| |
* | Merge pull request #2121 from ZBoxApp/PLT-1925Christopher Speller2016-02-092-2/+2
|\ \ | | | | | | PLT-1925: Fix delete_post_modal showing unnecessary $ sign
| * | 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
| * | | Fixing slash command help=Corey Hulen2016-02-094-172/+167
| | | |
* | | | Merge pull request #2119 from mattermost/esethna-patch-1Christopher Speller2016-02-091-0/+68
|\ \ \ \ | |_|/ / |/| | | Update NOTICE.txt to add react-intl and go-i18n
| * | | Update NOTICE.txtEric Sethna2016-02-091-0/+68
| |/ /
* | | Merge pull request #2117 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-02-092-0/+11
|\ \ \ | | | | | | | | Fixing single line code block on firefox
| * | | Fixing single line code block on firefoxAsaad Mahmood2016-02-092-0/+11
| |/ /
* | | Merge pull request #2118 from mattermost/reset-theme-fixChristopher Speller2016-02-091-4/+9
|\ \ \ | |/ / |/| | Reset theme on close of settings modal
| * | Reset theme on close of settings modalJoramWilander2016-02-091-4/+9
|/ /
* | Merge pull request #2105 from mattermost/esethna-patch-1Corey Hulen2016-02-091-0/+181
|\ \ | | | | | | Update CHANGELOG.md
| * | Update CHANGELOG.mdit332016-02-091-0/+5
| | |
| * | Update CHANGELOG.mdit332016-02-091-8/+5
| | |
| * | Update CHANGELOG.mdit332016-02-091-17/+24
| | |
| * | Update CHANGELOG.mdit332016-02-081-24/+38
| | |
| * | Update CHANGELOG.mdEric Sethna2016-02-081-2/+1
| | |
| * | Update CHANGELOG.mdEric Sethna2016-02-081-0/+159
| | | | | | | | | Add v2.0.0
* | | Merge pull request #2116 from mattermost/plt-1714Corey Hulen2016-02-091-3/+8
|\ \ \ | | | | | | | | PLT-1714 Adding hashing of binary to build process
| * | | Adding hashing of binary to build processChristopher Speller2016-02-091-3/+8
| | | |
* | | | Merge pull request #2115 from mattermost/plt-1506Joram Wilander2016-02-092-3/+5
|\ \ \ \ | | | | | | | | | | PLT-1506 Fixing mentions for inactive browser tabs.