Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes | Asaad Mahmood | 2016-02-12 | 10 | -32/+54 |
|\ | |||||
| * | 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 |
| | |/ / | |||||
| * | / | Fixing socket store loc | =Corey Hulen | 2016-02-11 | 2 | -7/+21 |
| | |/ | |/| | |||||
* / | | Multiple UI Improvements | Asaad Mahmood | 2016-02-11 | 12 | -69/+91 |
|/ / | |||||
* | | 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 #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 | 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 |
|/ | |||||
* | A few cmds strings | Elias Nahum | 2016-02-09 | 2 | -12/+37 |
| | |||||
* | 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 #2117 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-02-09 | 2 | -0/+11 |
|\ \ \ | | | | | | | | | Fixing single line code block on firefox | ||||
| * | | | Fixing single line code block on firefox | Asaad Mahmood | 2016-02-09 | 2 | -0/+11 |
| |/ / | |||||
* / / | Reset theme on close of settings modal | JoramWilander | 2016-02-09 | 1 | -4/+9 |
|/ / | |||||
* | | Merge pull request #2115 from mattermost/plt-1506 | Joram Wilander | 2016-02-09 | 2 | -3/+5 |
|\ \ | | | | | | | PLT-1506 Fixing mentions for inactive browser tabs. | ||||
| * | | Changing meation behaviour to show meantion when viewing channel but tab is ↵ | Christopher Speller | 2016-02-09 | 2 | -3/+5 |
| | | | | | | | | | | | | not focused | ||||
* | | | Merge pull request #2099 from hmhealey/plt1883 | Corey Hulen | 2016-02-09 | 3 | -8/+50 |
|\ \ \ | | | | | | | | | 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 |
| | | | | |||||
| * | | | Added support for ES6 Maps to Utils.areObjectsEqual | hmhealey | 2016-02-08 | 1 | -0/+22 |
| | | | | |||||
* | | | | Merge pull request #2113 from mattermost/slash-command-fixes | Christopher Speller | 2016-02-09 | 2 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | Multiple minor slash command fixes | ||||
| * | | | | Multiple minor slash command fixes | JoramWilander | 2016-02-09 | 2 | -2/+8 |
| | | | | | |||||
* | | | | | Merge pull request #2114 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-09 | 15 | -39/+61 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Multiple UI Improvements | ||||
| * | | | | Improving mentions issue with long names | Asaad Mahmood | 2016-02-09 | 2 | -0/+18 |
| | | | | |