Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix log error message for UpdateLastActivityAtIfNeeded (#7282) | enahum | 2017-08-25 | 1 | -1/+1 |
| | |||||
* | add attachments to rhs search results (#7290) | Chris | 2017-08-25 | 1 | -1/+9 |
| | |||||
* | Other Packages: NewLocAppError -> NewAppError (#7283) | George Goldberg | 2017-08-25 | 5 | -21/+25 |
| | |||||
* | [PLT-7390] Add Type = 'O' in getting open teams at sql store (#7207) | Saturnino Abril | 2017-08-24 | 2 | -5/+126 |
| | | | | | | * add Type = 'O' in getting open teams at sql store * updated PR | ||||
* | Switch hook debug msg to info (#7272) | Corey Hulen | 2017-08-22 | 2 | -4/+4 |
| | |||||
* | Fixing logging errors for Franz (#7273) | Corey Hulen | 2017-08-22 | 1 | -24/+26 |
| | |||||
* | Fixed not being able to scroll down in message preview mode when using (#7194) | Sudheer | 2017-08-22 | 1 | -0/+4 |
| | | | only couple of sentences in edit mode. | ||||
* | Hiding the rogue webkit file input button (#7130) | Alex White | 2017-08-22 | 1 | -0/+4 |
| | |||||
* | Fixing race in update channel (#7269) | Corey Hulen | 2017-08-22 | 3 | -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 Meza | 2017-08-22 | 1 | -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 Junior | 2017-08-21 | 5 | -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) | Chris | 2017-08-21 | 5 | -49/+156 |
| | |||||
* | Updating client dependancies. (#7253) | Christopher Speller | 2017-08-21 | 2 | -139/+396 |
| | |||||
* | PLT-5747: Fixed inconsistent on-hover, tooltip, and active states for ↵ | Sudheer | 2017-08-21 | 8 | -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) | atp | 2017-08-21 | 2 | -17/+39 |
| | |||||
* | fix expand/collapse arrows for youtube videos (#7240) | Saturnino Abril | 2017-08-21 | 3 | -2/+5 |
| | |||||
* | Minor string changes for JIRA setting (#7264) | Jason Blais | 2017-08-21 | 2 | -6/+6 |
| | | | | | | * Update settings.jsx * Update en.json | ||||
* | make config.json play nicely with version control (#7221) | Chris | 2017-08-20 | 4 | -0/+24 |
| | |||||
* | Adding debugging for webhook (#7199) | Corey Hulen | 2017-08-18 | 3 | -8/+13 |
| | | | | | | | | * Adding debugging for webhook * Fixing build error * Moving error down | ||||
* | Fixing bad merge (#7259) | Corey Hulen | 2017-08-18 | 1 | -1/+1 |
| | |||||
* | Ignoring primary key duplication errors on status saveorupdate (#7255) | Christopher Speller | 2017-08-18 | 1 | -1/+4 |
| | |||||
* | Adding check for file write or minio/s3 bucket before server start. (#7254) | Christopher Speller | 2017-08-18 | 2 | -0/+49 |
| | |||||
* | Multiple bug fixes (#7243) | Asaad Mahmood | 2017-08-18 | 6 | -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) | Chris | 2017-08-18 | 5 | -15/+649 |
| | | | | | | * windows support for plugin ipc * unix test fix | ||||
* | PLT-7217: CLI command to change channel public/private type. (#7225) | George Goldberg | 2017-08-18 | 1 | -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 Wilander | 2017-08-18 | 1 | -14/+0 |
| | |||||
* | Added missing string for translation (#7203) | Christian Arnold | 2017-08-18 | 1 | -0/+1 |
| | |||||
* | PLT-6451 Migrate installed_oauth_app.jsx to be pure and use Redux (#7190) | n1aba | 2017-08-18 | 8 | -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 Healey | 2017-08-18 | 3 | -43/+46 |
| | |||||
* | Rename SAML in the System Console to SAML 2.0 + access token string fixes ↵ | Jason Blais | 2017-08-18 | 4 | -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) | n1aba | 2017-08-18 | 6 | -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 Abril | 2017-08-18 | 15 | -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 Speller | 2017-08-17 | 400 | -11804/+45303 |
| | |||||
* | webhook merge fix (#7250) | Chris | 2017-08-17 | 2 | -1/+18 |
| | |||||
* | Fixing bad merge (#7247) | Corey Hulen | 2017-08-17 | 1 | -2/+2 |
| | |||||
* | Merge branch 'release-4.1' | Christopher Speller | 2017-08-17 | 60 | -1941/+2200 |
|\ | |||||
| * | PLT-7408 Move webhook handling into api4 package to fix EnableAPIv3 config ↵ | Joram Wilander | 2017-08-16 | 3 | -52/+53 |
| | | | | | | | | | | | | | | | | setting (#7219) * Move webhook handling into api4 package to fix EnableAPIv3 config setting * Fix unit test | ||||
| * | translations PR 20170814 (#7210) | enahum | 2017-08-15 | 27 | -1813/+1852 |
| | | |||||
| * | [PLT-7180] Fix delete/edit not showing on DotMenu at parent post of RHS (#7214) | Saturnino Abril | 2017-08-15 | 1 | -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 Abril | 2017-08-15 | 1 | -2/+4 |
| | | |||||
| * | PLT-7398 Removed flex-basis from search box (#7204) | Harrison Healey | 2017-08-15 | 1 | -2/+0 |
| | | |||||
| * | PLT-7375: Email batching not on by default for accounts that have never ↵ | Jonathan | 2017-08-15 | 2 | -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 Speller | 2017-08-15 | 1 | -1/+1 |
| | | |||||
| * | [PLT-7342] Add function and tests to specifically determine @all & @channel ↵ | Saturnino Abril | 2017-08-12 | 3 | -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 Goldberg | 2017-08-11 | 2 | -3/+22 |
| | | |||||
| * | PLT-6609: Fix hashtag highlighting of search results (#7175) | George Goldberg | 2017-08-11 | 2 | -6/+23 |
| | | | | | | | | | | | | * PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag * Fix bug that broke pre-release. | ||||
| * | PLT-7323/PLT-7334 CSS fixes (#7155) | Asaad Mahmood | 2017-08-11 | 3 | -4/+15 |
| | | | | | | | | | | | | | | | | | | | | * PLT-7334 - Channel header cuts off list * PLT-7323 - Fixing alignment for attachments * PLT-7323 - Fixing close button for attachments * Changed header description to use margin instead of padding | ||||
| * | Add character limit to channel header edit modal (#7179) | Joram Wilander | 2017-08-11 | 2 | -7/+9 |
| | | |||||
| * | PLT-7360 Adding SSE to compliance (#7165) | Corey Hulen | 2017-08-11 | 2 | -21/+34 |
| | | | | | | | | | | | | | | | | * Adding SSE to E20 * Fixing UI bug * Fixing loc strings | ||||
| * | Update mattermost-redux to webapp-4.1 branch (#7170) | Joram Wilander | 2017-08-11 | 2 | -3/+3 |
| | |