Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 3 | -1/+46 |
|\ \ | | | | | | | PLT-1672 Added permalink feature to posts in the RHS | ||||
| * | | Added permalink feature to posts in the RHS | Reed Garmsen | 2016-02-12 | 3 | -1/+46 |
| | | | |||||
* | | | Merge branch 'release-2.0' | Christopher Speller | 2016-02-13 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix badge and tab */(1) not disappearing until switching away from channel | JoramWilander | 2016-02-12 | 1 | -1/+3 |
| | | | |||||
* | | | 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 | 5 | -13/+24 |
|\| | | |||||
| * | | 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 | 1 | -5/+3 |
| |\ \ \ | | |/ / | |/| | | PLT-1948: Fix duplicate am/pm on last password update | ||||
| | * | | eslint no-shadow resolved | Elias Nahum | 2016-02-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix duplicate am/pm on last password update | Elias Nahum | 2016-02-11 | 1 | -5/+3 |
| | | | | |||||
| * | | | 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 #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 |
| | | | | | |||||
| * | | | | Fixing socket store loc | =Corey Hulen | 2016-02-11 | 1 | -7/+7 |
| | |/ / | |/| | | |||||
* / | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-11 | 5 | -9/+7 |
|/ / / | |||||
* | | | 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 #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 |
| | |/ | |/| | |||||
* | | | Improving UI for slash commands | Asaad Mahmood | 2016-02-10 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #2130 from hmhealey/extrainfo | Christopher Speller | 2016-02-10 | 1 | -1/+1 |
|\ \ | | | | | | | RC2 - Stopped returning inactive members with getExtraInfo calls | ||||
| * | | Stopped returning inactive members with getExtraInfo calls | hmhealey | 2016-02-10 | 1 | -1/+1 |
| |/ | |||||
* / | Fix canceling themes when user has no theme | JoramWilander | 2016-02-10 | 1 | -1/+4 |
|/ | |||||
* | Merge pull request #2122 from hmhealey/plt1544 | Christopher Speller | 2016-02-09 | 2 | -76/+81 |
|\ | | | | | PLT-1544 Replaced Permalink popover with a Permalink modal | ||||
| * | Replaced Permalink popover with a Permalink modal | hmhealey | 2016-02-09 | 2 | -76/+81 |
| | | |||||
* | | Merge pull request #2121 from ZBoxApp/PLT-1925 | Christopher Speller | 2016-02-09 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1925: Fix delete_post_modal showing unnecessary $ sign | ||||
| * | | Fix delete_post_modal showing unnecessary $ sign | Elias Nahum | 2016-02-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2120 from mattermost/slash-help | Christopher Speller | 2016-02-09 | 2 | -127/+143 |
|\ \ \ | |/ / |/| | | Fixing slash command help | ||||
| * | | Fixing slash command help | =Corey Hulen | 2016-02-09 | 2 | -127/+143 |
| | | | |||||
* | | | Reset theme on close of settings modal | JoramWilander | 2016-02-09 | 1 | -4/+9 |
|/ / | |||||
* | | Merge pull request #2099 from hmhealey/plt1883 | Corey Hulen | 2016-02-09 | 2 | -8/+28 |
|\ \ | | | | | | | PLT-1883 Update search result components when we receive channels | ||||
| * | | Changed SearchResults to update when the channel store receives data | hmhealey | 2016-02-08 | 2 | -8/+28 |
| | | | |||||
* | | | Merge pull request #2113 from mattermost/slash-command-fixes | Christopher Speller | 2016-02-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Multiple minor slash command fixes | ||||
| * | | | Multiple minor slash command fixes | JoramWilander | 2016-02-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-09 | 6 | -12/+14 |
|/ / / | |||||
* | | | Merge pull request #2107 from rgarmsen2295/plt-1715 | Joram Wilander | 2016-02-08 | 1 | -5/+0 |
|\ \ \ | | | | | | | | | PLT-1715 - Removed the ability to disable file storage from the admin console | ||||
| * | | | Removed the ability to disable file storage from the admin console | Reed Garmsen | 2016-02-08 | 1 | -5/+0 |
| | |/ | |/| | |||||
* / | | Provides error message on user sign-up page when no sign-up methods are enabled | Reed Garmsen | 2016-02-08 | 1 | -0/+11 |
|/ / | |||||
* | | Fixing eslint error | =Corey Hulen | 2016-02-08 | 1 | -1/+0 |
| | | |||||
* | | PLT-1900 removing lang from preview and making spanish beta | =Corey Hulen | 2016-02-08 | 2 | -42/+36 |
| | | |||||
* | | Merge pull request #2104 from mattermost/minor-fix-jw | Corey Hulen | 2016-02-08 | 1 | -2/+2 |
|\ \ | | | | | | | Fix accidental adding of change listener on unmount | ||||
| * | | Fix accidental adding of change listener on unmount | JoramWilander | 2016-02-08 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2095 from mattermost/plt-1787 | Christopher Speller | 2016-02-08 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | PLT-1787 Fix statuses not rendering until a change in the LHS | ||||
| * | | | Fix statuses not rendering until a change in the LHS | JoramWilander | 2016-02-08 | 1 | -1/+3 |
| | | | |