Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #2135 from asaadmahmoodspin/release-2.0 | Christopher Speller | 2016-02-10 | 1 | -1/+1 | |
|\ \ | | | | | | | PLT-1935 - Fixing codespan inline issue | |||||
| * | | Fixing codespan inline issue | Asaad Mahmood | 2016-02-10 | 1 | -1/+1 | |
| |/ | ||||||
* | | 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 | 6 | -76/+93 | |
|\ | | | | | PLT-1544 Replaced Permalink popover with a Permalink modal | |||||
| * | Replaced Permalink popover with a Permalink modal | hmhealey | 2016-02-09 | 6 | -76/+93 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
* | | | Merge pull request #2117 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-02-09 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | Fixing single line code block on firefox | |||||
| * | | | Fixing single line code block on firefox | Asaad Mahmood | 2016-02-09 | 1 | -0/+4 | |
| |/ / | ||||||
* / / | 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 | |
| | |/ / | |/| | | ||||||
* / | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-09 | 8 | -12/+16 | |
|/ / / | ||||||
* | | | 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 | |
|/ / | ||||||
* | | Merge pull request #2106 from mattermost/PLT-1900 | Joram Wilander | 2016-02-08 | 4 | -48/+37 | |
|\ \ | | | | | | | PLT-1900 removing lang from preview and making spanish beta | |||||
| * | | 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 | 4 | -47/+37 | |
| | | | ||||||
* | | | Merge pull request #2103 from mattermost/plt-1884 | Christopher Speller | 2016-02-08 | 1 | -10/+12 | |
|\ \ \ | |/ / |/| | | PLT-1884 Fix pending posts not updating to failed | |||||
| * | | Fix pending posts not updating to failed | JoramWilander | 2016-02-08 | 1 | -10/+12 | |
| | | | ||||||
* | | | 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 | 2 | -6/+8 | |
|\ \ \ | | | | | | | | | 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 | 2 | -6/+8 | |
| | | | | ||||||
* | | | | Merge pull request #2101 from hmhealey/plt1415 | Christopher Speller | 2016-02-08 | 27 | -120/+120 | |
|\ \ \ \ | |_|/ / |/| | | | PLT-1415 Renamed RECIEVED_* to RECEIVED_* | |||||
| * | | | Renamed RECIEVED_* to RECEIVED_* | hmhealey | 2016-02-08 | 27 | -120/+120 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2096 from ZBoxApp/new-locs | Joram Wilander | 2016-02-08 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Add new localizations in english and spanish | |||||
| * | | | Fix intro message | Elias Nahum | 2016-02-08 | 1 | -1/+1 | |
| |/ / | ||||||
* / / | Multiple UI Improvements | Asaad Mahmood | 2016-02-08 | 1 | -12/+14 | |
|/ / | ||||||
* | | Merge pull request #2089 from mattermost/plt-1205 | Joram Wilander | 2016-02-08 | 7 | -143/+157 | |
|\ \ | | | | | | | PLT-1205 Remove appearance settings tab and move theme management to display s… | |||||
| * | | Fix cancel bug | JoramWilander | 2016-02-08 | 1 | -1/+3 | |
| | | | ||||||
| * | | Remove appearance settings tab and move theme management to display settings tab | JoramWilander | 2016-02-05 | 7 | -143/+155 | |
| | | | ||||||
* | | | Merge pull request #2083 from mattermost/plt-1879 | Christopher Speller | 2016-02-08 | 1 | -1/+49 | |
|\ \ \ | | | | | | | | | PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete… | |||||
| * | | | Make insecure TLS connections configurable | JoramWilander | 2016-02-05 | 1 | -1/+49 | |
| |/ / | ||||||
* | | | Merge pull request #2092 from mattermost/fix-slash | Christopher Speller | 2016-02-08 | 1 | -14/+2 | |
|\ \ \ | | | | | | | | | Fixing slash commands | |||||
| * | | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -14/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2094 from mattermost/GIT-1812 | Christopher Speller | 2016-02-08 | 1 | -8/+16 | |
|\ \ \ \ | |_|_|/ |/| | | | GIT-1812 fixing wesocket issue with firefox | |||||
| * | | | GIT-1812 fixing wesocket issue with firefox | =Corey Hulen | 2016-02-05 | 1 | -8/+16 | |
| | | | | ||||||
* | | | | Merge pull request #2090 from hmhealey/plt1847 | Joram Wilander | 2016-02-06 | 2 | -8/+21 | |
|\ \ \ \ | | | | | | | | | | | PLT-1847 Disabled keyboard focus code changes on mobile | |||||
| * | | | | Disabled keyboard focus code changes on mobile | hmhealey | 2016-02-05 | 2 | -8/+21 | |
| | |/ / | |/| | |