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
11,497 Commits 845 Branches 1,202 Tags
d8f9dd271d3317e64ad561a7175b3ea4f11340aa
Commit Graph

11497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikhil Ranjan
d8f9dd271d MM-18268 Converting to structured logging the file app/websock… (#12143) 2019-09-12 20:30:41 -04:00
Jesús Espino
5cf578f486 Migrating to our ldap fork (#12149) 2019-09-12 21:11:05 +02:00
Nikhil Ranjan
5fe5077578 MM-18257 Converting to structured logging the file utils/i18n.… (#12095) 2019-09-12 11:55:31 -05:00
Jesús Espino
28cc7e7e36 Migrating roles and schemes to new Cache Layer (#11936) 
* Migrating roles and schemes to new Cache Layer

* Adding missed license headers

* Updating cache tests

* Adding the cache layer to the testlib helper

* Fixing cyclic dependency

* fixing a bit of not-idiomatic error handling

* Another small fix arrount idiomatic error handling
 2019-09-12 18:52:45 +02:00
Nikhil Ranjan
e58aeb90a8 MM-18255 Converting to structured logging the file web/static.go (#12093) 
* Converting to structured logging the file web/static.go

* change staticDir to clientDir in logs
 2019-09-13 00:22:48 +08:00
Nikhil Ranjan
e8911b3e08 Converting to structured logging the file app/analytics.go (#12171) 2019-09-12 17:58:16 +02:00
Nikhil Ranjan
b7a879b985 Converting to structured logging the file app/post.go (#12138) 2019-09-12 10:27:04 -05:00
Elias Nahum
794ae335b3 MM-17953 Set updateAt and remove from cache when a user is (de)activated (#12178) 2019-09-12 16:30:15 +02:00
Nikhil Ranjan
54c0e394f5 MM-18278 Converting to structured logging the file plugin/supe… (#12177) 2019-09-12 09:31:09 -04:00
Nikhil Ranjan
37d719d20c Converting to structured logging the file app/ratelimit.go (#12176) 2019-09-12 13:35:07 +02:00
Nikhil Ranjan
d327df12e6 MM-18264 Converting to structured logging the file app/emoji.go (#12139) 2019-09-11 22:49:27 -05:00
Elias Nahum
3618947094 MM-18066 Remove double @ for email notifications (#12131) 
* Remove double @ for email notifications

* Fix tests
 2019-09-11 17:30:35 -03:00
Nikhil Ranjan
be25dcd6f3 Converting to structured logging the file jobs/jobs.go (#12120) 2019-09-11 14:19:13 -04:00
Paulo Bittencourt
9c3fc4ab9f [MM-15220] Add generic error field to SubmitDialogResponse (#12081) 
This will allow integrations to return an generic error message that is
not tied to a specific dialog field.
 2019-09-11 11:35:51 -04:00
Theo Gkourasas
98489b9e67 MM-15219 Add support for introduction text in interactive dial… (#12029) 2019-09-11 11:31:51 -04:00
Nikhil Ranjan
a5f04802e8 MM-18266 Converting to structured logging the file app/web_con… (#12141) 2019-09-11 11:16:33 -04:00
Nikhil Ranjan
df85bd422f Converting to structured logging the file app/notification.go (#12140) 2019-09-11 07:52:12 -07:00
Lev
4677b50811 Updated mattermost-plugin-jira to v2.1.2 to fix a failed build (#12151) 2019-09-11 07:34:51 -07:00
Arjit Chaudhary
1076994773 Refactor "store/sqlstore/channel_member_history_store.go" to u… (#12059) 2019-09-11 07:33:47 -04:00
Nikhil Ranjan
3057116581 Converting to structured logging the file api4/websocket.go (#12118) 2019-09-11 07:33:31 -04:00
Hector
bf847ba184 MM-18290 Using structured logging in file "security_update_che… (#12123) 
* Refactor to use structured logging

* Properly formatted with gofmt
 2019-09-11 07:33:07 -04:00
Nikhil Ranjan
67f86b5a63 Converting to structured logging the file api4/system.go (#12119) 2019-09-11 07:06:52 -04:00
Claudio Costa
814c234443 [MM-18036] Sanitize sql LIKE terms on search endpoints (#12044) 
* Sanitize sql LIKE terms on search endpoints

* Add search term sanitization in additional places
 2019-09-11 10:56:12 +02:00
Nikhil Ranjan
8b969426f0 Converting to structured logging the file jobs/jobs_watcher.go (#12121) 2019-09-10 18:23:49 -04:00
sowmiyamuthuraman
63552416fb Fix unable to access 'https://git.apache.org/thrift.git/' (#12146) 2019-09-10 15:20:35 -04:00
jfrerich
1802c575e5 [MM-18119] Add methods for getting teams and count when query… (#12020) 
* Add methods to handle include_total_count api parameter when permissions
for authenticated user is not sysadmin

* Add translations for app errors

* Add Mocks

* Add tests for new methods

* When running at the TeamStore testing level, the number of returned
teams is different than running tests individually.  Fix for now and
submit help wanted do proper teardown after each test

* correct value when running test at the top level

* Add helper function to delete previous teams in db

* Instead of checking against numbers of teams returned, check against the
actual teams returned.
When creating test teams, use unique DisplaName values so the return
array will be sorted consistantly.
When testing private and public team counts, add teams that should not
be counted.  Also create odd number of public/private teams for better
error protections.  Don't want 1 of each type
 2019-09-10 11:50:27 -05:00
Lev
9e6c5e8ea6 MM-17489: fixed racy tryExecutePluginCommand (#11780) 
* MM-17489: fixed racy tryExecutePluginCommand

* PR feedback

* MM 7971 dockerhost -> localhost && docker -> docker-compose (#10872)

* replace dockerhost with localhost

* remove uneeded setup-max build step (no more dockerhost)

* changes as recommended by @cpanato

* make clean-docker with docker-compose

* added ports to docker-compose.yml (needed for osx).   ignore error for ldapadd (when already exists)

* add clean-old-docker to legacy.mk

* docker-compose stop instead of down for `make stop-docker`

* MM-17117: Updates einterface for FirstLoginSync. (#11737)

* update sampledata users passwords (#11769)

* update sampledata users passwords

* update makefile

* Tweak docker compose setup (#11785)

* fix stray dockerhost mention

* fix stray whitespace

* fix missing mattermost-redix cleanup in clean-old-docker

* absolute path to docker-compose, plus simpler ldap initialization

* allow ldapadd to fail on CI

* MM-16366 - Prevent attachment duplication on import (#11770)

* prevent attachment duplication

* improved tests

* corrected import into a new post

* WIP: a failed attempt to add tests

* remove debugging statements

* fix godoc

* enable plugins when testing

* rework reentrant unit tests
 2019-09-10 12:28:12 -04:00
Nikhil Ranjan
94eb3caa73 Converting to structured logging the file app/command_echo.go (#12144) 2019-09-10 14:08:29 +02:00
Nikhil Ranjan
2e76c4c0c7 MM-18261 Converting to structured logging the file app/team.go (#12136) 2019-09-10 06:25:16 -04:00
Jesús Espino
3c8665f510 Remove premature optimization that was generating a bad users isolation (#12128) 
* Remove premature optimization that was generating a bad users isolation

* fixing tests
 2019-09-10 11:45:08 +02:00
Nikhil Ranjan
9094aa7f97 Converting to structured logging the file store/sqlstore/supplier.go (#12089) 
* Converting to structured logging the file store/sqlstore/supplier.go

* removed unused : from comments
 2019-09-10 11:42:05 +02:00
Ben Schumacher
ae05429ffe Add empty circleci file (#12071) 
* Add empty circleci file
 2019-09-10 10:56:57 +02:00
Nikhil Ranjan
40b5db7637 Converting to structured logging the file store/sqlstore/session_store.go (#12088) 2019-09-10 10:39:55 +02:00
Claudio Costa
d2c3933c8e [MM-18033] Upgrade minio-go dependency (#12046) 
* Upgrade minio-go dependency

* Update go.mod and go.sum
 2019-09-10 09:43:51 +02:00
Nikhil Ranjan
f18895667d Converting to structured logging the file store/sqlstore/suppl… (#12090) 2019-09-10 09:40:55 +03:00
Nikhil Ranjan
7ff3439513 Converting to structured logging the file web/handlers.go (#12092) 2019-09-10 09:39:22 +03:00
Christopher Speller
3ea8db5dc6 Fix panic in jobs structured logging. (#12132) 2019-09-09 20:41:29 -04:00
sowmiyamuthuraman
45601bb6dc Fix. Replace t.fatal() calls to testify assert/require calls (#12084) 2019-09-09 20:10:17 +02:00
Nikhil Ranjan
ec803ada0a Converting to structured logging the file jobs/schedulers.go (#12122) 
* Converting to structured logging the file jobs/schedulers.go

* merge mlog warn and error in single error
 2019-09-09 18:53:33 +02:00
Phillip Ahereza
8a27ec5749 [MM-18323] Migrate tests from "app/authorization_test.go" to use testify (#12078) 
* updated test case to use testify

* change test from require to assert

* Update app/authorization_test.go

Co-Authored-By: Jesús Espino <jespinog@gmail.com>
 2019-09-09 13:43:17 +02:00
Rajat Varyani
2b18ebe2cf [MM-18319] Replace t.Fatal with assert.Equal (#12082) 2019-09-09 13:32:30 +02:00
scott lee davis
98f7bdcb43 MM-14827 don't kill STDOUT for the server process (#10828) 2019-09-06 19:08:39 +02:00
Joram Wilander
50e97bd9d3 MM-18081 Except bots from team email domain restrictions (#12041) 
* Except bots from team email domain restrictions

* Fix style
 2019-09-06 10:55:55 -04:00
Arshdeep Singh Chimni
adb1a98760 Convert tests in "app/plugin_hooks_test.go" to use assert/require (#12061) 
* change t.Ftal to require

* remove t.errorf

* fix build error

* adjust for custom error

* fix TestUserWillLogIn_Blocked

* address pr comments
 2019-09-06 13:24:38 +02:00
Miguel de la Cruz
1a9a2b1430 [MM-17219] Return an empty list instead of null when no teams (#11904) 2019-09-06 13:12:32 +02:00
Jesús Espino
2719c781ed Convert app/webhooks_test.go t.Fatal calls into assert/require calls (#12039) 
* Convert app/webhooks_test.go t.Fatal calls into assert/require calls

* simplified by repetition

* Addressing PR review comments
 2019-09-06 12:52:51 +02:00
threepwood-mm
f9d9dd8b60 [MM-14521] New endpoint to validate site urls (#11944) 2019-09-06 12:52:14 +02:00
Jesse Hallam
451982f9d3 improved OnDeactivate handling (#11988) 
* Deactivate plugins in parallel to improve shutdown time
* Give plugins at most 10s to handle OnDeactivate before forcefully terminating
 2019-09-05 17:27:36 -03:00
Michael Kochell
9d937e7f1d bump jira plugin version to 2.1.1 (#12045) 2019-09-05 10:46:10 -07:00
Jesús Espino
08d3f3219d Converting to structured logging the file services/mailservice/mail.go (#12038) 
* Converting to structured logging the file services/mailservice/mail.go

* Using snake_case instead of CamelCase

* Addressing PR review comments
 2019-09-05 17:20:58 +02:00