summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merging=Corey Hulen2016-01-222-3/+4
* merging=Corey Hulen2016-01-221772-517/+1556760
|\
| * Merge pull request #1959 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-223-4/+4
| |\
| | * Updating favicon stuffAsaad Mahmood2016-01-223-4/+4
| * | Merge pull request #1958 from mattermost/PLT-7-client-cookieCorey Hulen2016-01-222-77/+15
| |\ \ | | |/ | |/|
| | * PLT-7 adding loc header=Corey Hulen2016-01-221-1/+1
| | * PLT-7 adding loc header=Corey Hulen2016-01-221-1/+1
| | * PLT-7 adding loc header=Corey Hulen2016-01-222-77/+15
| |/
| * Merge pull request #1955 from mattermost/PLT-7-client-user-locCorey Hulen2016-01-221399-1/+1536141
| |\
| | * tweaking=Corey Hulen2016-01-221-1/+1
| | * PLT-7 fixing issues with safari=Corey Hulen2016-01-221395-1/+1535975
| | * PLT-7 adding loc feature to preview=Corey Hulen2016-01-222-2/+1
| | * PLT-7 adding loc feature to preview=Corey Hulen2016-01-222-37/+43
| | * PLT-7 adding lang selector=Corey Hulen2016-01-224-0/+161
| * | Merge pull request #1929 from esethna/patch-54Joram Wilander2016-01-221-1/+1
| |\ \ | | |/ | |/|
| | * Update team_general_tab.jsxEric Sethna2016-01-211-1/+1
| | * Update team_general_tab.jsxEric Sethna2016-01-201-1/+1
| * | Merge pull request #1954 from mattermost/PLT-7-c2-fixCorey Hulen2016-01-223-10/+8
| |\ \
| | * | PLT-7 fixing unit test for chunk 2 server=Corey Hulen2016-01-223-10/+8
| |/ /
| * | Merge pull request #1952 from ZBoxApp/PLT-7-goCorey Hulen2016-01-2214-649/+2538
| |\ \
| | * | PLT-7: Change post CreatePost back to model.NewAppErrorElias Nahum2016-01-221-3/+7
| | * | Refactoring api to use translations (chunk 2)Elias Nahum2016-01-2214-652/+2537
| * | | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-223-11/+16
| |\ \ \
| | * | | Added download param to getFile api callhmhealey2016-01-213-11/+16
| * | | | Merge pull request #1951 from mattermost/PLT-7-client-infra-fixCorey Hulen2016-01-211-0/+1
| |\ \ \ \
| | * | | | PLT-7 switching dist to min=Corey Hulen2016-01-211-0/+1
| * | | | | Merge pull request #1950 from mattermost/PLT-7-client-infra-fixCorey Hulen2016-01-214-2/+6
| |\| | | |
| | * | | | 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 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
| |\ \ \ \ \
| | * | | | | 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