Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PLT-7 adding lang selector | =Corey Hulen | 2016-01-22 | 4 | -0/+161 |
| | |||||
* | 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 | ||||
| * | | | | Added a small margin where the PostsView will be considered to be at the ↵ | hmhealey | 2016-01-20 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | bottom even if it's not exactly at the bottom | ||||
| * | | | | Removed some vestigial code from the post textbox | hmhealey | 2016-01-20 | 1 | -19/+0 |
| | | | | | |||||
| * | | | | Changed the post textbox resizing code to be more reliable and not rely on ↵ | hmhealey | 2016-01-20 | 2 | -24/+30 |
| |/ / / | | | | | | | | | | | | | magic numbers | ||||
* | | | | Merge pull request #1924 from loafoe/master | Christopher Speller | 2016-01-21 | 5 | -1/+32 |
|\ \ \ \ | | | | | | | | | | | [#1923] Make Websocket ports configurable | ||||
| * | | | | Update documentation for WebsocketSecurePort | Andy Lo-A-Foe | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix indentation | Andy Lo-A-Foe | 2016-01-20 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | Optionally specify ws:// and wss:// port in config | Andy Lo-A-Foe | 2016-01-19 | 5 | -1/+32 |
| | | | | | |||||
* | | | | | Merge pull request #1927 from rgarmsen2295/plt-1668 | Christopher Speller | 2016-01-21 | 9 | -44/+57 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1668 Removes duplicate short username error message | ||||
| * | | | | | Removed extraneous error when providing a short username | Reed Garmsen | 2016-01-20 | 9 | -44/+57 |
| | | | | | | |||||
* | | | | | | Merge pull request #1922 from cloudron-io/check_auth_service | Harrison Healey | 2016-01-21 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Check auth_service when constructing messages | ||||
| * | | | | | | Check auth_service for constructing message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Check auth_service to describe user login message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-info | Harrison Healey | 2016-01-21 | 1 | -2/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-1232: More channel info | ||||
| * | | | | | | | Show correct channel URL in channel info modal | Pat Lathem | 2016-01-13 | 1 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | Rename 'Channel Handle' to Channel URL' | Pat Lathem | 2016-01-13 | 1 | -1/+1 |
| | | | | | | | |