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,302 Commits 845 Branches 1,202 Tags
08b7b1c4144f18a9dbf52bfe0eb9182f2b4eba4a
Commit Graph

1318 Commits

Author SHA1 Message Date
Chris
08b7b1c414 Reduce cfg boilerplate (#7689) 
* reduce cfg boilerplate

* fix compile error

* user test fix

* another test fix

* simplify diagnostics / testing
 2017-10-23 02:39:51 -07:00
Saturnino Abril
18ee375860 [PLT-7362] Option to add user to channel if mentioned user is not currently in the channel (#7619) 
* Option to add user to channel if mentioned user is not currently in the channel

* instead of link from server, just add component on client side to add channel member

* change implementation using post.props

* do clean up and add test

* sanitize post.props['add_channel_member'] on post creation

* move sanitize to app.CreatePost and also apply to app.UpdatePost
 2017-10-21 01:38:26 +08:00
Chris
8e19ba029f Reduce utils.Cfg references (#7650) 
* app.UpdateConfig method

* test fix

* another test fix

* the config override option as-was is just error prone, remove it for now

* derp
 2017-10-18 15:36:43 -07:00
Chris
0a508133d5 fix email race condition (#7656) 2017-10-18 14:13:14 -07:00
Christopher Brown
39cc237269 Merge branch 'release-4.3' 2017-10-16 23:10:45 -05:00
Chris
34285d8cca parallel tests (#7629) 2017-10-16 11:09:43 -04:00
Chris
917e4789c2 Use tmpfs containers for api/api4 tests, move and speed up CLI tests (#7606) 
* use tmpfs containers for api/api4, move and speed up cli tests

* minor optimizations

* add missing files, fix pre-existing race condition

* add . to TestMain check

* add requested log message
 2017-10-12 12:24:54 -07:00
Chris
aa2b82727f fix race condition in tests (#7609) 2017-10-11 12:16:04 -07:00
Chris
bff2b5e735 Miscellaneous app cleanup (#7594) 
* app cleanup

* whoops, forgot a file

* some minor cleanup

* longer container deadline

* defensive checks
 2017-10-09 14:59:48 -07:00
Harrison Healey
e522a1c2e4 PLT-7811 Standardized team sanitization flow (#7586) 
* post-4.3 commit (#7581)

* reduce store boiler plate (#7585)

* fix GetPostsByIds error (#7591)

* PLT-7811 Standardized team sanitization flow

* Fixed TestGetAllTeamListings

* Stopped sanitizing teams for team admins

* Removed debug logging

* Added TearDown to sanitization tests that needed it
 2017-10-09 10:30:59 -07:00
Joram Wilander
9adaf53e11 PLT-7818 Updates to post type (#7579) 
* Updates to post type

* Update tests
 2017-10-09 10:30:48 -07:00
Chris
07777f5ff9 Fix races / finally remove global app for good (#7570) 
* finally remove global app for good

* test compilation fixes

* fix races

* fix deadlock

* wake up write pump so it doesn't take forever to clean up
 2017-10-04 13:09:41 -07:00
Joram Wilander
fadd9514f6 PLT-7718 Patch for files (#7564) 
* Patch for files

* Fix merge

* Fix tests

* Fix another test
 2017-10-04 11:42:38 -04:00
Joram Wilander
f94b807f39 PLT-7782 Fix for OAuth (#7566) 
* Fix for oauth

* Fix test
 2017-10-04 11:05:36 -04:00
Chris
5e69ce099f Goroutine wranglin (#7556) 
* goroutine wranglin

* synchronize WebConn.WritePump
 2017-10-03 10:53:53 -05:00
Chris
9bc7af0c57 Don't use global app for api / api4 tests (#7528) 
* don't use global app for api / api4 tests

* put sleep back. we're gonna have to do some goroutine wrangling

* fix oauth test config assumptions

* jobs package, i'm comin' for you next

* app test fix

* try increasing sleep a little
 2017-10-02 09:50:56 +01:00
Joram Wilander
8b9dbb8613 PLT-7404 Return viewed at times in view channel API response (#7428) 
* Return viewed at times in view channel API response

* Updated transaction to read and write once

* Remove transaction and only update if new value greater than older
 2017-09-29 08:45:59 -07:00
Joram Wilander
f263d2b951 PLT-7684 Add support to outgoing webhooks and slash commands to set post type and props (#7531) 
* Add support to outgoing webhooks and slash commands to set post type and props

* Fix nil access
 2017-09-28 09:08:16 -07:00
Chris
8c80cdde38 remove remaining Global() calls (outside of tests) (#7521) 2017-09-28 00:52:34 +08:00
George Goldberg
e8ca3d64f4 PLT-7470: Add metrics for searches. (#7507) 2017-09-25 13:44:44 -07:00
Chris
49fe5fbf3d Move sql store code into store/sqlstore package (#7502) 
* move sql store code into store/sqlstore package

* move non-sql constants back up to store

* fix api test

* derp
 2017-09-25 10:11:25 -04:00
Chris
dcf9e96a0b remove global refs from api/api4 (#7496) 2017-09-22 13:54:27 -04:00
Chris
266ff86702 remove more global refs (#7480) 2017-09-21 10:13:34 +01:00
Chris
ac74066f0e remove einterface gets (#7455) 2017-09-19 18:31:35 -05:00
Corey Hulen
99b7d65504 Fixing profile image tag (#7435) 
* Fixing profile image tag

* Fixing unit test

* Fixing unit test
 2017-09-19 16:34:39 -04:00
Saturnino Abril
0643bf5159 generate web error when opening an invalid public file link (#7475) 2017-09-19 08:58:20 -04:00
George Goldberg
fd878bd50c PLT-7539: Remove redundant license checks from CLI commands. (#7451) 2017-09-15 09:40:37 -07:00
Joram Wilander
ed1363e1bf Fix update SQL query to include refresh token (#7425) 2017-09-14 11:48:48 -04:00
Chris
4731b8f9b9 fix plugin test (#7436) 
* fix plugin test

* ugh. global state

* Fix plugin test

* Fix TestDeleteChannel

* Remove plugin config listener when shutting down
 2017-09-12 15:12:29 -04:00
Chris
b066b6df13 Remove global app references (#7433) 
* remove global app references

* test fix

* fix api4 test compilation
 2017-09-12 09:19:52 -05:00
Christopher Speller
c357949856 Disabling oauth test 2017-09-07 01:02:19 -07:00
Christopher Speller
f9664a1e8a Adjustments to Jenkinsfile 2017-09-07 00:19:48 -07:00
Christopher Speller
29fca51821 Renaming repo 2017-09-06 23:11:59 -07:00
Christopher Speller
7bc8e9a08d Adding jenkinsfile for new build server. 2017-09-06 23:11:58 -07:00
Christopher Speller
77709ccdda Merge release-4.2 2017-09-06 20:43:18 -07:00
Chris
1adfd0e9be app type transition (#7167) 2017-09-06 17:12:54 -05:00
JoramWilander
d38328976e Various patches 2017-09-06 16:24:34 -04:00
Saturnino Abril
f968c56890 Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387) 
This reverts commit 8d680cf64e.

Move to 4.3.
Will discuss more if validation is necessary.
 2017-09-06 11:02:42 -05:00
Saturnino Abril
8d680cf64e [PLT-7475] Add S3 region to system console and add S3 validation (#7373) 
* add S3 region to system console and add S3 validation

* update translation message

* add bool as return value to Validate* functions

* update Validate* functions to be pure
 2017-09-06 03:42:18 +08:00
George Goldberg
75c63344de Api: NewLocAppError -> NewAppError (#7280) 2017-09-01 09:58:43 -04:00
David Meza
3c52801193 Config to make town square read only (#7140) 
* Be able to make Town Square read-only (Disable typing messages for non admins).

* Do not emit UserTypingEvent when TownSquareIsReadOnly and is Town Square.

* Add unit tests for TownSquareIsReadOnly config value and logic.

* Add TownSquareIsReadOnly to System console>Policy. Added Telemetry.

* Add control for TownSquareIsReadOnly=true only for License Enterprise Edition E10 & E20.

* Update en.json

* Update en.json

* Update policy_settings.jsx

* Change config value from TownSquareIsReadOnly to ExperimentalTownSquareIsReadOnly.

* Refactored to simplify. Avoid code repeat and multiple db calls.
 2017-09-01 09:53:55 -04:00
Saturnino Abril
f34cd567a6 [PLT-5170] Add join the channel system message for the person who created the channel (#7299) 
* add join the channel system message for the person who created the channel

* update test
 2017-08-30 16:29:32 -04:00
Saturnino Abril
651dd33b29 set to default value with config is missing (#7320) 2017-08-30 13:54:16 -04:00
Corey Hulen
1709b94227 PLT-5745 Cleaning up duplicate calls (#7298) 
* PLT-5745 Cleaning up duplicate calls

* Fixing missing calls

* Fixing broken test
 2017-08-28 10:08:37 -04:00
George Goldberg
50fc6e1e9e PLT-???? Prepare file upload infrastructure for Data Retention. (#7266) 
* Prepare file upload infrastructure for Data Retention.

This commit prepares the file upload infrastructure for the data
retention feature that is under construction. Changes are:

* Move file management code to utils to allow access to it from jobs.

* From now on, store all file uploads in a top level folder which is the
  date of the day on which they were uploaded.

This commit is based on Harrison Healey's branch, but updated to work
with the latest master.

* Use NewAppError
 2017-08-25 10:38:13 -04:00
Joram Wilander
e40fd0b3b5 Remove temporary cookie code (#7218) 2017-08-18 12:09:01 -07: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
fd1301779f Merge branch 'release-4.1' 2017-08-17 09:35:36 -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
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