upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-04-23 07:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
6520 commits 1315 branches 1507 tags 2.1 GiB
Commit graph

814 commits

Author SHA1 Message Date
Joram Wilander
68c2b070da Auto join teams if coming from team sign-up page to login for GitLab (#3284) 2016-06-07 17:43:06 -04:00
Joram Wilander
c0d1b8fbb9 System messages trigger notifications when user is mentioned (#3235) 2016-06-06 14:29:10 -04:00
Joram Wilander
1e245f19c7 PLT-3114 Moved preview collapse out of pre-release features (#3206) 
* Added user setting to auto collapse image previews

* Added slash commands for collapsing/expanding image previews

* Added translation strings for collapse setting

* Add default props for preview collapse setting
 2016-06-06 10:41:54 -07:00
Harrison Healey
384d0eb245 PLT-2559 Always return successful when trying to join a channel that the user is already a member of (#3265) 
* Added unit tests for SqlChannelStore.GetMember

* Fixed api routes for accessing channels by name when the name includes an underscore

* Changed join channel API to always return successful when the user is already a member of the channel
 2016-06-06 13:03:56 -04:00
enahum
6cee1f87f2 PLT-2990 Clicking on a desktop notification from another team opens the team (#3253) 2016-06-06 09:46:09 -04:00
enahum
6ab893dcba PLT-2939 Fix Default slash command icon is invalid (#3250) 2016-06-06 08:59:19 -04:00
Christopher Speller
919eea73b6 LDAP users should not be subject to password guess limits or email verification (#3245) 2016-06-05 03:38:36 -03:00
David Lu
f3825ba766 PLT-2994 Added @all (#3233) 
* Added @all

* Uncomment @all server side
 2016-06-04 14:21:50 -04:00
Joram Wilander
971149d2b2 Don't allow users to be added to a channel they are not in the team of (#3246) 2016-06-04 10:52:25 -04:00
Christopher Speller
ea3342aa6c Adding LDAP Syncronization (#3219) 2016-06-03 09:33:59 -04:00
Joram Wilander
8165f5d91f PLT-3131 Add slash command for sending email invites (#3218) 
* Add slash command for sending email invites

* Add response for empty message and trim commas

* Check for @ in email addresses before sending

* Update invite people error message
 2016-06-02 19:39:23 -03:00
enahum
159953050a PLT-1800 Load server side locale from the config.json (#3202) 
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text

* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency

* Fix get locale on login_controller
 2016-06-02 12:47:26 -07:00
Joram Wilander
0788e83647 Close HTTP response bodies properly in golang driver (and some api functions) (#3217) 2016-06-02 12:40:34 -07:00
Joram Wilander
3ce6dfc71e Allow system admins to update and delete channels (#3161) 2016-06-01 13:04:06 -07:00
Christopher Speller
786e4dce7d Revert "PLT-1800 Load server side locale from the config.json" (#3201) 2016-06-01 11:56:27 -04:00
enahum
b00a60ab71 PLT-1800 Load server side locale from the config.json (#3135) 
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text

* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency
 2016-06-01 08:56:13 -04:00
Joram Wilander
8563fbc41e Add a wait condition in outgoing webhook test to prevent race condition (#3177) 2016-05-31 12:56:15 -04:00
Thomas Balthazar
c226cabc04 PLT-2170 Send payload in application/json for outgoing webhooks (#3160) 
* Send payload in application/json for outgoing webhooks

The Add outgoing webhook UI now has a 'Content-Type' field that allows
to choose between application/x-www-form-urlencoded and
application/json. All outgoing webhooks created before this change will
be considered as x-www-form-urlencoded. There's also a minor change in
the way the outgoing webhook summary is displayed: the 'Callback URLs'
label was missing.

* Fix JS formatting errors

* Increase ContentType field length to 128
 2016-05-31 10:51:28 -04:00
Joram Wilander
8f984771ae Send websocket event for system message posts (#3162) 2016-05-31 10:45:45 -04:00
Khoa Lê
397e0a3f68 PLT-2061 Include FULL PATH in logs when referring to a directory (#3170) 2016-05-31 10:35:08 -04:00
Joram Wilander
d2aacdbb07 Don't allow gitlab users to activate mfa (#3125) 2016-05-27 08:36:53 -07:00
David Lu
0d0734ac98 Added duplicated trigger validation (#3124) 2016-05-27 08:35:55 -07:00
Christopher Speller
ec7a273550 Revert "PLT-1800 Load server side locale from the config.json" (#3133) 2016-05-27 09:01:35 -04:00
enahum
a2c183f401 PLT-1800 Load server side locale from the config.json (#3092) 
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text
 2016-05-27 08:25:37 -04:00
Thomas Balthazar
934ff34ccb Send Post ID in webhooks (#3120) 2016-05-26 11:37:54 -04:00
David Lu
6bd9996daf Made message command for all users (#3122) 2016-05-26 10:03:06 -04:00
Corey Hulen
56cca6be7c PLT-2976 Adding checkout for missing SMTP server when testing email connection (#3115) 
* PLT-2976 Adding checkout for missing SMTP server when testing email connection

* Fixing unit test
 2016-05-26 07:55:37 -04:00
rompic
20302c6953 fixed type speical -> special (#3052) 2016-05-25 08:19:54 -04:00
Corey Hulen
09863c0b80 Adding APIs to reload config, recycle db connections and ping server (#3096) 
* Adding APIs to reload config, recycle db connections and ping server

* Fixing unit test

* Adding unit tests
 2016-05-24 14:31:30 -07:00
Christopher Speller
4ae7128ecb Revert "PLT-1800 Load server side locale from the config.json (#3076)" 
This reverts commit 34beaa569b.
 2016-05-24 10:39:56 -04:00
Thomas Balthazar
7e2b539de4 Max_File_Size setting in System Console > File Settings (#3070) 2016-05-24 09:07:42 -04:00
David Lu
8e5c318590 Removed isTestDomain (#3069) 2016-05-24 08:39:11 -04:00
enahum
34beaa569b PLT-1800 Load server side locale from the config.json (#3076) 
* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics
 2016-05-24 08:36:27 -04:00
David Lu
981a08e80e Fixed double join messages (#3059) 2016-05-20 09:14:18 -04:00
Joram Wilander
1492d1a3cb PLT-2664 Split out push notifications from email notifications (#3049) 
* Split out push and email notification logic, always send push notifications on mention

* Add user setting to control push notifications

* Minor changeto simplify code
 2016-05-19 14:33:04 -04:00
David Lu
5ace856e72 Added /shortcuts (#3048) 
Added message and tests

Remember that lower vs uppercase matters

Accidentally removed \n

Added more

Formatted
 2016-05-19 07:35:12 -04:00
Thomas Balthazar
55f6a0b21c Move away from the "andForget" style of function (#3046) 
This is the second and last part of the refactoring.
First part is documented here:
https://github.com/mattermost/platform/pull/3043
 2016-05-18 16:34:31 -04:00
Thomas Balthazar
d48be63513 Move away from the "andForget" style of function (#3043) 
As suggested by @crspeller here:
https://github.com/mattermost/platform/pull/3022#issuecomment-220004020
 2016-05-18 11:14:55 -04:00
Thomas Balthazar
99b8eef7e3 Send email notification when username changed (#3022) 2016-05-18 07:54:33 -04:00
Christopher Speller
edd453c6cd Merge branch 'release-3.0' 2016-05-17 17:51:42 -04:00
=Corey Hulen
ac509b114d Fixing websocket connection 2016-05-17 13:55:51 -07:00
Harrison Healey
d2b556aa77 Removed check of email signup from creating a team (#3029) 2016-05-17 15:52:03 -04:00
Harrison Healey
0fe75cb782 PLT-1909 Removed the ability to edit system posts (#3013) 
* Removed the ability to edit system posts

* Added increased timeout to SpinnerButton unit tests
 2016-05-17 12:27:03 -04:00
Thomas Balthazar
5580c28e54 PLT-2188 Integrations: Support raw new lines in the text payload (#2993) 
* Integrations: Support raw new lines in the text payload

* Improve support for raw new lines in text payload

The regexp used to escape control characters now also searches for
additional fields:
text|fallback|pretext|author_name|title|value
 2016-05-17 08:56:38 -04:00
Joram Wilander
1f609e9cf7 Check team member instead of session for team admin role when updating/deleting channels (#3007) 2016-05-16 12:55:22 -04:00
Christopher Speller
dcba917d60 Merge branch 'release-3.0' 2016-05-16 07:54:38 -04:00
Christopher Speller
38ee83e45b Moving to glide 2016-05-12 23:56:07 -04:00
Corey Hulen
9d94869cc6 Fixing issue with missing user (#2989) 2016-05-12 18:36:30 -07:00
Joram Wilander
e46c1b8d52 Inlcude team Id for fake context for incoming webhooks (#2988) 2016-05-12 18:36:15 -07:00
Harrison Healey
4f22cbc92b Stopped login code from falling back to LDAP when it's disabled (#2986) 2016-05-12 18:36:02 -07:00