summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PLT-7 switching dist to min=Corey Hulen2016-01-211-0/+1
|
* PLT-7 fixing dist build=Corey Hulen2016-01-214-2/+6
|
* Merge pull request #1949 from mattermost/PLT-7-client-infraCorey Hulen2016-01-21252-40/+4951
|\ | | | | PLT-7 client infra
| * PLT-7 client side infra=Corey Hulen2016-01-211-6/+3
| |
| * PLT-7 client side infra=Corey Hulen2016-01-217-34/+48
| |
| * Merge branch 'master' into PLT-7-client-infra=Corey Hulen2016-01-2113-147/+922
| |\ | |/ |/|
* | fixing cd errorChristopher Speller2016-01-211-1/+1
| |
* | moving mvChristopher Speller2016-01-211-1/+2
| |
* | SudoChristopher Speller2016-01-211-1/+1
| |
* | Fixing travisChristopher Speller2016-01-211-1/+1
| |
* | Fixing travisChristopher Speller2016-01-211-4/+1
| |
* | Fixing non travis buildChristopher Speller2016-01-211-1/+3
| |
* | Merge pull request #1841 from mattermost/auto-spinmintChristopher Speller2016-01-212-1/+5
|\ \ | | | | | | Testing PR for auto spinmint.
| * | 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
|\ \ \ | | | | | | | | Refactoring api to use translations (chunk 1)
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add spanish translations - Files in order by name from admin to export - Does not include api templates and tests - Fix web_test to load translations - Fix i18n to fallback to DEFAULT_LOCALE if no system locale found
| | | * 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
|\ \ \ | | | | | | | | PLT-1695 Completely disabled broken pasting of images on IE11
| * | | Completely disabled broken pasting of images on IE11hmhealey2016-01-201-1/+5
| |/ /
* | | Merge pull request #1935 from hmhealey/plt1664Corey Hulen2016-01-211-1/+1
|\ \ \ | | | | | | | | PLT-1664 Fix unread channel indicators so that they work on IE11
| * | | Changed UnreadChannelIndicator display style so that it uses a value that ↵hmhealey2016-01-201-1/+1
| | | | | | | | | | | | | | | | IE11 supports
* | | | Merge pull request #1933 from hmhealey/plt1661Corey Hulen2016-01-213-42/+32
|\ \ \ \ | | | | | | | | | | PLT-1661/PLT-1745 Scrolling fixes
| * | | | Added a small margin where the PostsView will be considered to be at the ↵hmhealey2016-01-201-1/+4
| | | | | | | | | | | | | | | | | | | | bottom even if it's not exactly at the bottom
| * | | | 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 ↵hmhealey2016-01-202-24/+30
| |/ / / | | | | | | | | | | | | magic numbers
* | | | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-215-1/+32
|\ \ \ \ | | | | | | | | | | [#1923] Make Websocket ports configurable
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | PLT-1668 Removes duplicate short username error message
| * | | | | 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 when constructing messages
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-1232: More channel info
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updating logo
| * | | | | | | | 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 ↵Asaad Mahmood2016-01-2058-41/+12444
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | ui-improvements
| * | | | | | | | 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
| | | | | | | | |