Commit Graph

10066 Commits

Author SHA1 Message Date
Carlos Tadeu Panato Junior
7c855c30db Uncomment upgrade for 5.1.0 (#9040) v5.1.0-rc1 2018-07-03 18:15:15 +02:00
George Goldberg
0e17babdd3 Make sure diagnostic ID is loaded before client config. (#9032) 2018-07-03 17:54:59 +02:00
Jesús Espino
c66b567a1d Adding RootId information to MessageExport (#9030) 2018-07-03 16:33:10 +02:00
Elias Nahum
e5703ce2a0 translations PR 20180702 (#9038) 2018-07-03 16:19:14 +02:00
Jason Blais
8821fee6c2 Disable Gfycat by default during Beta and move default keys to server (#9027)
* Update default.json

* Update diagnostics.go

* Added default Gfycat API credentials to server

* Fixed default Gfycat credentials
2018-07-03 11:26:08 +02:00
George Goldberg
4ccb8b7cff Add note on 5.0->4.10 downgrade in upgrade.go (#9029) 2018-07-02 11:03:00 +01:00
Joram Wilander
2362a5b7f7 Ignore | characters in postgres channel search (#9019) 2018-06-30 00:13:13 +02:00
Jesse Hallam
4245797cb2 redirect, vs. proxy, 80->443 without LE enabled (#9020)
The code incorrectly got refactored to proxy instead of forward, deviating from the behaviour when LE is enabled.
2018-06-29 17:17:35 -04:00
George Goldberg
c371ae4db1 Make import compatible with scheme-roles. (#9028)
This doesn't introduce new fields as we would then break backwards
compatability with old "roles" fields. We can add custom fields if/when
we go to "version 2" of the bulk import format.
2018-06-29 17:50:06 +02:00
Martin Kraft
56ba06c016 MM-10980: Conditionally filteres User json properties. (#9018) 2018-06-29 08:45:04 -04:00
George Goldberg
e51ae39766 Fix a really rare race condition in the migration scheduler. (#9000) 2018-06-29 09:27:06 +01:00
Jesse Hallam
912b140cc5 remove redundant checks in build.mk (#9015) 2018-06-29 10:15:01 +02:00
Jesse Hallam
57bf7203f3 subpath: rewrite manifest.json too (#9017) 2018-06-29 03:27:42 +05:30
Jerry Kurian
4b2a626354 add MaxLifetimeconns to server (#9004)
Update e.json string names and remove console log

reorder variables

update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns

Add MaxLifetimeConns to test

Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds

Update time passed to SetConnMaxLifetime

Revert "Update time passed to SetConnMaxLifetime"

This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f.

update en.json

Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000
2018-06-28 09:45:20 -04:00
Jesús Espino
66dc9a5206 Add english missed texts to i18n/en.json (#8987)
* Add English missed texts to i18n/en.json
* Update en.json
2018-06-28 17:12:38 +05:30
Joram Wilander
2114e96f00 Reset status to away after web conn disconnect if necessary (#8988) 2018-06-27 14:19:06 -07:00
Kenny Au
437f9f5b64 Gfycat integration (#8971)
* Gfycat integration

* Added gfycat api credentials to config.
2018-06-27 15:35:15 -04:00
Sudheer
9abd74c5e3 MM-10910 fix join and open channel commands to work with tilde (#8984)
* MM-10910 fix join and open channel commands to work with tilde

* Fix lint

* Add basic tests for command_join
2018-06-27 15:08:58 +02:00
Elias Nahum
1e6994a2ab translations PR 20180625 (#8998) 2018-06-27 06:58:46 -04:00
Joram Wilander
0d91bf323e Lock bulk importing to master database node (#9012) 2018-06-27 10:08:40 +01:00
Emil Velikov
f17c15c9d8 Simplify oauth (#8972)
* Remove unused OauthProvider::GetIdentifier

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

* Reuse gitlab's getAuthData() instead of open-coding it

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

* Remove OauthProvider::GetAuthDataFromJson interface

The data is already available via GetUserFromJson().AuthData

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2018-06-26 17:23:13 -07:00
Jesús Espino
85aa3d664c MM-11034: Reply properly to incomming webhooks on errors (#9010) 2018-06-26 17:04:06 -04:00
Jesse Hallam
2d7cd02abc MM-10833: send down computed channel props (#8953)
* MM-10833: send down computed channel props

This allows channel headers to reference channel mentions for a client
that doesn't already know about the channels in question.

We intentionally don't send down the props for the autocomplete and
search endpoints since they aren't used in that context, and would add
unnecessary overhead.

* update channel props on patch

* revert to treating channel purpose as plaintext
2018-06-26 16:46:57 -04:00
Jesús Espino
164e030d33 MM-11008: Fix translation and change the code to be auto-extracted (#9009) 2018-06-26 16:06:01 -04:00
Chris Duarte
41d2a9f435 Add Purpose as a searchable field (#8067)
* Add Purpose as a searchable field

* Add New Index and Remove old for Channels

* Include Purpose in FullTextSearch Clause

* Move removeIndex for Channels into upgrade.go
2018-06-26 13:47:39 -04:00
Jason Blais
3e9fe291f1 Update diagnostics.go (#8989) 2018-06-26 13:47:07 -04:00
Joram Wilander
cbf9571c68 MM-10700 - Updating default image preview size (#9002) (#9003) 2018-06-26 13:40:39 -04:00
George Goldberg
60359b4bae MM-10269: Make jobserver work without restart. (#9005) 2018-06-26 13:30:33 -04:00
Daniel Schalla
ecefa6cdd1 Implementation of File Exists Function; Delete FileInfos upon Permanent User Delete (#8958)
Check if file was deleted on FS

Warning message if file couldnt be removed
2018-06-25 12:12:59 -04:00
George Goldberg
fc158fce90 MM-10570: Make permissions reset command clear custom role assignments. (#8976) 2018-06-25 14:34:59 +01:00
Joram Wilander
1c194e5fbd Fix plugins serving after subpath changes (#8982) 2018-06-22 22:09:31 -04:00
George Goldberg
454522cc30 MM-8716: Security Update Check URL should have recognisable name. (#8983) 2018-06-22 10:14:33 -07:00
Jesús Espino
d9390244af MM-8810: Add CSV Compliance export (#8966)
* MM-8810: Add CSV Compliance export

* Only allowing to schedule actiances export throught the cli

* De-duplicating some code

* Fixes on texts

* Fixes on translations
2018-06-22 11:15:19 +02:00
Christopher Speller
8526739066 MM-10934 Update server dependencies. (#8981)
* Changing throttled import path.

* Upgrading dependencies.
2018-06-21 16:10:40 -04:00
Jesús Espino
a59ccaa8b3 Using i18n extract to generate the i18n/en.json file (#8980)
* Sort translations

* Added untranslated and removed unussed strings
2018-06-21 14:58:36 -04:00
Jesse Hallam
dd35ad43ca MM-10370: serve subpath (#8968)
* factor out GetSubpathFromConfig

* mv web/subpath.go to utils/subpath.go

* serve up web, api and ws on /subpath if configured

* pass config to utils.RenderWeb(App)?Error

This allows the methods to extract the configured subpath and redirect
to the appropriate `/subpath/error` handler.

* ensure GetSubpathFromConfig returns trailing slashes deterministically

* fix error 404 handling

* redirect /subpath to /subpath/

This is necessary for the static handler to match, otherwise none of the
registered routes find anything. This also makes it no longer necessary
to add trailing slashes in the root router.
2018-06-21 11:31:51 -07:00
Joram Wilander
46f969e5dd MM-10425 Include active_channel in cluster update user status messages (#8967)
* Include active_channel in cluster update user status messages

* Update to use new ToJson method

* Update tests
2018-06-21 10:42:20 -07:00
Alex Goodman
d36ad6cb54 Fixing mentionBg typo in import_test.go (#8970) 2018-06-21 13:28:25 -04:00
Elias Nahum
4f2bbc3448 Add back the ability to reply to push notifications in iOS (#8977) 2018-06-21 11:10:29 -04:00
Carlos Tadeu Panato Junior
0d741301a3 fix typo in en.json and remove trailing spaces (#8975) 2018-06-21 16:50:35 +02:00
Harrison Healey
07c785e294 MM-10730 Added support for empty environment variables to viper (#8973) 2018-06-21 16:30:20 +02:00
George Goldberg
1f65f0e3d6 MM-10233: Add scheme importing to bulk importer. (#8928) 2018-06-21 12:02:35 +01:00
Elias Nahum
8e24dd78fb translations PR 20180619 (#8963) 2018-06-20 08:19:57 -04:00
Jesús Espino
344836dfb2 Add missed translations (#8959) 2018-06-19 19:40:26 +02:00
Harrison Healey
226d4b2ac8 MM-6992 Added highlighting to elasticsearch results (#8861)
* MM-6992 Added highlighting to elasticsearch results

* Added a unique type for post search matches

* Fixed Elasticsearch matches not being sent through API
2018-06-19 11:46:29 +02:00
Harrison Healey
6d8140337e MM-8701 Limit the number of client config fields sent before user logs in (#8954)
* MM-8701 Limit the number of client config fields sent before user logs in

* Fixed missing client config field

* Reduced duplication between limited and regular client config
2018-06-18 12:39:22 -04:00
Jesús Espino
f48d31c7a4 Small translation fixes (#8940) 2018-06-16 09:35:24 +02:00
cpanato
e38b18565e Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180615 2018-06-15 17:38:08 +02:00
Carlos Tadeu Panato Junior
c8b99b97df Update html2text lib to use the original repo (#8900) 2018-06-14 19:27:21 +02:00
Joram Wilander
85a75526c7 Add more oauth logging and note about GitLab ToS for login (#8949) v5.0.1 v5.0.0 v5.0.0-rc7 v5.0.0-rc6 v5.0.1-rc1 2018-06-14 19:27:00 +02:00