summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2318 from hmhealey/plt1090Christopher Speller2016-03-0321-720/+595
|\
| * Fixed system console user list dropdownhmhealey2016-03-031-0/+8
| * Fixed warnings and removed injectIntl from System Console user listhmhealey2016-03-033-37/+35
| * Fixed max height for all modals using FilteredUserListshmhealey2016-03-037-85/+59
| * Fixed localization issues with ChannelMembersModalhmhealey2016-03-034-7/+4
| * Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of 'mem...hmhealey2016-03-034-16/+15
| * Moved localized strings for PLT-1090hmhealey2016-03-038-78/+77
| * Changed information displayed in user list to obey display name settingshmhealey2016-03-033-26/+14
| * Removed MemberListhmhealey2016-03-032-198/+0
| * Changed TeamMembersModal to use UserListhmhealey2016-03-036-98/+80
| * Changed ChannelInviteModal to use a FilteredUserListhmhealey2016-03-031-16/+27
| * Fixed overflowing details fields in UserListhmhealey2016-03-031-0/+11
| * Merged contents of MoreDirectChannelsModal and ChannelMembersModal into UserListhmhealey2016-03-036-243/+349
* | Merge pull request #2326 from hmhealey/plt2000Christopher Speller2016-03-035-95/+105
|\ \
| * | Removed injectIntl from UserSettingsDisplayHarrison Healey2016-03-031-60/+76
| * | Changed submit button of ManageLanguage to match other settingsHarrison Healey2016-03-035-35/+29
| |/
* / Turned off no-string-refs rule in ESLintHarrison Healey2016-03-031-1/+1
|/
* Merge pull request #2321 from ZBoxApp/plt-1796-esHarrison Healey2016-03-032-49/+56
|\
| * Add missing es loc strings to server and frontendElias Nahum2016-03-022-49/+56
* | Revised and added some translations in ptRodrigo Corsi2016-03-031-17/+31
|/
* Merge pull request #2258 from mattermost/plt-1796Corey Hulen2016-03-0218-1084/+1183
|\
| * Update pt.json for localizationJoramWilander2016-03-011-17/+20
| * Refactor and modularize analytics on the clientJoramWilander2016-03-0117-1067/+1163
* | PLT-2191- Fixing search loading icon on mobileAsaad Mahmood2016-03-021-2/+1
* | Merge pull request #2302 from ZBoxApp/member_list-esChristopher Speller2016-03-011-0/+3
|\ \
| * | channel_headers errors and member_list locsElias Nahum2016-03-011-0/+3
| |/
* | Merge pull request #2293 from mattermost/esethna-patch-2Joram Wilander2016-03-014-5/+5
|\ \ | |/ |/|
| * Update pt.jsonEric Sethna2016-02-261-2/+2
| * Update es.jsonEric Sethna2016-02-261-1/+1
| * Update en.jsonEric Sethna2016-02-261-1/+1
| * Update gitlab_settings.jsxEric Sethna2016-02-261-2/+2
* | Merge pull request #2294 from rodrigocorsi2/member_listChristopher Speller2016-03-012-1/+11
|\ \
| * | Added translation member_list.jsxrodrigo2016-02-292-1/+11
* | | Merge pull request #2249 from GuillaumeAmat/GIT-1806-2Harrison Healey2016-03-011-1/+1
|\ \ \
| * | | Fixes the notification display in Firefox (refs #1806)Guillaume AMAT2016-02-251-1/+1
* | | | Merge pull request #2292 from mozilla/PLT-2064Harrison Healey2016-03-012-2/+4
|\ \ \ \
| * | | | PLT-2064 Slash command hints don't autocompleteAlan Mooiman2016-02-292-2/+4
| | |/ / | |/| |
* | | | Merge pull request #2296 from khoa-le/PLT-2123Harrison Healey2016-03-011-1/+1
|\ \ \ \
| * | | | Do not show up inactive account in Suggestion Box of ChannelKhoa, Le Ngoc2016-03-011-1/+1
| |/ / /
* | | | Merge pull request #2276 from mattermost/PLT-2030Christopher Speller2016-03-017-42/+58
|\ \ \ \
| * | | | Adding missing localization=Corey Hulen2016-02-274-8/+31
| * | | | Fxing initial connection=Corey Hulen2016-02-261-0/+4
| * | | | PLT-2030 fixing error handling=Corey Hulen2016-02-265-36/+25
* | | | | Merge pull request #2261 from daizenberg/PLT-867Christopher Speller2016-03-011-5/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | minor optimization; following jwilander's recommendationDmitri Aizenberg2016-02-261-3/+3
| * | | | fixedDmitri Aizenberg2016-02-251-5/+12
* | | | | Change Frontend 'es' strings to match 'en'Elias Nahum2016-02-291-4/+7
* | | | | Merge pull request #2267 from mattermost/esethna-patch-1Joram Wilander2016-02-296-13/+7
|\ \ \ \ \
| * | | | | Removing updated entries in pt.json for integrations help textEric Sethna2016-02-261-4/+1
| * | | | | Removing updated entries in es.json for integrations help textEric Sethna2016-02-261-3/+0