IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,253 Commits 845 Branches 1,202 Tags
v4.3.0-rc1
Commit Graph

9253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Tadeu Panato Junior
12a9180807 [PLT-1015] Make all Mattermost system emails Multi-Part, with both a HTML 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
 2017-08-21 11:31:13 -07:00
Chris
65ccd4afb2 make hooks optional, short circuit if unimplemented (#7263) 2017-08-21 11:48:07 -05:00
Christopher Speller
5872a294aa Updating client dependancies. (#7253) 2017-08-21 10:18:40 -04:00
Sudheer
b2e53086b3 PLT-5747: Fixed inconsistent on-hover, tooltip, and active states for 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.
 2017-08-21 10:12:40 -04:00
atp
2986c38469 PLT-7256: Fix email rate selection when batching is disabled (#7202) 2017-08-21 10:00:40 -04:00
Saturnino Abril
22efdbe6fb fix expand/collapse arrows for youtube videos (#7240) 2017-08-21 08:06:34 -04:00
Jason Blais
d7b055f428 Minor string changes for JIRA setting (#7264) 
* Update settings.jsx

* Update en.json
 2017-08-21 08:04:33 -04:00
Chris
1222e6cd41 make config.json play nicely with version control (#7221) 2017-08-20 23:47:14 -05:00
Corey Hulen
4a8afebcdb Adding debugging for webhook (#7199) 
* Adding debugging for webhook

* Fixing build error

* Moving error down
 2017-08-18 15:58:26 -07:00
Corey Hulen
2b3f7d0bc3 Fixing bad merge (#7259) 2017-08-18 13:26:12 -07:00
Christopher Speller
2461c55d0d Ignoring primary key duplication errors on status saveorupdate (#7255) 2017-08-18 12:45:48 -07:00
Christopher Speller
17098fb2a3 Adding check for file write or minio/s3 bucket before server start. (#7254) 2017-08-18 12:22:29 -07:00
Asaad Mahmood
b60cc5b28e Multiple bug fixes (#7243) 
* 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
 2017-08-18 12:21:34 -07:00
Chris
f720288c10 windows support for plugin ipc (#7251) 
* windows support for plugin ipc

* unix test fix
 2017-08-18 12:21:01 -07:00
George Goldberg
42c6686602 PLT-7217: CLI command to change channel public/private type. (#7225) 
This adds a channel modify CLI command, with the one property that it
can modify being the channel public/private type.
 2017-08-18 12:14:52 -07:00
Joram Wilander
e40fd0b3b5 Remove temporary cookie code (#7218) 2017-08-18 12:09:01 -07:00
Christian Arnold
339b30e1da Added missing string for translation (#7203) 2017-08-18 12:08:00 -07:00
n1aba
13d76a0cb2 PLT-6451 Migrate installed_oauth_app.jsx to be pure and use Redux (#7190) 
* Migrate installed_oauth_app.jsx to be pure and use Redux, add test

* Fix behavior for the error case
 2017-08-18 12:06:32 -07:00
Harrison Healey
6df51f8617 PLT-7397 Added loadImage function instead of Image.prototype.load (#7184) 2017-08-18 12:03:04 -07:00
Jason Blais
26ec8ffc3e Rename SAML in the System Console to SAML 2.0 + access token string fixes (#7182) 
* Update en.json

* Update en.json

* Update admin_sidebar.jsx

* Update saml_settings.jsx
 2017-08-18 12:02:06 -07:00
n1aba
f40f41ed53 PLT-6443 Migrate add_oauth_app.jsx to be pure and use Redux (#7232) 
* Migrate add_oauth_app.jsx to be pure and use Redux, add tests

* Remove unused flux code for OAuthApps
 2017-08-18 09:42:10 -04:00
Saturnino Abril
9097289c2c [PLT-3377] Open up a shortcuts dialog instead of printing help text (#7064) 
* 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
 2017-08-18 17:04:05 +08:00
Christopher Speller
96eab12027 Updating server dependancies. (#7246) 2017-08-17 17:19:06 -07:00
Chris
2c895ee66e webhook merge fix (#7250) 2017-08-17 15:07:47 -07:00
Corey Hulen
4d243e9256 Fixing bad merge (#7247) 2017-08-17 12:45:51 -07:00
Christopher Speller
fd1301779f Merge branch 'release-4.1' 2017-08-17 09:35:36 -07:00
Asaad Mahmood
d41f1695e9 Minor UI improvements (#7137) 
* PLT-7303 - Fixing manage members button

* Revert "PLT-7303 - Fixing manage members button"

This reverts commit 7dcb68a8e3.

* PLT-7303 - Redesigning channel members popover

* Updating font size and positioning
 2017-08-17 10:07:34 -04:00
George Goldberg
22459ee17a PLT-7302: Aggregate Elasticsearch indexes over a certain age. (#7224) 
* PLT-7302: Aggregate Elasticsearch indexes over a certain age.

This is done by a scheduled daily job, in order to keep the shard count
to a sensible level in Elasticsearch.

* Use map[string]string instead of StringMap
 2017-08-17 10:05:17 -04:00
Saturnino Abril
4e92d18017 set ephemeral message ("message deleted") without ("Only visible to you") visible to users other than the owner (#7201) 2017-08-17 10:14:59 +01:00
Chris
f80d50adbd PLT-7407: Back-end plugin mechanism (#7177) 
* begin backend plugin wip

* flesh out rpcplugin. everything done except for minor supervisor stubs

* done with basic plugin infrastructure

* simplify tests

* remove unused test lines
 2017-08-16 17:23:38 -05:00
Corey Hulen
4f85ed985d Fixing licensing (#7226) 2017-08-16 11:28:48 -07:00
Corey Hulen
29a7e182a6 PLT-6079 Adding leader election (#7105) 2017-08-16 10:29:45 -07:00
Corey Hulen
0ab490845a PLT-6226 Fixing races with licensing (#7213) 
* PLT-6226 Fixing races with licensing

* Fixing build issue

* Fixing licensing issue

* removing commented code
 2017-08-16 09:51:45 -07:00
Harrison Healey
32265df8be PLT-7353 Fixed being unable to use quotes in links (#7171) 2017-08-16 11:04:29 -04:00
George Goldberg
30cfc1aa3e PLT-7368: Don't clear search box on ESC in Chrome. (#7215) 2017-08-16 09:18:36 -04:00
Jason Blais
cc3d8a9180 Add note that users can be searched by token ID in the Users page (#7222) 
* Update en.json

* Update custom_integrations_settings.jsx

* Update logs.jsx
 2017-08-16 10:18:06 -03:00
Chris
b122381e87 PLT-1649: add response_url support for custom slash commands (#6739) 
* add response_url support for custom slash commands

* pr suggestions

* pr update / suggestion

* test fix
 2017-08-16 08:17:57 -04:00
Saturnino Abril
5cd45c9394 add emoji to recently used section when reacting to a post in RHS (#7217) 2017-08-16 16:59:05 +08:00
Joram Wilander
0033e3e37b PLT-7408 Move webhook handling into api4 package to fix EnableAPIv3 config setting (#7219) 
* Move webhook handling into api4 package to fix EnableAPIv3 config setting

* Fix unit test
v4.1.0 		2017-08-16 04:25:36 +08:00
enahum
7d3719b5c6 translations PR 20170814 (#7210) 2017-08-15 23:22:22 +08:00
Saturnino Abril
8e646763e7 [PLT-7180] Fix delete/edit not showing on DotMenu at parent post of RHS (#7214) 
* fix delete/edit not showing on DotMenu at parent post of RHS

* remove unnecessary shouldComponentUpdate
 2017-08-15 23:20:19 +08:00
Saturnino Abril
fcd56927df disable intermittently failing test at TestGetAllTeams temporarily (#7211) 2017-08-15 23:03:39 +08:00
Harrison Healey
1a270744a7 PLT-7398 Removed flex-basis from search box (#7204) 2017-08-15 20:28:28 +08:00
Jonathan
e1e2566c67 PLT-7375: Email batching not on by default for accounts that have never 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.
 2017-08-15 09:20:03 +08:00
Christopher Speller
c66bb2349e Adding default of EN to localization store (#7208) 2017-08-15 08:48:08 +08:00
Saturnino Abril
4cf316fcd3 [PLT-7342] Add function and tests to specifically determine @all & @channel (#7181) 
* add function and tests to specifically determine @all & @channel

* uodate per comments - regex and tests
 2017-08-12 02:01:11 +08:00
George Goldberg
638c38cc0d PLT-7336: Fix team API endpoints. 2017-08-11 18:20:10 +01:00
George Goldberg
e7053b971b PLT-6609: Fix hashtag highlighting of search results (#7175) 
* PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag

* Fix bug that broke pre-release.
 2017-08-11 23:52:24 +08:00
Asaad Mahmood
44b976886f PLT-7323/PLT-7334 CSS fixes (#7155) 
* 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
 2017-08-11 22:39:05 +08:00
Joram Wilander
33d3818e1f Add character limit to channel header edit modal (#7179) 2017-08-11 21:51:40 +08:00