summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2350 from hmhealey/plt1930Christopher Speller2016-03-071-1/+1
|\ | | | | PLT-1930 Fixed Private Channels header in SearchSuggestionList
| * Fixed Private Channels header in the SearchSuggestionList to actually say ↵Harrison Healey2016-03-071-1/+1
| | | | | | | | Private instead of Public
* | Merge pull request #2349 from hmhealey/plt2008Christopher Speller2016-03-071-102/+8
|\ \ | | | | | | PLT-2008 Removed gif playing code from the FileAttachment component
| * | Removed gif playing code from the FileAttachment componentHarrison Healey2016-03-071-102/+8
| |/
* | Merge pull request #2348 from hmhealey/memberChristopher Speller2016-03-072-6/+6
|\ \ | | | | | | Updated Channel Members modal UI
| * | Changed Channel Members modal to list full user objects with all fields ↵Harrison Healey2016-03-071-2/+2
| | | | | | | | | | | | populated
| * | Added @ before username in UserList when a Full Name or Nickname is presentHarrison Healey2016-03-071-2/+2
| | |
| * | Changed 'Remove Member' to 'Remove' in Channel Members modalHarrison Healey2016-03-071-2/+2
| |/
* | Merge pull request #2340 from rodrigocorsi2/PLT-2076Harrison Healey2016-03-071-3/+48
|\ \ | |/ |/| PLT-2076: Add help text below the input box when a user starts typing
| * 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
|\ \ | | | | | | PLT-2218: Notification email footer is translated based on the sender's language
| * | Fix for PLT-2218 & PLT-2222Elias Nahum2016-03-061-5/+2
| |/ | | | | | | | | - Also includes missing loc strings for frontend es.json - Sort web [locale].json by id
* | Merge pull request #2333 from hmhealey/plt2194Joram Wilander2016-03-072-15/+10
|\ \ | |/ |/| PLT-2194 Removed Get Team Invite Link link when user creation is disabled
| * 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 help text
| * | 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
|\ \ \ | |_|/ |/| | PLT-2112: Allow CORS
| * | Allow CORSElias Nahum2016-03-011-0/+35
| | |
* | | Merge pull request #2318 from hmhealey/plt1090Christopher Speller2016-03-0313-648/+481
|\ \ \ | | | | | | | | PLT-1090 Refactored modals that display users
| * | | 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 ↵hmhealey2016-03-031-10/+9
| | | | | | | | | | | | | | | | 'member'
| * | | Moved localized strings for PLT-1090hmhealey2016-03-035-19/+19
| | | |
| * | | Changed information displayed in user list to obey display name settingshmhealey2016-03-031-24/+10
| | | |
| * | | 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
| | | |
* | | | Removed injectIntl from UserSettingsDisplayHarrison Healey2016-03-031-60/+76
| | | |
* | | | Changed submit button of ManageLanguage to match other settingsHarrison Healey2016-03-032-31/+28
|/ / /
* | | Merge pull request #2258 from mattermost/plt-1796Corey Hulen2016-03-0211-1014/+737
|\ \ \ | |_|/ |/| | PLT-1796 Refactor and modularize analytics on the client
| * | Refactor and modularize analytics on the clientJoramWilander2016-03-0111-1014/+737
| |/
* | Merge pull request #2293 from mattermost/esethna-patch-2Joram Wilander2016-03-011-2/+2
|\ \ | |/ |/| Update sys console GitLab set up help text
| * 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.jsx
| * | Added translation member_list.jsxrodrigo2016-02-291-1/+10
| | |
* | | Merge pull request #2292 from mozilla/PLT-2064Harrison Healey2016-03-011-1/+1
|\ \ \ | | | | | | | | PLT-2064 Slash command hints don't autocomplete
| * | | PLT-2064 Slash command hints don't autocompleteAlan Mooiman2016-02-291-1/+1
| |/ /
* | | Merge pull request #2296 from khoa-le/PLT-2123Harrison Healey2016-03-011-1/+1
|\ \ \ | | | | | | | | PLT-2123 Do not show up inactive account in Suggestion Box of Channel
| * | | 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-013-18/+16
|\ \ \ | | | | | | | | PLT-2030 fixing error handling
| * | | Adding missing localization=Corey Hulen2016-02-271-0/+14
| | | |
| * | | PLT-2030 fixing error handling=Corey Hulen2016-02-262-18/+2
| | | |
* | | | Merge pull request #2261 from daizenberg/PLT-867Christopher Speller2016-03-011-5/+12
|\ \ \ \ | |_|/ / |/| | | PLT-867: Removed member cnt icon in Direct channels
| * | | 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 user settings integrations help text