IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-27 05:37:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,158 Commits 1,692 Branches 1,583 Tags
c6ded1dbfd69a1da69add8d2b554f4b7dd0341b3
Commit Graph
8158 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
George Goldberg c6ded1dbfd Merge branch 'release-3.7' 2017-03-23 17:38:24 +00:00
Brad Howes 120f5a6f8a Websocket CORS Support (#5667) 
* Second attept at patching api/websocket.go for CORS support.

* Missing include

* Fixed whitespace formatting so that gofmt passes.

* Added tests for CORS filtering
 2017-03-23 09:10:52 -04:00
Carlos Tadeu Panato Junior 34cb70d005 add implementation for endpoint DELETE outgoing webhook for apiv4 (#5828) 2017-03-23 12:50:06 +00:00
VeraLyu 94b4aa082c PLT-5913: Remove id from heading markdown compilation (#5782) 
Id for heading markdown is unnecessary as we didn't
attach any style/effect on that id, and it also introduce
duplicate id. So remove it from heading markdown generatiing.
 2017-03-23 08:19:22 -04:00
Christopher Speller efcf78a4f3 Fxing TODO check (#5836) 2017-03-23 11:10:16 +00:00
Carlos Tadeu Panato Junior 78e5b803cc add implementation to get outgoing webhook for apiv4 (#5827) 2017-03-23 11:02:42 +00:00
VeraLyu 0326177253 PLT-5669: Change format of timestamp of access history (#5646) 
Add new line for timestamp and forbid wrap for ip and sessionid of access history to
prevent unnecessary line wrap.
 2017-03-23 10:39:15 +00:00
Carlos Tadeu Panato Junior 41ebdb6441 fix - make loginId always lowercase (#5613) 2017-03-23 10:35:50 +00:00
Joram Wilander 2a753949f1 Implement POST /users/search endpoint for APIv4 (#5822) 
* Implement POST /users/search endpoint for APIv4

* PLT-2713 Added store functions for searching users that don't have a team

* PLT-2713 Added 'without_team' option when searching users

* PLT-2713 Added 'without_team' option when searching users (v4)
 2017-03-23 10:34:22 +00:00
enahum 8ec3757074 PLT-5905 Fix saml certificates for 3.7 (#5843) v3.7.3 2017-03-22 21:26:00 +00:00
George Goldberg 0d917b08ed Fix telemetry. (#5841) 2017-03-22 20:17:27 +00:00
Christopher Speller 8d68de000a Fxing some unit tests 2017-03-22 15:51:57 -04:00
enahum 7e2e823884 PLT-5905 Fix saml certificates (#5803) 2017-03-22 19:24:05 +00:00
Joram Wilander 61b1237c20 Update channel permissions for v4 endpoints (#5829) 
* Fix join channel permission for v4 endpoint

* Allow regular users to get public channels they are not in

* Fix unit test
 2017-03-22 08:13:44 -07:00
George Goldberg 0e98dfa445 PLT-5872: Remove Security Category from Security Alerts. (#5835) 
It wasn't actually providing any information, just `c=d` every time.
 2017-03-22 10:51:38 -04:00
enahum 20a2e6fab7 translations PR 20170320 (#5819) 2017-03-21 23:49:27 -03:00
Eric Sethna 25517aae56 Add IDs to Team Settings, Channel Settings, Account Settings (Display & Advanced) (#5823) 
* Add IDs to Channel Notification Preferences

* Add IDs to Display Settings

* Add ID to language dropdown

* Add Ids

* Add ids

* Add Ids

* Add Ids

* Add Ids

* Add Id

* Add Ids

* Add Ids

* Fix duplicate Id
 2017-03-21 19:16:48 -04:00
Joram Wilander bea49cbcf3 Add ability to use 'me' in place of user id for APIv4 (#5826) 2017-03-21 18:43:16 -04:00
Joram Wilander fd6e2f3f73 Implement GET /audits endpoint for APIv4 (#5779) 
* Implement GET /audits endpoint for APIv4

* Fix log unit test
 2017-03-21 09:06:08 -04:00
Carlos Tadeu Panato Junior 4968ef0759 implement PUT /hooks/outgoing/{hook_id} - update outgoing hook (#5793) 2017-03-21 11:56:42 +00:00
enahum 32c658b1ce translations PR 20170316 (#5791) 2017-03-20 20:02:50 -03:00
Jason Blais 036dcddd3a Update contributing guidelines for platform repo (#5455) 
* Update CONTRIBUTING.md

* Fix formatting

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* ES: minor tweaks to review process

* Update CONTRIBUTING.md
 2017-03-20 18:31:18 -04:00
Harrison Healey 8866218243 Revert "PLT-3181 Added crossorigin='anonymous' to all external images (#5774)" (#5815) 
This reverts commit 24848f9d6a.
 2017-03-20 16:58:09 -04:00
Christopher Speller 7caab35cfa Fxing some unit tests (#5817) 2017-03-20 16:47:53 -04:00
Joram Wilander dcdea9b54c Fix compile error on master (#5813) 2017-03-20 10:12:43 -04:00
Ryan Wang 1ef071af6b Remove blue bar from link previews (#5673) 2017-03-20 09:24:46 -04:00
Josta Yee e86add77ad Add http_proxy support for http client (#5571) 
- if 'http_proxy' environment variable is set, respect it when creating http client
- otherwise initialize a http client with timeout settings

Add ogjson to cache even when it fails

in this way we can prevent from requesting unparsable urls repeatedly

Extend expire time of cached link preview data to a week

There's no need to invalidate cache and send request again frequently

Revert timeout

Revert cache_expire_time
 2017-03-20 10:20:42 -03:00
Joram Wilander 76f8420a52 Fix success typo in Makefile (#5809) 2017-03-20 09:15:05 -04:00
Christopher Speller f9be4d5acb Removing old CLI (#5797) 2017-03-20 12:58:15 +00:00
Carlos Tadeu Panato Junior 3d14573b8c [APIV4] POST /hooks/outgoing/{hook_id}/regen_token - regentoken endpoint for apiV4 (#5783) 2017-03-20 12:56:23 +00:00
Jason Blais 4efefa0ff6 Update pinned posts help text (#5811) 
* Update pinned posts help text

* Update en.json

* Fix id
 2017-03-20 08:51:25 -04:00
Saturnino Abril 7e89077a93 Endpoint for APIv4 POST /channels/{channel_id}/members (#5775) 2017-03-20 12:44:08 +00:00
Carlos Tadeu Panato Junior ac8282cda1 Add updateConfig endpoint for apiV4 (#5706) 2017-03-20 12:37:34 +00:00
VeraLyu 9b10f3ef54 Split delete modal trigger for reuse (#5740) 
Spllit delete modal trigger for reuse and make emoji delete
to use this modal trigger.
 2017-03-19 09:53:12 -04:00
Christopher Speller efd6c86066 Fxing build 2017-03-17 13:36:18 -04:00
Joram Wilander f4473cf312 PLT-5943 Reduce minimum username length (#5798) v3.7.2 2017-03-17 16:42:23 +00:00
George Goldberg 7f266c1951 Merge branch 'release-3.7' into master. 2017-03-17 16:29:26 +00:00
Asaad Mahmood bfae88e60c Ui improvements (#5755) 
* PLT-5816 - Flagged posts tooltip fix

* PLT-5766 - Link previews appearing outside the box

* PLT-5795 - Fixing alignment user list in channel

* PLT-5818 - Reset password error not aligned

* PLT-5837 - Adjusting image preview max height

* PLT-5778 - Updating word break for paragraphs

* PLT-5848 - Updating label for file error

* PLT-5846 - Markdown tables extra border on mobile

* PLT-5662 - Pinned post UI improvement

* Fixing eslint error

* Updating tooltip eslint issue

* PLT-5832 - Removing error styling on labels
 2017-03-17 08:19:54 -04:00
Ryan Wang 6f87438cbb 'Other words' for mentions no longer includes '@username' (#5746) 2017-03-17 08:19:10 -04:00
Christopher Speller 9298315ce9 Fxing code coverage numbers + APIv4 tests with EE (#5789) 2017-03-16 14:00:00 -07:00
Eric Sethna 05e3dc9f2a Add IDs for Account Settings > Notifications (#5788) 
* Add IDs for desktop notification settings

* Add IDs for email notifications

* Add IDs to user notification settings

* Add close button ID
 2017-03-16 16:37:28 -04:00
Corey Hulen b7a128ec1c Fixing ids for UI automation (#5772) 2017-03-16 12:00:52 -07:00
Joram Wilander 0bc3e46082 Implement GET /logs endpoint for APIv4 (#5778) 2017-03-16 11:59:44 -07:00
Harrison Healey 24848f9d6a PLT-3181 Added crossorigin='anonymous' to all external images (#5774) 
* PLT-3181 Added crossorigin='anonymous' to all external images

* Fixed image unit tests

* Added crossorigin='anonymous' to a few more places
 2017-03-16 11:59:00 -07:00
Joram Wilander d757645c24 Implement some channel endpoints for APIv4 (#5767) 2017-03-16 11:58:33 -07:00
Ryan Wang 04c0223c64 Sort favorite channels alphabetically regardless of type (#5739) 2017-03-16 11:27:33 -07:00
lindalumitchell 91355f0e7d Add IDs to Security > password fields (#5777) 2017-03-16 09:28:35 -07:00
Carlos Tadeu Panato Junior 6a5f621f73 cannot change ID and deleteat when trying to update the hook (#5784) 2017-03-16 16:26:15 +00:00
Carlos Tadeu Panato Junior 241f9e8888 Implement update IncomingHook for apiV4 (#5762) 2017-03-15 19:47:15 -04:00
George Goldberg 91d430b2a3 Fix policy application in team edition. (#5771) v3.7.1 2017-03-15 19:32:02 +00:00