Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2100 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-08 | 5 | -14/+51 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Updating time stamp | Asaad Mahmood | 2016-02-08 | 1 | -2/+3 |
| | | |||||
| * | Updating username width in RHS | Asaad Mahmood | 2016-02-08 | 3 | -1/+22 |
| | | |||||
| * | Multiple UI Improvements | Asaad Mahmood | 2016-02-08 | 3 | -12/+27 |
|/ | |||||
* | Merge pull request #2089 from mattermost/plt-1205 | Joram Wilander | 2016-02-08 | 10 | -158/+176 |
|\ | | | | | 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 | 10 | -159/+175 |
| | | |||||
* | | Merge pull request #2083 from mattermost/plt-1879 | Christopher Speller | 2016-02-08 | 10 | -29/+104 |
|\ \ | | | | | | | 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 | 9 | -30/+95 |
| | | | |||||
| * | | Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bug | JoramWilander | 2016-02-05 | 3 | -3/+13 |
| |/ | |||||
* | | Merge pull request #2092 from mattermost/fix-slash | Christopher Speller | 2016-02-08 | 4 | -28/+55 |
|\ \ | | | | | | | Fixing slash commands | ||||
| * | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -8/+46 |
| | | | |||||
| * | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 4 | -22/+11 |
| | | | |||||
* | | | Merge pull request #2094 from mattermost/GIT-1812 | Christopher Speller | 2016-02-08 | 2 | -8/+22 |
|\ \ \ | | | | | | | | | GIT-1812 fixing wesocket issue with firefox | ||||
| * | | | GIT-1812 fixing wesocket issue with firefox | =Corey Hulen | 2016-02-05 | 2 | -8/+22 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | Merge pull request #2074 from rgarmsen2295/plt-1882 | Joram Wilander | 2016-02-05 | 2 | -1/+17 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1882 Fixed issue with on-hover timestamps | ||||
| * | | | 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 #2088 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-05 | 2 | -3/+27 |
|\ \ \ \ | |/ / / |/| | | | Minor UI Improvements | ||||
| * | | | Fixing indentation | Asaad Mahmood | 2016-02-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Minor UI Improvements | Asaad Mahmood | 2016-02-05 | 2 | -3/+27 |
|/ / / | |||||
* | | | 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 #2085 from hmhealey/plt1896 | Christopher Speller | 2016-02-05 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | PLT-1896 Added more space between adjacent markdown paragraphs | ||||
| * | | | Added more space between adjacent markdown paragraphs | hmhealey | 2016-02-05 | 1 | -0/+4 |
| |/ / | |||||
* | | | 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 |
| |/ / | |||||
* | | | Merge pull request #2086 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-02-05 | 7 | -126/+150 |
|\ \ \ | |/ / |/| | | Multiple UI improvements | ||||
| * | | Improving indentation for base.scss | Asaad Mahmood | 2016-02-05 | 1 | -128/+128 |
| | | | |||||
| * | | Multiple UI improvements | Asaad Mahmood | 2016-02-05 | 7 | -31/+55 |
|/ / | |||||
* | | 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 #2080 from ZBoxApp/PLT-7-locs | Corey Hulen | 2016-02-04 | 4 | -100/+133 |
|\ \ \ | | | | | | | | | New localizations messages | ||||
| * | | | New localizations | Elias Nahum | 2016-02-04 | 4 | -100/+133 |
|/ / / | |||||
* | | | Merge pull request #2079 from mattermost/help-text-updates | Corey Hulen | 2016-02-04 | 3 | -8/+8 |
|\ \ \ | | | | | | | | | Changing URL for testing push notifications | ||||
| * | | | Update en.json | it33 | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update es.json | it33 | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update en.json | it33 | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update es.json | it33 | 2016-02-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update en.json | it33 | 2016-02-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #2076 from ZBoxApp/loc-fix | Corey Hulen | 2016-02-04 | 4 | -42/+114 |
|\ \ \ \ | | | | | | | | | | | PLT-7: Fix and Add new loc strings | ||||
| * | | | | fix typos | Elias Nahum | 2016-02-04 | 2 | -4/+4 |
| | | | | |