Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2307 from ZBoxApp/PLT-2112 | Joram Wilander | 2016-03-04 | 8 | -2/+90 |
|\ | | | | | PLT-2112: Allow CORS | ||||
| * | Set CORS Headers when needed if CORS is enabled | Elias Nahum | 2016-03-02 | 2 | -36/+25 |
| | | | | | | | | - Enable CORS with and without RateLimiter | ||||
| * | Add Cors Handler | Elias Nahum | 2016-03-01 | 2 | -1/+46 |
| | | |||||
| * | Add default value to AllowCorsFrom setting | Elias Nahum | 2016-03-01 | 3 | -4/+9 |
| | | |||||
| * | Allow CORS | Elias Nahum | 2016-03-01 | 7 | -0/+49 |
| | | |||||
* | | Merge pull request #2328 from mattermost/fix-cli-team | Joram Wilander | 2016-03-04 | 1 | -1/+1 |
|\ \ | | | | | | | Fixing cli to create open team | ||||
| * | | Fixing cli to create open team | =Corey Hulen | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2330 from hmhealey/plt2073 | Joram Wilander | 2016-03-04 | 4 | -5/+5 |
|\ \ \ | | | | | | | | | PLT-2073 Replaced FeedbackEmail with SupportEmail in the email footer | ||||
| * | | | Replaced FeedbackEmail with SupportEmail in the email footer | Harrison Healey | 2016-03-03 | 4 | -5/+5 |
| |/ / | |||||
* | | | 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 |
| |/ / | |||||
* | | | Merge pull request #2327 from hmhealey/stringref | Christopher Speller | 2016-03-03 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Turned off no-string-refs rule in ESLint | ||||
| * | | 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 | 4 | -62/+81 |
|\ \ | | | | | | | Add missing es loc strings to server and frontend | ||||
| * | | Add missing es loc strings to server and frontend | Elias Nahum | 2016-03-02 | 4 | -62/+81 |
| | | | | | | | | | | | | - Sort files contents by id | ||||
* | | | Merge pull request #2325 from rodrigocorsi2/review_pt_translations | Harrison Healey | 2016-03-03 | 2 | -18/+44 |
|\ \ \ | |/ / |/| | | Revised and added some translations in pt | ||||
| * | | Revised and added some translations in pt | Rodrigo Corsi | 2016-03-03 | 2 | -18/+44 |
|/ / | |||||
* | | Merge pull request #2258 from mattermost/plt-1796 | Corey Hulen | 2016-03-02 | 29 | -1093/+1438 |
|\ \ | | | | | | | PLT-1796 Refactor and modularize analytics on the client | ||||
| * | | Fix unit test for session counting | JoramWilander | 2016-03-01 | 1 | -0/+1 |
| | | | |||||
| * | | Update pt.json for localization | JoramWilander | 2016-03-01 | 1 | -17/+20 |
| | | | |||||
| * | | Don't count expired sessions | JoramWilander | 2016-03-01 | 1 | -3/+4 |
| | | | |||||
| * | | Refactor and modularize analytics on the client | JoramWilander | 2016-03-01 | 28 | -1076/+1416 |
| |/ | |||||
* | | Merge pull request #2317 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-03-02 | 1 | -2/+1 |
|\ \ | | | | | | | PLT-2191- Fixing search loading icon on mobile | ||||
| * | | 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 |
| | | |||||
* | | Merge pull request #2294 from rodrigocorsi2/member_list | Christopher Speller | 2016-03-01 | 2 | -1/+11 |
|\ \ | | | | | | | Added translation member_list.jsx | ||||
| * | | Added translation member_list.jsx | rodrigo | 2016-02-29 | 2 | -1/+11 |
| | | | |||||
* | | | 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 |