Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #2339 from ZBoxApp/PLT-2218 | Joram Wilander | 2016-03-07 | 1 | -5/+2 | |
|\ \ \ | | | | | | | | | PLT-2218: Notification email footer is translated based on the sender's language | |||||
| * | | | Fix for PLT-2218 & PLT-2222 | Elias Nahum | 2016-03-06 | 1 | -5/+2 | |
| |/ / | | | | | | | | | | | | | - 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 | 1 | -2/+2 | |
|\ \ \ | |_|/ |/| | | Update get team invite link help text | |||||
| * | | Update get_team_invite_link_modal.jsx | Eric Sethna | 2016-03-03 | 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 | 1 | -0/+35 | |
|\ \ \ | |_|/ |/| | | PLT-2112: Allow CORS | |||||
| * | | Allow CORS | Elias Nahum | 2016-03-01 | 1 | -0/+35 | |
| | | | ||||||
* | | | Merge pull request #2318 from hmhealey/plt1090 | Christopher Speller | 2016-03-03 | 15 | -650/+485 | |
|\ \ \ | | | | | | | | | PLT-1090 Refactored modals that display users | |||||
| * | | | Fixed warnings and removed injectIntl from System Console user list | hmhealey | 2016-03-03 | 2 | -27/+35 | |
| | | | | ||||||
| * | | | Fixed max height for all modals using FilteredUserLists | hmhealey | 2016-03-03 | 6 | -83/+44 | |
| | | | | ||||||
| * | | | Fixed localization issues with ChannelMembersModal | hmhealey | 2016-03-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of ↵ | hmhealey | 2016-03-03 | 1 | -10/+9 | |
| | | | | | | | | | | | | | | | | 'member' | |||||
| * | | | Moved localized strings for PLT-1090 | hmhealey | 2016-03-03 | 5 | -19/+19 | |
| | | | | ||||||
| * | | | 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 | 4 | -93/+75 | |
| | | | | ||||||
| * | | | Changed ChannelInviteModal to use a FilteredUserList | hmhealey | 2016-03-03 | 1 | -16/+27 | |
| | | | | ||||||
| * | | | Merged contents of MoreDirectChannelsModal and ChannelMembersModal into UserList | hmhealey | 2016-03-03 | 5 | -243/+327 | |
| | | | | ||||||
* | | | | Merge pull request #2326 from hmhealey/plt2000 | Christopher Speller | 2016-03-03 | 2 | -91/+104 | |
|\ \ \ \ | | | | | | | | | | | 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 | 2 | -31/+28 | |
| |/ / / | ||||||
* / / / | Turned off no-string-refs rule in ESLint | Harrison Healey | 2016-03-03 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2258 from mattermost/plt-1796 | Corey Hulen | 2016-03-02 | 15 | -1033/+1116 | |
|\ \ \ | |_|/ |/| | | PLT-1796 Refactor and modularize analytics on the client | |||||
| * | | Refactor and modularize analytics on the client | JoramWilander | 2016-03-01 | 15 | -1033/+1116 | |
| |/ | ||||||
* | | Merge pull request #2293 from mattermost/esethna-patch-2 | Joram Wilander | 2016-03-01 | 1 | -2/+2 | |
|\ \ | |/ |/| | Update sys console GitLab set up help text | |||||
| * | Update gitlab_settings.jsx | Eric Sethna | 2016-02-26 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #2294 from rodrigocorsi2/member_list | Christopher Speller | 2016-03-01 | 1 | -1/+10 | |
|\ \ | | | | | | | Added translation member_list.jsx | |||||
| * | | Added translation member_list.jsx | rodrigo | 2016-02-29 | 1 | -1/+10 | |
| | | | ||||||
* | | | Merge pull request #2249 from GuillaumeAmat/GIT-1806-2 | Harrison Healey | 2016-03-01 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixes the notification display in Firefox (refs #1806) | |||||
| * | | | Fixes the notification display in Firefox (refs #1806) | Guillaume AMAT | 2016-02-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2292 from mozilla/PLT-2064 | Harrison Healey | 2016-03-01 | 2 | -2/+4 | |
|\ \ \ \ | | | | | | | | | | | PLT-2064 Slash command hints don't autocomplete | |||||
| * | | | | PLT-2064 Slash command hints don't autocomplete | Alan Mooiman | 2016-02-29 | 2 | -2/+4 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2296 from khoa-le/PLT-2123 | Harrison Healey | 2016-03-01 | 1 | -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 Channel | Khoa, Le Ngoc | 2016-03-01 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #2276 from mattermost/PLT-2030 | Christopher Speller | 2016-03-01 | 6 | -42/+56 | |
|\ \ \ \ | | | | | | | | | | | PLT-2030 fixing error handling | |||||
| * | | | | Adding missing localization | =Corey Hulen | 2016-02-27 | 3 | -8/+29 | |
| | | | | | ||||||
| * | | | | Fxing initial connection | =Corey Hulen | 2016-02-26 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | PLT-2030 fixing error handling | =Corey Hulen | 2016-02-26 | 5 | -36/+25 | |
| | | | | | ||||||
* | | | | | Merge pull request #2261 from daizenberg/PLT-867 | Christopher Speller | 2016-03-01 | 1 | -5/+12 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-867: Removed member cnt icon in Direct channels | |||||
| * | | | | minor optimization; following jwilander's recommendation | Dmitri Aizenberg | 2016-02-26 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | fixed | Dmitri Aizenberg | 2016-02-25 | 1 | -5/+12 | |
| | | | | | ||||||
* | | | | | Merge pull request #2267 from mattermost/esethna-patch-1 | Joram Wilander | 2016-02-29 | 3 | -3/+3 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Update user settings integrations help text | |||||
| * | | | | Update manage_command_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Update manage_outgoing_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Update manage_incoming_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* / | | | UI improvements | Asaad Mahmood | 2016-02-26 | 1 | -20/+22 | |
|/ / / | ||||||
* | | | Merge pull request #2265 from mattermost/preview-loc-fix | Corey Hulen | 2016-02-26 | 1 | -2/+6 | |
|\ \ \ | | | | | | | | | Fix missing preview strings for a language showing up as the id not the defaut messsage | |||||
| * | | | Fix missing preview strings for a language showing up as the id not the ↵ | JoramWilander | 2016-02-26 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | defaut messsage |