Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2348 from hmhealey/member | Christopher Speller | 2016-03-07 | 5 | -12/+10 |
|\ | | | | | Updated Channel Members modal UI | ||||
| * | Changed Channel Members modal to list full user objects with all fields ↵ | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | | | | | | | populated | ||||
| * | Added @ before username in UserList when a Full Name or Nickname is present | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | |||||
| * | Changed 'Remove Member' to 'Remove' in Channel Members modal | Harrison Healey | 2016-03-07 | 4 | -8/+6 |
| | | |||||
* | | Merge pull request #2340 from rodrigocorsi2/PLT-2076 | Harrison Healey | 2016-03-07 | 4 | -7/+80 |
|\ \ | |/ |/| | PLT-2076: Add help text below the input box when a user starts typing | ||||
| * | Fix camel case | Rodrigo Corsi | 2016-03-07 | 1 | -4/+4 |
| | | |||||
| * | Add help text below the input box when a user starts typing | rodrigo | 2016-03-06 | 4 | -7/+80 |
| | | |||||
* | | Merge pull request #2339 from ZBoxApp/PLT-2218 | Joram Wilander | 2016-03-07 | 4 | -56/+54 |
|\ \ | | | | | | | PLT-2218: Notification email footer is translated based on the sender's language | ||||
| * | | Fix for PLT-2218 & PLT-2222 | Elias Nahum | 2016-03-06 | 4 | -56/+54 |
| |/ | | | | | | | | | - Also includes missing loc strings for frontend es.json - Sort web [locale].json by id | ||||
* | | Merge pull request #2333 from hmhealey/plt2194 | Joram Wilander | 2016-03-07 | 2 | -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 disabled | Harrison Healey | 2016-03-03 | 2 | -15/+10 |
| | | |||||
* | | Merge pull request #2306 from mattermost/esethna-patch-1 | Corey Hulen | 2016-03-04 | 4 | -5/+3 |
|\ \ | | | | | | | Update get team invite link help text | ||||
| * | | Update get_team_invite_link_modal.jsx | Eric Sethna | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Update pt.json | Eric Sethna | 2016-03-01 | 1 | -1/+0 |
| | | | |||||
| * | | Update es.json | Eric Sethna | 2016-03-01 | 1 | -1/+0 |
| | | | |||||
| * | | Update en.json | Eric Sethna | 2016-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Update get_team_invite_link_modal.jsx | Eric Sethna | 2016-03-01 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2307 from ZBoxApp/PLT-2112 | Joram Wilander | 2016-03-04 | 3 | -0/+41 |
|\ \ \ | |_|/ |/| | | PLT-2112: Allow CORS | ||||
| * | | Allow CORS | Elias Nahum | 2016-03-01 | 3 | -0/+41 |
| | | | |||||
* | | | Merge pull request #2318 from hmhealey/plt1090 | Christopher Speller | 2016-03-03 | 21 | -720/+595 |
|\ \ \ | | | | | | | | | PLT-1090 Refactored modals that display users | ||||
| * | | | Fixed system console user list dropdown | hmhealey | 2016-03-03 | 1 | -0/+8 |
| | | | | |||||
| * | | | Fixed warnings and removed injectIntl from System Console user list | hmhealey | 2016-03-03 | 3 | -37/+35 |
| | | | | |||||
| * | | | Fixed max height for all modals using FilteredUserLists | hmhealey | 2016-03-03 | 7 | -85/+59 |
| | | | | |||||
| * | | | Fixed localization issues with ChannelMembersModal | hmhealey | 2016-03-03 | 4 | -7/+4 |
| | | | | |||||
| * | | | Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of ↵ | hmhealey | 2016-03-03 | 4 | -16/+15 |
| | | | | | | | | | | | | | | | | 'member' | ||||
| * | | | Moved localized strings for PLT-1090 | hmhealey | 2016-03-03 | 8 | -78/+77 |
| | | | | |||||
| * | | | Changed information displayed in user list to obey display name settings | hmhealey | 2016-03-03 | 3 | -26/+14 |
| | | | | |||||
| * | | | Removed MemberList | hmhealey | 2016-03-03 | 2 | -198/+0 |
| | | | | |||||
| * | | | Changed TeamMembersModal to use UserList | hmhealey | 2016-03-03 | 6 | -98/+80 |
| | | | | |||||
| * | | | Changed ChannelInviteModal to use a FilteredUserList | hmhealey | 2016-03-03 | 1 | -16/+27 |
| | | | | |||||
| * | | | Fixed overflowing details fields in UserList | hmhealey | 2016-03-03 | 1 | -0/+11 |
| | | | | |||||
| * | | | Merged contents of MoreDirectChannelsModal and ChannelMembersModal into UserList | hmhealey | 2016-03-03 | 6 | -243/+349 |
| | | | | |||||
* | | | | Merge pull request #2326 from hmhealey/plt2000 | Christopher Speller | 2016-03-03 | 5 | -95/+105 |
|\ \ \ \ | | | | | | | | | | | PLT-2000 Changed language setting submit button to match other settings | ||||
| * | | | | Removed injectIntl from UserSettingsDisplay | Harrison Healey | 2016-03-03 | 1 | -60/+76 |
| | | | | | |||||
| * | | | | Changed submit button of ManageLanguage to match other settings | Harrison Healey | 2016-03-03 | 5 | -35/+29 |
| |/ / / | |||||
* / / / | Turned off no-string-refs rule in ESLint | Harrison Healey | 2016-03-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2321 from ZBoxApp/plt-1796-es | Harrison Healey | 2016-03-03 | 2 | -49/+56 |
|\ \ \ | | | | | | | | | Add missing es loc strings to server and frontend | ||||
| * | | | Add missing es loc strings to server and frontend | Elias Nahum | 2016-03-02 | 2 | -49/+56 |
| | | | | | | | | | | | | | | | | - Sort files contents by id | ||||
* | | | | Revised and added some translations in pt | Rodrigo Corsi | 2016-03-03 | 1 | -17/+31 |
|/ / / | |||||
* | | | Merge pull request #2258 from mattermost/plt-1796 | Corey Hulen | 2016-03-02 | 18 | -1084/+1183 |
|\ \ \ | | | | | | | | | PLT-1796 Refactor and modularize analytics on the client | ||||
| * | | | Update pt.json for localization | JoramWilander | 2016-03-01 | 1 | -17/+20 |
| | | | | |||||
| * | | | Refactor and modularize analytics on the client | JoramWilander | 2016-03-01 | 17 | -1067/+1163 |
| |/ / | |||||
* | / | PLT-2191- Fixing search loading icon on mobile | Asaad Mahmood | 2016-03-02 | 1 | -2/+1 |
| |/ |/| | |||||
* | | Merge pull request #2302 from ZBoxApp/member_list-es | Christopher Speller | 2016-03-01 | 1 | -0/+3 |
|\ \ | | | | | | | channel_headers errors and member_list locs | ||||
| * | | channel_headers errors and member_list locs | Elias Nahum | 2016-03-01 | 1 | -0/+3 |
| |/ | |||||
* | | Merge pull request #2293 from mattermost/esethna-patch-2 | Joram Wilander | 2016-03-01 | 4 | -5/+5 |
|\ \ | |/ |/| | Update sys console GitLab set up help text | ||||
| * | Update pt.json | Eric Sethna | 2016-02-26 | 1 | -2/+2 |
| | | |||||
| * | Update es.json | Eric Sethna | 2016-02-26 | 1 | -1/+1 |
| | | |||||
| * | Update en.json | Eric Sethna | 2016-02-26 | 1 | -1/+1 |
| | | |||||
| * | Update gitlab_settings.jsx | Eric Sethna | 2016-02-26 | 1 | -2/+2 |
| | |