summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2306 from mattermost/esethna-patch-1Corey Hulen2016-03-044-5/+3
|\
| * Update get_team_invite_link_modal.jsxEric Sethna2016-03-031-1/+1
| * Update pt.jsonEric Sethna2016-03-011-1/+0
| * Update es.jsonEric Sethna2016-03-011-1/+0
| * Update en.jsonEric Sethna2016-03-011-1/+1
| * Update get_team_invite_link_modal.jsxEric Sethna2016-03-011-2/+2
* | Merge pull request #2307 from ZBoxApp/PLT-2112Joram Wilander2016-03-048-2/+90
|\ \
| * | Set CORS Headers when needed if CORS is enabledElias Nahum2016-03-022-36/+25
| * | Add Cors HandlerElias Nahum2016-03-012-1/+46
| * | Add default value to AllowCorsFrom settingElias Nahum2016-03-013-4/+9
| * | Allow CORSElias Nahum2016-03-017-0/+49
* | | Merge pull request #2328 from mattermost/fix-cli-teamJoram Wilander2016-03-041-1/+1
|\ \ \
| * | | Fixing cli to create open team=Corey Hulen2016-03-031-1/+1
* | | | Merge pull request #2330 from hmhealey/plt2073Joram Wilander2016-03-044-5/+5
|\ \ \ \
| * | | | Replaced FeedbackEmail with SupportEmail in the email footerHarrison Healey2016-03-034-5/+5
| |/ / /
* | | | Merge pull request #2318 from hmhealey/plt1090Christopher Speller2016-03-0321-720/+595
|\ \ \ \
| * | | | Fixed system console user list dropdownhmhealey2016-03-031-0/+8
| * | | | Fixed warnings and removed injectIntl from System Console user listhmhealey2016-03-033-37/+35
| * | | | Fixed max height for all modals using FilteredUserListshmhealey2016-03-037-85/+59
| * | | | Fixed localization issues with ChannelMembersModalhmhealey2016-03-034-7/+4
| * | | | Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of 'mem...hmhealey2016-03-034-16/+15
| * | | | Moved localized strings for PLT-1090hmhealey2016-03-038-78/+77
| * | | | 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-036-98/+80
| * | | | Changed ChannelInviteModal to use a FilteredUserListhmhealey2016-03-031-16/+27
| * | | | Fixed overflowing details fields in UserListhmhealey2016-03-031-0/+11
| * | | | Merged contents of MoreDirectChannelsModal and ChannelMembersModal into UserListhmhealey2016-03-036-243/+349
| |/ / /
* | | | Merge pull request #2326 from hmhealey/plt2000Christopher Speller2016-03-035-95/+105
|\ \ \ \
| * | | | Removed injectIntl from UserSettingsDisplayHarrison Healey2016-03-031-60/+76
| * | | | Changed submit button of ManageLanguage to match other settingsHarrison Healey2016-03-035-35/+29
| |/ / /
* | | | Merge pull request #2327 from hmhealey/stringrefChristopher Speller2016-03-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Turned off no-string-refs rule in ESLintHarrison Healey2016-03-031-1/+1
|/ / /
* | | Merge pull request #2321 from ZBoxApp/plt-1796-esHarrison Healey2016-03-034-62/+81
|\ \ \
| * | | Add missing es loc strings to server and frontendElias Nahum2016-03-024-62/+81
* | | | Merge pull request #2325 from rodrigocorsi2/review_pt_translationsHarrison Healey2016-03-032-18/+44
|\ \ \ \ | |/ / / |/| | |
| * | | Revised and added some translations in ptRodrigo Corsi2016-03-032-18/+44
|/ / /
* | | Merge pull request #2258 from mattermost/plt-1796Corey Hulen2016-03-0229-1093/+1438
|\ \ \
| * | | Fix unit test for session countingJoramWilander2016-03-011-0/+1
| * | | Update pt.json for localizationJoramWilander2016-03-011-17/+20
| * | | Don't count expired sessionsJoramWilander2016-03-011-3/+4
| * | | Refactor and modularize analytics on the clientJoramWilander2016-03-0128-1076/+1416
| |/ /
* | | Merge pull request #2317 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-03-021-2/+1
|\ \ \ | |_|/ |/| |
| * | PLT-2191- Fixing search loading icon on mobileAsaad Mahmood2016-03-021-2/+1
|/ /
* | Merge pull request #2302 from ZBoxApp/member_list-esChristopher Speller2016-03-011-0/+3
|\ \
| * | channel_headers errors and member_list locsElias Nahum2016-03-011-0/+3
| |/
* | Merge pull request #2293 from mattermost/esethna-patch-2Joram Wilander2016-03-014-5/+5
|\ \ | |/ |/|
| * Update pt.jsonEric Sethna2016-02-261-2/+2
| * Update es.jsonEric Sethna2016-02-261-1/+1
| * Update en.jsonEric Sethna2016-02-261-1/+1