summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* PLT-7: Refactoring api to use translations (chunk 4)Elias Nahum2016-01-241-2/+2
| | | | - Translation for api templates english and spanish
* Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-226-231/+513
|\ | | | | PLT-1779 Add system-wide statistics page
| * Change default system console page to statisticsJoramWilander2016-01-221-1/+1
| |
| * Added unit test and fixed errorsJoramWilander2016-01-222-3/+3
| |
| * Add create_at back to profile fields to fix analyticsJoramWilander2016-01-222-1/+5
| |
| * Add system analytics pageJoramWilander2016-01-215-81/+266
| |
| * Generalize analytics server functions and begin componentizing client ↵JoramWilander2016-01-213-229/+322
| | | | | | | | analytics controls
* | Merge pull request #1959 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-222-2/+2
|\ \ | | | | | | Updating favicon stuff
| * | Updating favicon stuffAsaad Mahmood2016-01-222-2/+2
| | |
* | | PLT-7 adding loc header=Corey Hulen2016-01-221-1/+10
|/ /
* | Merge pull request #1955 from mattermost/PLT-7-client-user-locCorey Hulen2016-01-221398-0/+1536138
|\ \ | | | | | | Plt 7 client user loc
| * | PLT-7 fixing issues with safari=Corey Hulen2016-01-221394-0/+1535972
| | |
| * | PLT-7 adding loc feature to preview=Corey Hulen2016-01-221-1/+0
| | |
| * | 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.jsx
| * | Update team_general_tab.jsxEric Sethna2016-01-211-1/+1
| | | | | | | | | Correct capitalization based on UX discussion
| * | Update team_general_tab.jsxEric Sethna2016-01-201-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
* | | PLT-7 fixing unit test for chunk 2 server=Corey Hulen2016-01-222-2/+2
| | |
* | | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-222-3/+5
|\ \ \ | | | | | | | | PLT-1652 Added download param to getFile api call
| * | | Added download param to getFile api callhmhealey2016-01-212-3/+5
| | | |
* | | | PLT-7 fixing dist build=Corey Hulen2016-01-213-2/+4
| | | |
* | | | PLT-7 client side infra=Corey Hulen2016-01-211-6/+3
| | | |
* | | | PLT-7 client side infra=Corey Hulen2016-01-214-23/+36
| | | |
* | | | Merge branch 'master' into PLT-7-client-infra=Corey Hulen2016-01-211-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #1940 from ZBoxApp/PLT-7-goCorey Hulen2016-01-211-0/+1
| |\ \ \ \ | | |/ / / | |/| | | Refactoring api to use translations (chunk 1)
| | * | | Refactoring api to use translations (chunk 1)Elias Nahum2016-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-21246-10/+4906
|/ / / /
* | | | 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-212-1/+12
|\ \ \ \ | | | | | | | | | | [#1923] Make Websocket ports configurable
| * | | | Fix indentationAndy Lo-A-Foe2016-01-201-7/+7
| | | | |
| * | | | Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-192-1/+12
| | |/ / | |/| |
* | | | 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
| | | | | |