Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merging | =Corey Hulen | 2016-01-22 | 1772 | -517/+1556760 |
|\ | |||||
| * | Merge pull request #1959 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-22 | 3 | -4/+4 |
| |\ | | | | | | | Updating favicon stuff | ||||
| | * | Updating favicon stuff | Asaad Mahmood | 2016-01-22 | 3 | -4/+4 |
| | | | |||||
| * | | Merge pull request #1958 from mattermost/PLT-7-client-cookie | Corey Hulen | 2016-01-22 | 2 | -77/+15 |
| |\ \ | | |/ | |/| | Plt 7 client cookie | ||||
| | * | PLT-7 adding loc header | =Corey Hulen | 2016-01-22 | 1 | -1/+1 |
| | | | |||||
| | * | PLT-7 adding loc header | =Corey Hulen | 2016-01-22 | 1 | -1/+1 |
| | | | |||||
| | * | PLT-7 adding loc header | =Corey Hulen | 2016-01-22 | 2 | -77/+15 |
| |/ | |||||
| * | Merge pull request #1955 from mattermost/PLT-7-client-user-loc | Corey Hulen | 2016-01-22 | 1399 | -1/+1536141 |
| |\ | | | | | | | Plt 7 client user loc | ||||
| | * | tweaking | =Corey Hulen | 2016-01-22 | 1 | -1/+1 |
| | | | |||||
| | * | PLT-7 fixing issues with safari | =Corey Hulen | 2016-01-22 | 1395 | -1/+1535975 |
| | | | |||||
| | * | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 2 | -2/+1 |
| | | | |||||
| | * | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 2 | -37/+43 |
| | | | |||||
| | * | PLT-7 adding lang selector | =Corey Hulen | 2016-01-22 | 4 | -0/+161 |
| | | | |||||
| * | | Merge pull request #1929 from esethna/patch-54 | Joram Wilander | 2016-01-22 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Update team_general_tab.jsx | ||||
| | * | Update team_general_tab.jsx | Eric Sethna | 2016-01-21 | 1 | -1/+1 |
| | | | | | | | | | Correct capitalization based on UX discussion | ||||
| | * | Update team_general_tab.jsx | Eric Sethna | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | | | Add more direct instructions on enabling the team directory in the system console. From community issue: https://github.com/mattermost/platform/issues/1835 | ||||
| * | | Merge pull request #1954 from mattermost/PLT-7-c2-fix | Corey Hulen | 2016-01-22 | 3 | -10/+8 |
| |\ \ | | | | | | | | | PLT-7 fixing unit test for chunk 2 server | ||||
| | * | | PLT-7 fixing unit test for chunk 2 server | =Corey Hulen | 2016-01-22 | 3 | -10/+8 |
| |/ / | |||||
| * | | Merge pull request #1952 from ZBoxApp/PLT-7-go | Corey Hulen | 2016-01-22 | 14 | -649/+2538 |
| |\ \ | | | | | | | | | PLT-7: Refactoring api to use translations (chunk 2) | ||||
| | * | | PLT-7: Change post CreatePost back to model.NewAppError | Elias Nahum | 2016-01-22 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | - It was failing test using model.NewLocAppError | ||||
| | * | | Refactoring api to use translations (chunk 2) | Elias Nahum | 2016-01-22 | 14 | -652/+2537 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Add spanish translations - Does not include tests - Add func to get the translations for a user locale | ||||
| * | | | Merge pull request #1948 from hmhealey/plt1652 | Christopher Speller | 2016-01-22 | 3 | -11/+16 |
| |\ \ \ | | | | | | | | | | | PLT-1652 Added download param to getFile api call | ||||
| | * | | | Added download param to getFile api call | hmhealey | 2016-01-21 | 3 | -11/+16 |
| | | | | | |||||
| * | | | | Merge pull request #1951 from mattermost/PLT-7-client-infra-fix | Corey Hulen | 2016-01-21 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-7 switching dist to min | ||||
| | * | | | | PLT-7 switching dist to min | =Corey Hulen | 2016-01-21 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #1950 from mattermost/PLT-7-client-infra-fix | Corey Hulen | 2016-01-21 | 4 | -2/+6 |
| |\| | | | | | | | | | | | | | | | | PLT-7 fixing dist build | ||||
| | * | | | | PLT-7 fixing dist build | =Corey Hulen | 2016-01-21 | 4 | -2/+6 |
| |/ / / / | |||||
| * | | | | Merge pull request #1949 from mattermost/PLT-7-client-infra | Corey Hulen | 2016-01-21 | 252 | -40/+4951 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-7 client infra | ||||
| | * | | | | PLT-7 client side infra | =Corey Hulen | 2016-01-21 | 1 | -6/+3 |
| | | | | | | |||||
| | * | | | | PLT-7 client side infra | =Corey Hulen | 2016-01-21 | 7 | -34/+48 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into PLT-7-client-infra | =Corey Hulen | 2016-01-21 | 13 | -147/+922 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | fixing cd error | Christopher Speller | 2016-01-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | moving mv | Christopher Speller | 2016-01-21 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Sudo | Christopher Speller | 2016-01-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixing travis | Christopher Speller | 2016-01-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixing travis | Christopher Speller | 2016-01-21 | 1 | -4/+1 |
| | | | | | | |||||
| * | | | | | Fixing non travis build | Christopher Speller | 2016-01-21 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #1841 from mattermost/auto-spinmint | Christopher Speller | 2016-01-21 | 2 | -1/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Testing PR for auto spinmint. | ||||
| | * | | | | | Adding curl to upload pr builds | Christopher Speller | 2016-01-21 | 2 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1940 from ZBoxApp/PLT-7-go | Corey Hulen | 2016-01-21 | 11 | -146/+917 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | | Refactoring api to use translations (chunk 1) | ||||
| | * | | | | Fix bug to load the default locale if no system locale is found | Elias Nahum | 2016-01-21 | 1 | -17/+6 |
| | | | | | | |||||
| | * | | | | Remove settings from config.json | Elias Nahum | 2016-01-21 | 1 | -23/+0 |
| | | | | | | |||||
| | * | | | | Refactoring api to use translations (chunk 1) | Elias Nahum | 2016-01-21 | 11 | -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 Hulen | 2016-01-21 | 248 | -10/+4908 |
| | | | | | | |||||
| | | | * | | adding ignore | =Corey Hulen | 2016-01-21 | 1 | -0/+2 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #1937 from hmhealey/plt1695 | Corey Hulen | 2016-01-21 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-1695 Completely disabled broken pasting of images on IE11 | ||||
| | * | | | | Completely disabled broken pasting of images on IE11 | hmhealey | 2016-01-20 | 1 | -1/+5 |
| | |/ / / | |||||
| * | | | | Merge pull request #1935 from hmhealey/plt1664 | Corey Hulen | 2016-01-21 | 1 | -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 ↵ | hmhealey | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | IE11 supports | ||||
| * | | | | | Merge pull request #1933 from hmhealey/plt1661 | Corey Hulen | 2016-01-21 | 3 | -42/+32 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | PLT-1661/PLT-1745 Scrolling fixes |