Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2093 from rgarmsen2295/plt-1615 | Joram Wilander | 2016-02-06 | 2 | -2/+9 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1615 Limits hashtag links to a minimum of three characters | ||||
| * | | | Limits hashtag linking to a minimum of three characters | Reed Garmsen | 2016-02-05 | 2 | -2/+9 |
| | | | | |||||
* | | | | Merge pull request #2091 from rgarmsen2295/plt-1797 | Corey Hulen | 2016-02-05 | 4 | -3/+4 |
|\ \ \ \ | |/ / / |/| | | | PLT-1797 Increased username max length | ||||
| * | | | Increased username max length | Reed Garmsen | 2016-02-05 | 4 | -3/+4 |
| | | | | |||||
* | | | | Separated displayTime functions for component/string form | Reed Garmsen | 2016-02-05 | 2 | -2/+38 |
| | | | | |||||
* | | | | Fixed issue with on-hover timestamps | Reed Garmsen | 2016-02-05 | 2 | -33/+13 |
| |/ / |/| | | |||||
* | | | Merge pull request #2087 from hmhealey/plt1758 | Corey Hulen | 2016-02-05 | 3 | -12/+13 |
|\ \ \ | | | | | | | | | 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 | 3 | -12/+13 |
| | |/ | |/| | | | | | | | 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 #2077 from hmhealey/plt1819 | Joram Wilander | 2016-02-05 | 1 | -5/+13 |
|\ \ | | | | | | | PLT-1819 Changed notification permission dialogue to only be shown once per page load | ||||
| * | | Changed notifications to only request permission once per session if the ↵ | hmhealey | 2016-02-04 | 1 | -5/+13 |
| | | | | | | | | | | | | user clicks 'Not now' on Firefox | ||||
* | | | 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 #2075 from mattermost/PLT-1851 | Corey Hulen | 2016-02-04 | 1 | -7/+16 |
|\ \ \ \ | | | | | | | | | | | PLT-1851 reconnect and get missing messages | ||||
| * | | | | PLT-1851 fixing websocket reconnect error | =Corey Hulen | 2016-02-04 | 1 | -6/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' into PLT-1851 | =Corey Hulen | 2016-02-04 | 11 | -79/+963 |
| |\| | | | |||||
| * | | | | PLT-1851 reconnect and get missing messages | =Corey Hulen | 2016-02-03 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | |