Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
* | | | | Merge pull request #2101 from hmhealey/plt1415 | Christopher Speller | 2016-02-08 | 14 | -34/+34 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1415 Renamed RECIEVED_* to RECEIVED_* | ||||
| * | | | Renamed RECIEVED_* to RECEIVED_* | hmhealey | 2016-02-08 | 14 | -34/+34 |
| | |/ | |/| | |||||
* / | | 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 #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 |
| |/ / | |||||
* | | | Merge pull request #2091 from rgarmsen2295/plt-1797 | Corey Hulen | 2016-02-05 | 3 | -2/+3 |
|\ \ \ | | | | | | | | | PLT-1797 Increased username max length | ||||
| * | | | Increased username max length | Reed Garmsen | 2016-02-05 | 3 | -2/+3 |
| | | | | |||||
* | | | | Separated displayTime functions for component/string form | Reed Garmsen | 2016-02-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed issue with on-hover timestamps | Reed Garmsen | 2016-02-05 | 1 | -1/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #2087 from hmhealey/plt1758 | Corey Hulen | 2016-02-05 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | PLT-1758 Changed CommandProvider to only set the matched pretext if it actuall… | ||||
| * | | | Changed CommandProvider to only set the matched pretext if it actually ↵ | hmhealey | 2016-02-05 | 1 | -3/+0 |
| | |/ | |/| | | | | | | | matches anything | ||||
* | | | Merge pull request #2082 from mattermost/plt-1848 | Christopher Speller | 2016-02-05 | 1 | -4/+23 |
|\ \ \ | | | | | | | | | PLT-1848 Stats for recently active and new users now shows date with the time | ||||
| * | | | Stats for recently active and new users now shows date with the time | JoramWilander | 2016-02-05 | 1 | -4/+23 |
| |/ / | |||||
* / / | Multiple UI improvements | Asaad Mahmood | 2016-02-05 | 2 | -5/+7 |
|/ / | |||||
* | | Merge pull request #2079 from mattermost/help-text-updates | Corey Hulen | 2016-02-04 | 1 | -3/+3 |
|\ \ | | | | | | | Changing URL for testing push notifications | ||||
| * | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -1/+1 |
| | | | |||||
| * | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2076 from ZBoxApp/loc-fix | Corey Hulen | 2016-02-04 | 2 | -7/+28 |
|\ \ \ | | | | | | | | | PLT-7: Fix and Add new loc strings | ||||
| * | | | fix typos | Elias Nahum | 2016-02-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | PLT-7: Fix and Add new loc strings | Elias Nahum | 2016-02-04 | 2 | -6/+27 |
| |/ / | |||||
* | | | Merge pull request #2071 from hmhealey/plt1820 | Corey Hulen | 2016-02-04 | 4 | -41/+36 |
|\ \ \ | | | | | | | | | PLT-1820/PLT-1847 Cleaned up textbox focus code | ||||
| * | | | Added focus to the sidebar textbox when it is opened | hmhealey | 2016-02-04 | 1 | -0/+6 |
| | | | |