Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2150 from ZBoxApp/PLT-1963 | Christopher Speller | 2016-02-11 | 1 | -4/+5 |
|\ | | | | | PLT-1963: Fixing intl console error on Outgoing webhook edit | ||||
| * | Fixing intl console error on Outgoing webhook edit | Elias Nahum | 2016-02-11 | 1 | -4/+5 |
| | | |||||
* | | Merge pull request #2154 from mattermost/plt-1933 | Christopher Speller | 2016-02-11 | 1 | -0/+1 |
|\ \ | | | | | | | RC2 PLT-1933 Emit change after setting preferences in head.html | ||||
| * | | Emit change after setting preferences in head.html | JoramWilander | 2016-02-11 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #2153 from mattermost/plt-1939 | Christopher Speller | 2016-02-11 | 2 | -3/+3 |
|\ \ \ | |/ / |/| | | RC2 PLT-1939 Fix localization error for team invites | ||||
| * | | Fix localization error for team invites | JoramWilander | 2016-02-11 | 2 | -3/+3 |
| |/ | |||||
* | | Merge pull request #2145 from mattermost/PLT-1956 | Christopher Speller | 2016-02-11 | 1 | -1/+13 |
|\ \ | | | | | | | PLT-1956 Infinite "Loading..." Animation for Webhooks/Slash Commands UI | ||||
| * | | PLT-1956 | =Corey Hulen | 2016-02-10 | 1 | -1/+13 |
| | | | |||||
* | | | Merge pull request #2148 from mattermost/missing-posts-2.0 | Christopher Speller | 2016-02-11 | 2 | -19/+11 |
|\ \ \ | | | | | | | | | RC2 PLT-1774 Fixing the elusive missing post bug | ||||
| * | | | Switch to using create_at for latest post | JoramWilander | 2016-02-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | If we have less than CHUNK_SIZE posts, then get the first page | JoramWilander | 2016-02-11 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fix case where channel has a postlist but no posts | JoramWilander | 2016-02-11 | 1 | -1/+6 |
| | | | | |||||
| * | | | Fixing the elusive missing post bug | JoramWilander | 2016-02-11 | 2 | -19/+4 |
| |/ / | |||||
* | | | Merge pull request #2151 from mattermost/fix-socket | Christopher Speller | 2016-02-11 | 2 | -7/+21 |
|\ \ \ | |_|/ |/| | | Fixing socket store loc | ||||
| * | | Fixing socket store loc | =Corey Hulen | 2016-02-11 | 2 | -7/+21 |
|/ / | |||||
* | | Merge pull request #2149 from mattermost/plt-1949 | Christopher Speller | 2016-02-11 | 1 | -0/+2 |
|\ \ | | | | | | | PLT-1949 Fixing cacheing issue on IE for admin console | ||||
| * | | Fixing cacheing issue on IE for admin console | Christopher Speller | 2016-02-11 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #2144 from ZBoxApp/PLT-1928 | Christopher Speller | 2016-02-11 | 1 | -1/+9 |
|\ \ | | | | | | | PLT-1928: Fix localization on floating timestamp | ||||
| * | | Fix localization on floating timestamp | Elias Nahum | 2016-02-10 | 1 | -1/+9 |
| |/ | |||||
* | | Merge pull request #2143 from ZBoxApp/PLT-1932 | Christopher Speller | 2016-02-11 | 2 | -4/+4 |
|\ \ | | | | | | | PLT-1932: Fix change email subject | ||||
| * | | Need to set as template.HTML | Elias Nahum | 2016-02-10 | 1 | -2/+2 |
| | | | |||||
| * | | Change body info from String to HTML | Elias Nahum | 2016-02-10 | 2 | -2/+2 |
| | | | |||||
| * | | Fix change email subject | Elias Nahum | 2016-02-10 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2141 from rgarmsen2295/fix-search-map-error | Christopher Speller | 2016-02-11 | 1 | -6/+9 |
|\ \ | | | | | | | RC2 - Fix issue with searching for short strings | ||||
| * | | Fix issue with searching for short strings | Reed Garmsen | 2016-02-10 | 1 | -6/+9 |
| | | | |||||
| * | | Merge branch 'release-2.0' | Christopher Speller | 2016-02-10 | 18 | -319/+32 |
| |\ \ | |||||
| * \ \ | Merge pull request #2125 from ZBoxApp/new-locs | Corey Hulen | 2016-02-09 | 2 | -12/+37 |
| |\ \ \ | | | | | | | | | | | A few cmds strings | ||||
* | \ \ \ | Merge pull request #2137 from mattermost/esethna-patch-1 | Christopher Speller | 2016-02-11 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add Commands Table to CHANGELOG.md for v2.0 | ||||
| * | | | | | Add Commands Table to CHANGELOG.md for v2.0 | Eric Sethna | 2016-02-10 | 1 | -0/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2136 from asaadmahmoodspin/release-2.0 | Christopher Speller | 2016-02-11 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | PLT-1941 - Improving UI for slash commands | ||||
| * | | | | Improving UI for slash commands | Asaad Mahmood | 2016-02-10 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #2135 from asaadmahmoodspin/release-2.0 | Christopher Speller | 2016-02-10 | 2 | -6/+4 |
|\ \ \ \ | | | | | | | | | | | PLT-1935 - Fixing codespan inline issue | ||||
| * | | | | Fixing codespan inline issue | Asaad Mahmood | 2016-02-10 | 2 | -6/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2130 from hmhealey/extrainfo | Christopher Speller | 2016-02-10 | 3 | -3/+42 |
|\ \ \ \ | | | | | | | | | | | RC2 - Stopped returning inactive members with getExtraInfo calls | ||||
| * | | | | Stopped returning inactive members with getExtraInfo calls | hmhealey | 2016-02-10 | 3 | -3/+42 |
| |/ / / | |||||
* | | | | Merge pull request #2132 from mattermost/no-theme-fix2 | Christopher Speller | 2016-02-10 | 1 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | RC2 - Fix canceling themes when user has no theme | ||||
| * | | | Fix canceling themes when user has no theme | JoramWilander | 2016-02-10 | 1 | -1/+4 |
|/ / / | |||||
* | | | Merge pull request #2126 from ZBoxApp/new-locs | Christopher Speller | 2016-02-10 | 2 | -12/+37 |
|\ \ \ | | |/ | |/| | RC2 - A few cmds strings | ||||
| * | | A few cmds strings | Elias Nahum | 2016-02-09 | 2 | -12/+37 |
| |/ | |||||
* | | Fixing version unit test | Christopher Speller | 2016-02-09 | 1 | -10/+5 |
| | | |||||
* | | Updating version.go for 2.0 | Christopher Speller | 2016-02-09 | 1 | -0/+1 |
| | | |||||
* | | Updating dockerfiles for 2.0 | Christopher Speller | 2016-02-09 | 16 | -309/+26 |
|/ | |||||
* | Merge pull request #2122 from hmhealey/plt1544 | Christopher Speller | 2016-02-09 | 8 | -80/+97 |
|\ | | | | | PLT-1544 Replaced Permalink popover with a Permalink modal | ||||
| * | Replaced Permalink popover with a Permalink modal | hmhealey | 2016-02-09 | 8 | -80/+97 |
| | | |||||
* | | Merge pull request #2121 from ZBoxApp/PLT-1925 | Christopher Speller | 2016-02-09 | 2 | -2/+2 |
|\ \ | | | | | | | PLT-1925: Fix delete_post_modal showing unnecessary $ sign | ||||
| * | | Fix delete_post_modal showing unnecessary $ sign | Elias Nahum | 2016-02-09 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2120 from mattermost/slash-help | Christopher Speller | 2016-02-09 | 4 | -172/+167 |
|\ \ \ | | | | | | | | | Fixing slash command help | ||||
| * | | | Fixing slash command help | =Corey Hulen | 2016-02-09 | 4 | -172/+167 |
| | | | | |||||
* | | | | Merge pull request #2119 from mattermost/esethna-patch-1 | Christopher Speller | 2016-02-09 | 1 | -0/+68 |
|\ \ \ \ | |_|/ / |/| | | | Update NOTICE.txt to add react-intl and go-i18n | ||||
| * | | | Update NOTICE.txt | Eric Sethna | 2016-02-09 | 1 | -0/+68 |
| |/ / |