summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* PLT-4261 Set silent parameter for Notification (#4192)Yuya Ochiai2016-10-123-5/+21
| | | | | In the desktop app, there are two kinds of sound on notifications, `Utils.ding()` and `new Notification()` on Windows and Mac. This commit stops both if the account setting is set to off.
* Import /me messages from Slack. (#4164)George Goldberg2016-10-121-0/+15
| | | | Use message formatting consistent with how Mattermost does for the /me command for new messages.
* Import Slack uploads if present in zip archive. (#4088)George Goldberg2016-10-123-5/+102
| | | | | | | | | | | | | | | | * Import Slack uploads if present in zip archive. This is part 3 of PLT-4280, to support importing file uploads when importing from Slack. It is assumed the uploads in the zip archive will be present as per the output of slack-advanced-exporter: https://github.com/grundleborg/slack-advanced-exporter If the uploads are not present (ie. this is a vanilla Slack export archive) uploads are treated in the same way as before this patch, providing only a link to the upload on Slack's servers. * Update to new Files API.
* Update contributing.md (#4203)lfbrock2016-10-111-0/+28
| | | | | | * Update CONTRIBUTING.md * Update CONTRIBUTING.md
* First commit for toggling mentions using shortcut and button (#4169)Pepijn2016-10-116-73/+82
| | | | | Also did some refactoring and moved code to actions Fixed coding style errors
* Improvements to Custom Branding (#4177)David Lu2016-10-112-30/+28
|
* PLT-3785 Re-enabled marking messages unread (#4179)David Lu2016-10-114-6/+13
| | | | | | * Re-added ALT+Click to mark msgs unread, fixed mentions for DM * Added string to /shortcuts
* Fix bad merge from #4130 (#4196)Jason Blais2016-10-111-1/+1
|
* Add text banner to SAML System Console settings (#4195)Jason Blais2016-10-112-1/+10
| | | | | | | | | | | | * Update saml_settings.jsx * Update en.json * Text tweak * Fix build error * Use classnames in saml_settings.jsx to fix build errors
* PLT-3105 Fixed bugs with FileInfos migration, including duplicate FileInfos ↵Harrison Healey2016-10-065-11/+57
| | | | | | | | | | being saved (#4134) * Added a limit to GetByPath for the rare cases when two old files had the same path * Fixed files still being displayed for deleted posts * Added a lock to prevent migrateFilenamesToFileInfos from migrating multiple posts at once
* PLT-3252 Bring up profile popover after clicking on a profile picture… (#4144)Brendan Bowidas2016-10-066-6/+86
| | | | | | | | | | | | | | * PLT-3252 Bring up profile popover after clicking on a profile picture in a channel * PLT-3252 Bring up profile popover after clicking on a profile picture in a channel remove important * fixed 'Cannot read property first_name of undefined' bug * fix status indicator position * refactoring per request
* Fix en text for file message undefined (#4160)William Gathoye2016-10-061-1/+1
|
* Minor bug fixes (#4172)Asaad Mahmood2016-10-063-2/+6
|
* Text change to About dialog (#4166)lfbrock2016-10-052-2/+2
| | | | | | * Update about_build_modal.jsx * Update en.json
* Fix usage of example (e.g. vs Ex) abbreviations (#4136)William Gathoye2016-10-051-71/+74
|
* Fix incorrect id + typos in en.json (#4157)Jason Blais2016-10-051-3/+3
|
* PLT-3487 Preview uploaded txt file (#4145)Yusuke Nemoto2016-10-054-3/+4
| | | | | | * fix filename * Add 'txt' to hilighted language
* Correctly import Slack topic and purpose. (#4152)George Goldberg2016-10-051-1/+3
| | | | | | | | | In order to maintain consistency with how topic and purpose are used in Slack, the mapping is as follows: Slack -> Mattermost ===== ========== Purpose -> Purpose Topic -> Header
* PLT-4343 Fixes for mobile main menu (#4148)Harrison Healey2016-10-0410-12/+20
| | | | | | | | * Fixed mobile app link in the main menu to be displayed on mobile browsers * Fixed doubled up dividers in mobile menu * Added scrolling to mobile main menu
* translations PR 20160929 (#4123)enahum2016-10-0420-289/+1771
|
* PLT-3907 Added a javascript library to prevent the <body> from scrolling on ↵Harrison Healey2016-10-043-0/+32
| | | | | | | | iOS (#4147) * Added a javascript library to prevent the <body> from scrolling on iOS * Added iNoBounce to NOTICE.txt
* Updated make files/scripts to accomodate execution/building in windows in ↵Jared Shields2016-10-046-29/+40
| | | | addition to linux/mac (#4135)
* Fix import of Slack file_comment messages. (#4132)George Goldberg2016-10-042-12/+24
| | | | | | | | | | | | | | At the moment, the importer fails to parse the JSON of these types of message, and so ignores them. This fix means they are now parsed and imported just as if they were standalone messages (not file comments), which is better, and what the existing code clearly intended to happen. For the future, they should probably be changed to be imported as replies to the message with the file attached that they are commenting on. Fixes #4131.
* PLT-4200/3708 Fixed outside team DM switching, allowed switching to ↵David Lu2016-10-042-8/+35
| | | | | | | | uncreated DMs (#4111) * Fixed outside team DM switching, allowed switching to uncreated DMs * Update channel_switch_modal.jsx
* PLT-4234 Sorted channels in LHS numerically, alphabetically, and based on ↵David Lu2016-10-041-2/+5
| | | | | | | | locale (#4110) * Sorted channels in LHS numerically, alphabetically, and based on locale * Choose case based on locale
* Adding ability to serve TLS directly from Mattermost server (#4119)Christopher Speller2016-10-03734-82/+190367
|
* Change "Max Burst" to "Maximum Burst Size" (#4130)Jason Blais2016-10-033-3/+3
| | | | | | | | * Update en.json * Update rate_settings.jsx * Update en.json
* PLT-3105 Files table migration (#4068)Harrison Healey2016-09-3060-1924/+3316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implemented initial changes for files table * Removed *_benchmark_test.go files * Re-implemented GetPublicFile and added support for old path * Localization for files table * Moved file system code into utils package * Finished server-side changes and added initial upgrade script * Added getPostFiles api * Re-add Extension and HasPreviewImage fields to FileInfo * Removed unused translation * Fixed merge conflicts left over after permissions changes * Forced FileInfo.extension to be lower case * Changed FileUploadResponse to contain the FileInfos instead of FileIds * Fixed permissions on getFile* calls * Fixed notifications for file uploads * Added initial version of client code for files changes * Permanently added FileIds field to Post object and removed Post.HasFiles * Updated PostStore.Update to be usable in more circumstances * Re-added Filenames field and switched file migration to be entirely lazy-loaded * Increased max listener count for FileStore * Removed unused fileInfoCache * Moved file system code back into api * Removed duplicate test case * Fixed unit test running on ports other than 8065 * Renamed HasPermissionToPostContext to HasPermissionToChannelByPostContext * Refactored handleImages to make it more easily understandable * Renamed getPostFiles to getFileInfosForPost * Re-added pre-FileIds posts to analytics * Changed files to be saved as their ids as opposed to id/filename.ext * Renamed FileInfo.UserId to FileInfo.CreatorId * Fixed detection of language in CodePreview * Fixed switching between threads in the RHS not loading new files * Add serverside protection against a rare bug where the client sends the same file twice for a single post * Refactored the important parts of uploadFile api call into a function that can be called without a web context
* Fixed the YouTube link regex referencing removed capture groups (#4129)Harrison Healey2016-09-301-2/+2
|
* PLT-4307 - fix !channel link hrefs. (#4122)George Goldberg2016-09-304-6/+17
| | | | | | * PLT-4307 - fix !channel link hrefs. * Fix style.
* Fixing manage members dialog not opening (#4128)Christopher Speller2016-09-301-2/+1
|
* Update LDAP help text (#4124)lfbrock2016-09-302-6/+6
| | | | | | * Update ldap_settings.jsx * Update en.json
* Added spinner icon to select_team listing after clicking on a team to load ↵Harrison Healey2016-09-305-41/+82
| | | | (#4120)
* Multiple UI Improvements (#4117)Asaad Mahmood2016-09-296-3/+24
|
* Added a short wait to TestSetActiveChannel to stop randomly failing tests ↵Harrison Healey2016-09-292-2/+4
| | | | | | | | (#4115) * Added a short wait to TestSetActiveChannel to stop randomly failing tests * Increased the timeout in TestWebSocketEvent
* Renamed NavbarDropdown to SidebarHeaderDropdown and switched it to ↵Harrison Healey2016-09-297-160/+193
| | | | react-bootstrap (#4109)
* Add 'm.youtube.com/...' to be recognized as a YouTube link in the embedded ↵lfbrock2016-09-291-1/+1
| | | | post content. (#4114)
* Made SuggestionBox take back keyboard focus after the user clicks on a ↵Harrison Healey2016-09-281-0/+2
| | | | suggestion (#4112)
* Show statuses correctly for cached post views (#4094)Joram Wilander2016-09-281-0/+3
|
* Specify WebRTC calls available on Chrome, Firefox and Desktop Apps (#4107)Jason Blais2016-09-282-2/+2
| | | | | | * Update webrtc_settings.jsx * Update en.json
* PLT-4155 Show correct login method in system console (#4102)enahum2016-09-282-1/+4
| | | | | | * PLT-4155 Show correct login method in system console * Remove checking for system admin privileges in getProfiles
* PLT-4298 Remove "Return to ongoing call" (#4101)enahum2016-09-283-2/+4
|
* Fix missing confirm password error on LDAP claim page (#4099)Joram Wilander2016-09-281-5/+4
|
* Show create account link for office365, ldap and saml (#4098)Joram Wilander2016-09-281-3/+4
|
* Check if user logged in before making setActiveChannel request (#4097)Joram Wilander2016-09-282-2/+7
|
* PLT-3734 Cleaning up shouldSendEvent function (#4024)enahum2016-09-2717-110/+117
| | | | | | * PLT-3734 Cleaning up shouldSendEvent function * Fix LHS unread highlight and jewel mentions
* Fixing the console level debug statements (#4092)Corey Hulen2016-09-276-12/+13
|
* Cleaning up some old code from the permissions system change (#4090)Christopher Speller2016-09-266-286/+42
|
* Modifications to rate limiting settings. (#4091)Christopher Speller2016-09-267-21/+65
|
* Multiple UI Improvements (#4069)Asaad Mahmood2016-09-268-18/+37
| | | | | | | | | | | Minor contast fix for file uploading text. Updating icon markup Fixing icon for mentions Removing irrelevant characters Updating closing tag for mentions icon