summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PLT-???? Prepare file upload infrastructure for Data Retention. (#7266)George Goldberg2017-08-2520-299/+678
| | | | | | | | | | | | | | | | | * Prepare file upload infrastructure for Data Retention. This commit prepares the file upload infrastructure for the data retention feature that is under construction. Changes are: * Move file management code to utils to allow access to it from jobs. * From now on, store all file uploads in a top level folder which is the date of the day on which they were uploaded. This commit is based on Harrison Healey's branch, but updated to work with the latest master. * Use NewAppError
* PLT-5478: Hide collapse/expand arrow for image links when no image is ↵atp2017-08-251-1/+28
| | | | available (#7216)
* PLT-7224 - Updating post textbox UI (#7153)Asaad Mahmood2017-08-2513-195/+160
| | | | | | | | * PLT-7224 - Updating post textbox UI * Updating post textbox spacing * Updating emoji icon
* PLT-7417/PLT-7425 (#7278)Harrison Healey2017-08-254-50/+14
| | | PLT-7417/PLT-7425 Update config.json defaults and removed admin console link settings
* Fix log error message for UpdateLastActivityAtIfNeeded (#7282)enahum2017-08-251-1/+1
|
* add attachments to rhs search results (#7290)Chris2017-08-251-1/+9
|
* Other Packages: NewLocAppError -> NewAppError (#7283)George Goldberg2017-08-255-21/+25
|
* [PLT-7390] Add Type = 'O' in getting open teams at sql store (#7207)Saturnino Abril2017-08-242-5/+126
| | | | | | * add Type = 'O' in getting open teams at sql store * updated PR
* Switch hook debug msg to info (#7272)Corey Hulen2017-08-222-4/+4
|
* Fixing logging errors for Franz (#7273)Corey Hulen2017-08-221-24/+26
|
* Fixed not being able to scroll down in message preview mode when using (#7194)Sudheer2017-08-221-0/+4
| | | only couple of sentences in edit mode.
* Hiding the rogue webkit file input button (#7130)Alex White2017-08-221-0/+4
|
* Fixing race in update channel (#7269)Corey Hulen2017-08-223-1/+15
| | | | | | * Fixing race in update channel * Switching to struct copy
* Add a + next to direct message on sidebar to open 'Direct Messages' modal ↵David Meza2017-08-221-0/+30
| | | | | | | | (#7159) * Add a + next to direct message on sidebar to open 'Direct Messages' modal * Change + cick to display direct message modal without group message.
* [PLT-1015] Make all Mattermost system emails Multi-Part, with both a HTML ↵Carlos Tadeu Panato Junior2017-08-215-26/+30
| | | | | | | | | | | | and Plain Text version. (#5698) * Implementation to Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version * update lib * update code per review * update to use the mattermost repo
* make hooks optional, short circuit if unimplemented (#7263)Chris2017-08-215-49/+156
|
* Updating client dependancies. (#7253)Christopher Speller2017-08-212-139/+396
|
* PLT-5747: Fixed inconsistent on-hover, tooltip, and active states for ↵Sudheer2017-08-218-20/+49
| | | | | | | | | | | buttons. (#7174) * Fixed LHS Team Sidebar on hover highlight. * Fixed LHS Main Menu on hover tooltip to show "Main menu". * Added On-hover highlight for Favorite button in channel heading. * Added active state for channel members icon. * Added active class based on internal react state with new changeCss rule. * Changed cursor to pointer on hovering a theme. * Fixed Invite New Member Add Button to have text-underline on hover.
* PLT-7256: Fix email rate selection when batching is disabled (#7202)atp2017-08-212-17/+39
|
* fix expand/collapse arrows for youtube videos (#7240)Saturnino Abril2017-08-213-2/+5
|
* Minor string changes for JIRA setting (#7264)Jason Blais2017-08-212-6/+6
| | | | | | * Update settings.jsx * Update en.json
* make config.json play nicely with version control (#7221)Chris2017-08-204-0/+24
|
* Adding debugging for webhook (#7199)Corey Hulen2017-08-183-8/+13
| | | | | | | | * Adding debugging for webhook * Fixing build error * Moving error down
* Fixing bad merge (#7259)Corey Hulen2017-08-181-1/+1
|
* Ignoring primary key duplication errors on status saveorupdate (#7255)Christopher Speller2017-08-181-1/+4
|
* Adding check for file write or minio/s3 bucket before server start. (#7254)Christopher Speller2017-08-182-0/+49
|
* Multiple bug fixes (#7243)Asaad Mahmood2017-08-186-5/+41
| | | | | | | | | | | | | | | | * PLT-7320 - Fixing alignment of x icon * PLT-7357 - Fixing close icon in compact view * PLT-7322 - Fixing overflow for delete token modal * PLT-7351 - Fixing flag icon alignment * PLT-7393 - Fixing cursor on upload button * PLT-7392 - Fixing scrollbar in admin console * PLT-7376 - Fixing hover effect for mobile nav
* windows support for plugin ipc (#7251)Chris2017-08-185-15/+649
| | | | | | * windows support for plugin ipc * unix test fix
* PLT-7217: CLI command to change channel public/private type. (#7225)George Goldberg2017-08-181-0/+54
| | | | This adds a channel modify CLI command, with the one property that it can modify being the channel public/private type.
* Remove temporary cookie code (#7218)Joram Wilander2017-08-181-14/+0
|
* Added missing string for translation (#7203)Christian Arnold2017-08-181-0/+1
|
* PLT-6451 Migrate installed_oauth_app.jsx to be pure and use Redux (#7190)n1aba2017-08-188-49/+294
| | | | | | * Migrate installed_oauth_app.jsx to be pure and use Redux, add test * Fix behavior for the error case
* PLT-7397 Added loadImage function instead of Image.prototype.load (#7184)Harrison Healey2017-08-183-43/+46
|
* Rename SAML in the System Console to SAML 2.0 + access token string fixes ↵Jason Blais2017-08-184-14/+14
| | | | | | | | | | | | (#7182) * Update en.json * Update en.json * Update admin_sidebar.jsx * Update saml_settings.jsx
* PLT-6443 Migrate add_oauth_app.jsx to be pure and use Redux (#7232)n1aba2017-08-186-62/+762
| | | | | | * Migrate add_oauth_app.jsx to be pure and use Redux, add tests * Remove unused flux code for OAuthApps
* [PLT-3377] Open up a shortcuts dialog instead of printing help text (#7064)Saturnino Abril2017-08-1815-244/+561
| | | | | | | | | | | | | | | | | | * open up a shortcuts dialog instead of printing help text * Updating UI for keyboard shortcuts modal * update PR per PLT-7284 * fix typo error * fix mixed up shortcut keys * move to client side * fix shortcuts list, remove unused function and revert server side code for autocompletion * remove quick team switcher
* Updating server dependancies. (#7246)Christopher Speller2017-08-17400-11804/+45303
|
* webhook merge fix (#7250)Chris2017-08-172-1/+18
|
* Fixing bad merge (#7247)Corey Hulen2017-08-171-2/+2
|
* Merge branch 'release-4.1'Christopher Speller2017-08-1760-1941/+2200
|\
| * PLT-7408 Move webhook handling into api4 package to fix EnableAPIv3 config ↵Joram Wilander2017-08-163-52/+53
| | | | | | | | | | | | | | | | setting (#7219) * Move webhook handling into api4 package to fix EnableAPIv3 config setting * Fix unit test
| * translations PR 20170814 (#7210)enahum2017-08-1527-1813/+1852
| |
| * [PLT-7180] Fix delete/edit not showing on DotMenu at parent post of RHS (#7214)Saturnino Abril2017-08-151-0/+9
| | | | | | | | | | | | * fix delete/edit not showing on DotMenu at parent post of RHS * remove unnecessary shouldComponentUpdate
| * disable intermittently failing test at TestGetAllTeams temporarily (#7211)Saturnino Abril2017-08-151-2/+4
| |
| * PLT-7398 Removed flex-basis from search box (#7204)Harrison Healey2017-08-151-2/+0
| |
| * PLT-7375: Email batching not on by default for accounts that have never ↵Jonathan2017-08-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touched their email settings (#7206) * PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference * PLT-7375: Reverting 4cf316fcd * PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference * PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail * PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail * PLT-7375: Reverted accidental changes to config * PLT-7375: Manually fixing config.
| * Adding default of EN to localization store (#7208)Christopher Speller2017-08-151-1/+1
| |
| * [PLT-7342] Add function and tests to specifically determine @all & @channel ↵Saturnino Abril2017-08-123-1/+108
| | | | | | | | | | | | | | | | (#7181) * add function and tests to specifically determine @all & @channel * uodate per comments - regex and tests
| * PLT-7336: Fix team API endpoints.George Goldberg2017-08-112-3/+22
| |
| * PLT-6609: Fix hashtag highlighting of search results (#7175)George Goldberg2017-08-112-6/+23
| | | | | | | | | | | | * PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag * Fix bug that broke pre-release.