Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #2171 from asaadmahmoodspin/ui-fixes | Joram Wilander | 2016-02-16 | 9 | -17/+212 | |
|\ \ \ | |/ / |/| | | Multiple UI Improvements | |||||
| * | | Other minor improvements | Asaad Mahmood | 2016-02-15 | 3 | -3/+25 | |
| | | | ||||||
| * | | Fixing custom theme header click event | Asaad Mahmood | 2016-02-15 | 2 | -6/+10 | |
| | | | ||||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-02-15 | 6 | -14/+183 | |
|/ / | ||||||
* | | Merge pull request #2146 from ttyniwa/feature/PLT-1908 | Corey Hulen | 2016-02-14 | 3 | -17/+118 | |
|\ \ | | | | | | | PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu | |||||
| * | | add translated messages to es.json. | Tatsuya Niwa | 2016-02-12 | 1 | -0/+4 | |
| | | | ||||||
| * | | delete not translated messages in es.json | Tatsuya Niwa | 2016-02-12 | 1 | -4/+0 | |
| | | | ||||||
| * | | Add a warning when demoting yourself from System Administrator from the team ↵ | Tatsuya Niwa | 2016-02-11 | 3 | -17/+118 | |
| | | | | | | | | | | | | Manage Members menu | |||||
* | | | Merge pull request #2168 from ZBoxApp/permalink-spanish | Corey Hulen | 2016-02-14 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | RHS spanish translations for permalink | |||||
| * | | | RHS spanish translations for permalink | Elias Nahum | 2016-02-14 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2165 from ZBoxApp/update-locs | Corey Hulen | 2016-02-14 | 2 | -2/+2 | |
|\ \ \ \ | |/ / / |/| | | | Update loc strings | |||||
| * | | | Update loc strings | Elias Nahum | 2016-02-12 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2123 from hmhealey/plt1711 | Joram Wilander | 2016-02-14 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | PLT-1711 Prevent the admin console from switching to a team that is being remo… | |||||
| * | | | | Prevent the admin console from switching to a team that is being removed ↵ | hmhealey | 2016-02-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | from the sidebar | |||||
* | | | | | Merge pull request #2138 from rgarmsen2295/plt-1672 | Joram Wilander | 2016-02-14 | 4 | -1/+48 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1672 Added permalink feature to posts in the RHS | |||||
| * | | | | | Added permalink feature to posts in the RHS | Reed Garmsen | 2016-02-12 | 4 | -1/+48 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'release-2.0' | Christopher Speller | 2016-02-13 | 6 | -17/+52 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Merge pull request #2161 from mattermost/load-more-fix | Christopher Speller | 2016-02-13 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | RC3 Fix load more messages being broken by getPostsSince call | |||||
| | * | | | | Fix load more messages being broken by getPostsSince call | JoramWilander | 2016-02-12 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #2164 from mattermost/unread-tab-fix | Christopher Speller | 2016-02-13 | 3 | -6/+8 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | RC3 Fix badge and tab */(1) not disappearing until switching away from channel | |||||
| | * | | | | | Fix badge and tab */(1) not disappearing until switching away from channel | JoramWilander | 2016-02-12 | 3 | -6/+8 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #2166 from mattermost/esethna-patch-1 | Christopher Speller | 2016-02-13 | 1 | -8/+18 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update Changelog.md with more known issues | |||||
| | * | | | | | Update Changelog.md with more known issues | Eric Sethna | 2016-02-12 | 1 | -8/+18 | |
| | |/ / / / | | | | | | | | | | | | | Add known issues found in testing | |||||
| * | | | | | Merge pull request #2167 from mattermost/gitlab-sso-fix | Christopher Speller | 2016-02-13 | 1 | -2/+25 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | RC3 Make sure the GitLab user has the required fields | |||||
| | * | | | | Make sure the GitLab user has the required fields | JoramWilander | 2016-02-12 | 1 | -2/+25 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2152 from asaadmahmoodspin/ui-fixes | Christopher Speller | 2016-02-12 | 12 | -69/+91 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Multiple UI Improvements | |||||
| * | | | | Adding import instead of require for fastclick | Asaad Mahmood | 2016-02-12 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes | Asaad Mahmood | 2016-02-12 | 17 | -38/+60 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Updating dockerfile for v2.0.0-rc2 | Christopher Speller | 2016-02-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #2157 from mattermost/ie-cache-fix | Christopher Speller | 2016-02-12 | 6 | -6/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing IE expire issue | |||||
| * | | | | | Fixing IE expire issue | =Corey Hulen | 2016-02-11 | 6 | -6/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2158 from mattermost/fix-socket-loc | Christopher Speller | 2016-02-11 | 1 | -7/+7 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixing so the loc tool can use these | |||||
| * | | | | | | Fixing so the loc tool can use these | =Corey Hulen | 2016-02-11 | 1 | -7/+7 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2155 from ZBoxApp/PLT-1948 | Christopher Speller | 2016-02-11 | 2 | -5/+7 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PLT-1948: Fix duplicate am/pm on last password update | |||||
| * | | | | | eslint no-shadow resolved | Elias Nahum | 2016-02-11 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Fix duplicate am/pm on last password update | Elias Nahum | 2016-02-11 | 2 | -5/+7 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | 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 |