mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
9 997 коммитов 3 Ветки 0 Теги
ed59e2b7357ad82573ea8a38b40172dc9672da44
Граф коммитов

9997 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Saturnino Abril
4ce37601a1 add notification when @user, @here, @all and @channel has colon ":" at the end (#8760) 2018-05-11 12:57:20 -04:00
Jesse Hallam
b4db76cedb fix mlog-ing before initialized (#8753) 
Dump mlog to STDOUT before initialized, to allow for logging failures
that occur due to config parsing, etc.

Fix file logging to honour logger.FileJson instead of copying the
logger.ConsoleJson setting.
 2018-05-11 12:56:54 -04:00
Joram Wilander
91c9981563 More potential panic fixes (#8776) 2018-05-11 11:56:02 -04:00
Carlos Tadeu Panato Junior
0dbaa2d032 [MM-10458] Change system response to "Could not find the channel" - bug fix (#8738) 
* [MM-10458] Change system response to "Could not find the channel" when trying to invite user to private channel you can't see

* add another check to check if user have permission to add another in pvt channel
 2018-05-11 11:20:47 -04:00
Derrick Anderson
c9196af23e Merge branch 'merge410rc2' 2018-05-11 10:56:38 -04:00
Derrick Anderson
52674eb4c7 add s3 test back in for master 2018-05-11 10:44:42 -04:00
Derrick Anderson
e3ea27c301 Merge release-4.10 with master 2018-05-11 10:17:59 -04:00
Martin Kraft
91557bbd97 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-11 08:05:23 -04:00
Jesse Hallam
2b27e12445 MM-10188: expect io.Reader in FileBackend.WriteFile (#8765) 
This is a reworked set of changes originally from @josephGuo to begin
reducing the duplicated memory required when uploading files.
 2018-05-10 15:16:33 -07:00
Joram Wilander
21d3b247d9 Comment out problematic TestS3TestConnection test (#8770) 2018-05-10 15:31:23 -04:00
Joram Wilander
8449982576 Attempt to fix hub nil panic (#8766) 2018-05-10 14:17:01 -04:00
Daniel Schalla
7fa1c6c4ba Add Ping Timeout Signal for WebSocket Client (#8666) 
Import Order

gofmt

gofmt

gofmt

Renamed Const to make Unit more obvious

Renamed Const to make Unit more obvious #2
 2018-05-10 12:51:34 -04:00
Christopher Speller
d8dd271e43 MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID without losing their account (#8756) 
* Adding LoginIdAttribute

* Modifying LDAP to use loginIDAttribute.

* Adding IDAttribute migration and AD objectGUID support.

* Removing unused idea.

* Fix typo.
 2018-05-10 09:46:09 -07:00
Joram Wilander
68340d4715 Prevent divide by zero if there are no hubs (#8763) 2018-05-10 11:22:10 -04:00
Carlos Tadeu Panato Junior
823b22c403 fix test and add new (#8758) 2018-05-10 08:43:49 -04:00
George Goldberg
11c60ea41a Merge branch 'master' into advanced-permissions-phase-2 2018-05-10 12:03:51 +01:00
Carlos Tadeu Panato Junior
db6b8f6238 fix test and add new (#8759) 2018-05-10 17:56:11 +08:00
Christopher Speller
454c113b4e Removing bad test. 2018-05-09 18:03:28 -07:00
Martin Kraft
2eed7e4ebf Fixes incorrect MiB size. (#8750) 2018-05-09 17:18:54 -04:00
Martin Kraft
d3e14a1bf8 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-09 15:00:07 -04:00
Harrison Healey
a752d7de5a MM-10495 Updated user agent detection to match output of previous library (#8748) 
* MM-10495 Updated user agent detection to match output of previous library

* Fixed missing license header
 2018-05-09 12:25:03 -04:00
Derrick Anderson
c1853c7f40 prep code for 5.0 (#8743) 2018-05-08 09:27:37 -04:00
Jonathan Villemaire-Krajden
6c3d1fc1f8 Fix empty GOPATH behaviour in Makefile (#8724) 2018-05-07 07:04:09 -07:00
Joram Wilander
09c6770885 Add IncrementClusterEventType function to metrics interface (#8728) 2018-05-04 14:59:28 -07:00
Derrick Anderson
e555b7454d Uncomment upgrade for 4.10 (#8727) 
* uncomment upgrade code

* ping jenkins

* add 4.10.0 to version.go
 2018-05-04 17:01:14 -04:00
Harrison Healey
fc513a9e61 Added missing i18n strings for files and email batching (#8700) 
* Added missing i18n strings for files and email batching

* Added more fields to log messages
 2018-05-04 16:11:15 -04:00
Jesús Espino
7c680cacab MM-10319: Use normalized email for Saml (migration) (#8711) 2018-05-04 16:10:43 -04:00
Saturnino Abril
30fd4a2951 update permission of converting a channel from public to private to allow team admin (#8723) 2018-05-05 02:16:00 +08:00
Martin Kraft
37b3805ca6 Removes .vscode dir. (#8721) 2018-05-04 08:44:48 -07:00
Saturnino Abril
5000eac24f respect image orientation before saving height and width of FileInfo (#8710) 2018-05-04 01:02:22 +08:00
Martin Kraft
14b65b990c MM-10393: Fix for tracking active vs inactive users. (#8706) 2018-05-03 16:00:33 +02:00
Harrison Healey
3b138c8b16 MM-10189 Fixed inconsistency when using environment variables for MessageExportSettings (#8705) 2018-05-03 09:55:03 -04:00
Jesús Espino
ffb834ec3c Fix TestSendNotifications test (#8712) 2018-05-03 09:40:54 -04:00
George Goldberg
60cf74352f MM-10140: API Implementation for Schemes related Endpoints (#8615) 
* Implement basic scheme CRUD endpoints.

* Get All Schemes (Paged) Endpoint and store plumbing.

* Add get teams/channels for schemes.

* Fix unit tests.

* Review fixes.

* More review fixes.
 2018-05-03 09:00:26 -04:00
George Goldberg
62898f4892 MM-10424: Migrate PostEditTimeLimit config setting. (#8702) 2018-05-02 14:09:11 -04:00
Joram Wilander
d6537deb3d Add inactive user count to analytics and fix client analytics function (#8695) 2018-05-02 07:50:56 -07:00
Carlos Tadeu Panato Junior
1647614fc9 [MM-10415] Reorder checks for command invite (#8701) 2018-05-02 22:07:26 +08:00
Martin Kraft
7d5e85e413 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-02 07:45:20 -04:00
Martin Kraft
f4dcb4edf2 MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680) 
* MM-10183: Adds channel scheme API endpoint.

MM-10182: Adds team scheme API endpoint.

MM-10182_3: Switch from scheme_id in path to body.

* MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'.

* MM-10182: Fix merge error.
 2018-05-02 07:31:14 -04:00
Martin Kraft
d2cc0c5834 Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermost-server into advanced-permissions-phase-2 2018-05-01 19:00:15 -04:00
Martin Kraft
ff6c42309c Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-01 18:59:20 -04:00
Joram Wilander
529807c1ba Update zoom plugin to 0.1.6 (#8698) 2018-05-01 07:35:27 -07:00
Jesse Hallam
1e6553704d MM-8622: improved plugin error handling (#8692) 
* don't report an error on plugin activation if already active

* improved plugin logging events

Log an error when a plugin's ServeHTTP fails, or when it unexpectedly
terminates.

Restart a plugin at most three times, allowing its failure to later
bubble up under the "failed to stay running" status.

* clarified plugin activation/deactivation

Avoid repeatedly activating when any configuration bit changes. Improved
logging.

* constrain plugin ids to ^[a-zA-Z0-9-_\.]+$ and enforce minimum length

Previously, the plugin id was used unsanitized to relocate the plugin
bundle, which allowed writing outside the `plugins/` directory by using
an `id` containing `../`.

Similarly, an empty string was accepted as an id and led to unexpected
error messages.

* remove plugins by manifest path, not id

If the id within the manifest ever diverges from the actual plugin
location, it becomes impossible to remove via the API. Instead, if the
plugin is found by id, remove the path containing the manifest.

* ignore plugins with nil manifests

If a plugin was detected, but had a manifest that couldn't be parsed, it
will be left nil but still be listed among the packages. Skip over these
in most cases to avoid segfaults.

* leverage mlog more effectively for plugins

* build issues
 2018-05-01 07:34:12 -07:00
Elias Nahum
3b57422c5f translations PR 20180430 (#8696) 2018-05-01 11:07:56 -03:00
Jesús Espino
baba8fa92f Upgrading minio-go library to 6.0.0 (#8651) 
* Upgrading minio-go library to 6.0.0

* Removing unnecesary Gopkg constraint
 2018-04-30 14:35:10 -07:00
Derrick Anderson
a5f006b8a9 Revert "MM-9770: rewrite getParentsPosts to improve performance (#8467)" (#8659) (#8694) 
This reverts commit 4b675b347b.
 2018-04-30 16:06:06 -04:00
Hyeseong Kim
e73f1d7314 MM-9072/MM-10185 Force-convert the encoding of OpenGraph metadata to UTF-8 (#8631) 
* Force-convert non-UTF8 HTML to UTF8 before opengraph processing

* Split the force-encoding function

* Add benchmark Test for the forceHTMLEncodingToUTF8()

```
Running tool: /home/comet/go-v1.9.2/bin/go test -benchmem -run=^$ github.com/mattermost/mattermost-server/app -bench ^BenchmarkForceHTMLEncodingToUTF8$

[03:32:58 KST 2018/04/21] [INFO] (github.com/mattermost/mattermost-server/app.TestMain:28) -test.run used, not creating temporary containers
goos: linux
goarch: amd64
pkg: github.com/mattermost/mattermost-server/app
BenchmarkForceHTMLEncodingToUTF8/with_converting-4         	  100000	     11201 ns/op	   18704 B/op	      32 allocs/op
BenchmarkForceHTMLEncodingToUTF8/without_converting-4      	  300000	      3931 ns/op	    4632 B/op	      13 allocs/op
PASS
ok  	github.com/mattermost/mattermost-server/app	2.703s
Success: Benchmarks passed.
```

* Remove an unnecessary constraint

* Add pre-check if content-type header is already utf-8

* Move the checking for utf-8 into forceHTMLEncodingToUTF8() for testing

* Revert df3f347213faa0d023c26d201fa6531f46391086..HEAD, without Gopkg.lock
 2018-04-30 09:54:11 -07:00
Christopher Speller
9c5815ee41 Add stdlog interpreter. (#8691) 2018-04-30 08:18:04 -07:00
Jason Blais
2f175001b4 Add missing diagnostics for 4.10 (#8675) 
* Add missing diagnostics for 4.10

* Add missing ":"
 2018-04-30 10:37:15 -04:00
Elias Nahum
37d89d3955 translations PR 20180424 (#8662) 2018-04-30 08:33:44 -03:00