summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2100 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-085-14/+51
|\ | | | | Multiple UI Improvements
| * Updating time stampAsaad Mahmood2016-02-081-2/+3
| |
| * Updating username width in RHSAsaad Mahmood2016-02-083-1/+22
| |
| * Multiple UI ImprovementsAsaad Mahmood2016-02-083-12/+27
|/
* Merge pull request #2089 from mattermost/plt-1205Joram Wilander2016-02-0810-158/+176
|\ | | | | PLT-1205 Remove appearance settings tab and move theme management to display s…
| * Fix cancel bugJoramWilander2016-02-081-1/+3
| |
| * Remove appearance settings tab and move theme management to display settings tabJoramWilander2016-02-0510-159/+175
| |
* | Merge pull request #2083 from mattermost/plt-1879Christopher Speller2016-02-0810-29/+104
|\ \ | | | | | | PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete…
| * | Make insecure TLS connections configurableJoramWilander2016-02-059-30/+95
| | |
| * | Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bugJoramWilander2016-02-053-3/+13
| |/
* | Merge pull request #2092 from mattermost/fix-slashChristopher Speller2016-02-084-28/+55
|\ \ | | | | | | Fixing slash commands
| * | Fixing slash commands=Corey Hulen2016-02-051-8/+46
| | |
| * | Fixing slash commands=Corey Hulen2016-02-054-22/+11
| | |
* | | Merge pull request #2094 from mattermost/GIT-1812Christopher Speller2016-02-082-8/+22
|\ \ \ | | | | | | | | GIT-1812 fixing wesocket issue with firefox
| * | | GIT-1812 fixing wesocket issue with firefox=Corey Hulen2016-02-052-8/+22
| | | |
* | | | Merge pull request #2090 from hmhealey/plt1847Joram Wilander2016-02-062-8/+21
|\ \ \ \ | | | | | | | | | | PLT-1847 Disabled keyboard focus code changes on mobile
| * | | | Disabled keyboard focus code changes on mobilehmhealey2016-02-052-8/+21
| | |/ / | |/| |
* | | | Merge pull request #2093 from rgarmsen2295/plt-1615Joram Wilander2016-02-062-2/+9
|\ \ \ \ | |_|/ / |/| | | PLT-1615 Limits hashtag links to a minimum of three characters
| * | | Limits hashtag linking to a minimum of three charactersReed Garmsen2016-02-052-2/+9
| | | |
* | | | Merge pull request #2091 from rgarmsen2295/plt-1797Corey Hulen2016-02-054-3/+4
|\ \ \ \ | |/ / / |/| | | PLT-1797 Increased username max length
| * | | Increased username max lengthReed Garmsen2016-02-054-3/+4
| | | |
* | | | Merge pull request #2074 from rgarmsen2295/plt-1882Joram Wilander2016-02-052-1/+17
|\ \ \ \ | |_|/ / |/| | | PLT-1882 Fixed issue with on-hover timestamps
| * | | Separated displayTime functions for component/string formReed Garmsen2016-02-052-2/+38
| | | |
| * | | Fixed issue with on-hover timestampsReed Garmsen2016-02-052-33/+13
| | | |
* | | | Merge pull request #2088 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-052-3/+27
|\ \ \ \ | |/ / / |/| | | Minor UI Improvements
| * | | Fixing indentationAsaad Mahmood2016-02-051-2/+2
| | | |
| * | | Minor UI ImprovementsAsaad Mahmood2016-02-052-3/+27
|/ / /
* | | Merge pull request #2087 from hmhealey/plt1758Corey Hulen2016-02-053-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 ↵hmhealey2016-02-053-12/+13
| | |/ | |/| | | | | | | matches anything
* | | Merge pull request #2085 from hmhealey/plt1896Christopher Speller2016-02-051-0/+4
|\ \ \ | | | | | | | | PLT-1896 Added more space between adjacent markdown paragraphs
| * | | Added more space between adjacent markdown paragraphshmhealey2016-02-051-0/+4
| |/ /
* | | Merge pull request #2082 from mattermost/plt-1848Christopher Speller2016-02-051-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 timeJoramWilander2016-02-051-4/+23
| |/ /
* | | Merge pull request #2086 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-057-126/+150
|\ \ \ | |/ / |/| | Multiple UI improvements
| * | Improving indentation for base.scssAsaad Mahmood2016-02-051-128/+128
| | |
| * | Multiple UI improvementsAsaad Mahmood2016-02-057-31/+55
|/ /
* | Merge pull request #2077 from hmhealey/plt1819Joram Wilander2016-02-051-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 ↵hmhealey2016-02-041-5/+13
| | | | | | | | | | | | user clicks 'Not now' on Firefox
* | | Merge pull request #2080 from ZBoxApp/PLT-7-locsCorey Hulen2016-02-044-100/+133
|\ \ \ | | | | | | | | New localizations messages
| * | | New localizationsElias Nahum2016-02-044-100/+133
|/ / /
* | | Merge pull request #2079 from mattermost/help-text-updatesCorey Hulen2016-02-043-8/+8
|\ \ \ | | | | | | | | Changing URL for testing push notifications
| * | | Update en.jsonit332016-02-041-1/+1
| | | |
| * | | Update es.jsonit332016-02-041-1/+1
| | | |
| * | | Update en.jsonit332016-02-041-1/+1
| | | |
| * | | Update email_settings.jsxit332016-02-041-1/+1
| | | |
| * | | Update es.jsonit332016-02-041-2/+2
| | | |
| * | | Update en.jsonit332016-02-041-2/+2
| | | |
| * | | Update email_settings.jsxit332016-02-041-2/+2
| | | |
* | | | Merge pull request #2076 from ZBoxApp/loc-fixCorey Hulen2016-02-044-42/+114
|\ \ \ \ | | | | | | | | | | PLT-7: Fix and Add new loc strings
| * | | | fix typosElias Nahum2016-02-042-4/+4
| | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 14:56:38 +0000