summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Adding curl to upload pr buildsChristopher Speller2016-01-212-1/+5
* | | | | | | Merge pull request #1940 from ZBoxApp/PLT-7-goCorey Hulen2016-01-2111-146/+917
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Fix bug to load the default locale if no system locale is foundElias Nahum2016-01-211-17/+6
| * | | | | Remove settings from config.jsonElias Nahum2016-01-211-23/+0
| * | | | | Refactoring api to use translations (chunk 1)Elias Nahum2016-01-2111-140/+945
| | | * | | PLT-7 Adding react-intl libs=Corey Hulen2016-01-21248-10/+4908
| | | * | | adding ignore=Corey Hulen2016-01-211-0/+2
| |_|/ / / |/| | | |
* | | | | Merge pull request #1937 from hmhealey/plt1695Corey Hulen2016-01-211-1/+5
|\ \ \ \ \
| * | | | | Completely disabled broken pasting of images on IE11hmhealey2016-01-201-1/+5
| |/ / / /
* | | | | Merge pull request #1935 from hmhealey/plt1664Corey Hulen2016-01-211-1/+1
|\ \ \ \ \
| * | | | | Changed UnreadChannelIndicator display style so that it uses a value that IE1...hmhealey2016-01-201-1/+1
* | | | | | Merge pull request #1933 from hmhealey/plt1661Corey Hulen2016-01-213-42/+32
|\ \ \ \ \ \
| * | | | | | Added a small margin where the PostsView will be considered to be at the bott...hmhealey2016-01-201-1/+4
| * | | | | | Removed some vestigial code from the post textboxhmhealey2016-01-201-19/+0
| * | | | | | Changed the post textbox resizing code to be more reliable and not rely on ma...hmhealey2016-01-202-24/+30
| |/ / / / /
* | | | | | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-215-1/+32
|\ \ \ \ \ \
| * | | | | | Update documentation for WebsocketSecurePortAndy Lo-A-Foe2016-01-201-1/+1
| * | | | | | Fix indentationAndy Lo-A-Foe2016-01-201-7/+7
| * | | | | | Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-195-1/+32
* | | | | | | Merge pull request #1927 from rgarmsen2295/plt-1668Christopher Speller2016-01-219-44/+57
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Removed extraneous error when providing a short usernameReed Garmsen2016-01-209-44/+57
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1922 from cloudron-io/check_auth_serviceHarrison Healey2016-01-211-2/+2
|\ \ \ \ \ \
| * | | | | | Check auth_service for constructing messagegirish@cloudron.io2016-01-191-1/+1
| * | | | | | Check auth_service to describe user login messagegirish@cloudron.io2016-01-191-1/+1
* | | | | | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-infoHarrison Healey2016-01-211-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Show correct channel URL in channel info modalPat Lathem2016-01-131-1/+4
| * | | | | | | Rename 'Channel Handle' to Channel URL'Pat Lathem2016-01-131-1/+1
| * | | | | | | Add channel purposePat Lathem2016-01-131-0/+5
* | | | | | | | Merge pull request #1893 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-2130-15/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing height for iconAsaad Mahmood2016-01-201-1/+1
| * | | | | | | | Updating status icon cssAsaad Mahmood2016-01-201-1/+3
| * | | | | | | | Fixing status icon in IE11Asaad Mahmood2016-01-201-0/+1
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2016-01-2058-41/+12444
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Updating favicon fileAsaad Mahmood2016-01-151-1/+1
| * | | | | | | | Updating favicon fileAsaad Mahmood2016-01-151-1/+1
| * | | | | | | | Adding gradient bg behind logoAsaad Mahmood2016-01-1518-0/+0
| * | | | | | | | Adding bg behind logosAsaad Mahmood2016-01-1518-0/+0
| * | | | | | | | Updating logoAsaad Mahmood2016-01-1528-14/+51
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1891 from trashcan/PLT-1515-password-change-wordingJoram Wilander2016-01-212-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve wording of password change email to indicate that it might not have b...Pat Lathem2016-01-142-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1886 from rgarmsen2295/plt-549cJoram Wilander2016-01-211-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed react warning issue with setState in RHSReed Garmsen2016-01-131-2/+10
* | | | | | | | | Merge pull request #1885 from rgarmsen2295/plt-406Joram Wilander2016-01-212-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue with file overlay getting stuck in ie11Reed Garmsen2016-01-131-0/+1
| * | | | | | | | | Fix issue with drag n drop overlay in ie11Reed Garmsen2016-01-121-0/+4
* | | | | | | | | | Merge pull request #1884 from hmhealey/plt1403Joram Wilander2016-01-211-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed incorrect test case for autolinking urls with angle bracketshmhealey2016-01-201-1/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1883 from rosskusler/masterJoram Wilander2016-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed typo in URL to emoji.codesRoss Kusler2016-01-131-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1867 from apskim/patch-1Joram Wilander2016-01-211-0/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |