summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2340 from rodrigocorsi2/PLT-2076Harrison Healey2016-03-071-3/+48
|\
| * Fix camel caseRodrigo Corsi2016-03-071-4/+4
| * Add help text below the input box when a user starts typingrodrigo2016-03-061-3/+48
* | Merge pull request #2339 from ZBoxApp/PLT-2218Joram Wilander2016-03-071-5/+2
|\ \
| * | Fix for PLT-2218 & PLT-2222Elias Nahum2016-03-061-5/+2
| |/
* | Merge pull request #2333 from hmhealey/plt2194Joram Wilander2016-03-072-15/+10
|\ \ | |/ |/|
| * Removed Get Team Invite Link link when user creation is disabledHarrison Healey2016-03-032-15/+10
* | Merge pull request #2306 from mattermost/esethna-patch-1Corey Hulen2016-03-041-2/+2
|\ \
| * | Update get_team_invite_link_modal.jsxEric Sethna2016-03-031-1/+1
| * | Update get_team_invite_link_modal.jsxEric Sethna2016-03-011-2/+2
* | | Merge pull request #2307 from ZBoxApp/PLT-2112Joram Wilander2016-03-041-0/+35
|\ \ \ | |_|/ |/| |
| * | Allow CORSElias Nahum2016-03-011-0/+35
* | | Merge pull request #2318 from hmhealey/plt1090Christopher Speller2016-03-0315-650/+485
|\ \ \
| * | | Fixed warnings and removed injectIntl from System Console user listhmhealey2016-03-032-27/+35
| * | | Fixed max height for all modals using FilteredUserListshmhealey2016-03-036-83/+44
| * | | Fixed localization issues with ChannelMembersModalhmhealey2016-03-031-1/+1
| * | | Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of 'mem...hmhealey2016-03-031-10/+9
| * | | Moved localized strings for PLT-1090hmhealey2016-03-035-19/+19
| * | | 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-034-93/+75
| * | | Changed ChannelInviteModal to use a FilteredUserListhmhealey2016-03-031-16/+27
| * | | Merged contents of MoreDirectChannelsModal and ChannelMembersModal into UserListhmhealey2016-03-035-243/+327
* | | | Merge pull request #2326 from hmhealey/plt2000Christopher Speller2016-03-032-91/+104
|\ \ \ \
| * | | | Removed injectIntl from UserSettingsDisplayHarrison Healey2016-03-031-60/+76
| * | | | Changed submit button of ManageLanguage to match other settingsHarrison Healey2016-03-032-31/+28
| |/ / /
* / / / Turned off no-string-refs rule in ESLintHarrison Healey2016-03-031-1/+1
|/ / /
* | | Merge pull request #2258 from mattermost/plt-1796Corey Hulen2016-03-0215-1033/+1116
|\ \ \ | |_|/ |/| |
| * | Refactor and modularize analytics on the clientJoramWilander2016-03-0115-1033/+1116
| |/
* | Merge pull request #2293 from mattermost/esethna-patch-2Joram Wilander2016-03-011-2/+2
|\ \ | |/ |/|
| * Update gitlab_settings.jsxEric Sethna2016-02-261-2/+2
* | Merge pull request #2294 from rodrigocorsi2/member_listChristopher Speller2016-03-011-1/+10
|\ \
| * | Added translation member_list.jsxrodrigo2016-02-291-1/+10
* | | 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-016-42/+56
|\ \ \ \
| * | | | Adding missing localization=Corey Hulen2016-02-273-8/+29
| * | | | 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
* | | | | Merge pull request #2267 from mattermost/esethna-patch-1Joram Wilander2016-02-293-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update manage_command_hooks.jsxEric Sethna2016-02-261-1/+1
| * | | | Update manage_outgoing_hooks.jsxEric Sethna2016-02-261-1/+1
| * | | | Update manage_incoming_hooks.jsxEric Sethna2016-02-261-1/+1
| | |/ / | |/| |