upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-04-20 21:57:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
6370 commits 1320 branches 1501 tags 2 GiB
Commit graph

784 commits

Author SHA1 Message Date
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
Christopher Speller
d1efb66ad7 Merge branch 'release-3.0' 2016-05-12 12:11:02 -04:00
Harrison Healey
6631f28d92 Improved handling of edge case where an LDAP user shares a username with a non-LDAP user (#2980) 2016-05-12 12:06:26 -04:00
thoemy
04dfa2a9eb Improve incoming webhook slack compatibility (#2972) (#2973) 
By checking for form urlencoded content instead of JSON, requests without
or with a wrong Content-Type header and a JSON body are correctly parsed.
 2016-05-12 12:04:59 -04:00
thoemy
97450762db Fix parsing attachment field links into markdown (#2958) (#2959) 
Field contents are stored in 'value' not 'text'.
 2016-05-12 12:04:12 -04:00
thoemy
3f0325fd22 Fix parsing attachment field links into markdown (#2958) (#2959) 
Field contents are stored in 'value' not 'text'.
 2016-05-12 08:30:44 -04:00
thoemy
b4adf77693 Improve incoming webhook slack compatibility (#2972) (#2973) 
By checking for form urlencoded content instead of JSON, requests without
or with a wrong Content-Type header and a JSON body are correctly parsed.
 2016-05-12 07:44:44 -04:00
Corey Hulen
3928535456 PLT-2905 fixing upgrade of SSO accounts (#2962) 
* PLT-2905 fixing upgrade of SSO accounts

* Fixing multiple Auths mapped to different emails
 2016-05-11 14:04:30 -04:00
Christopher Speller
e1388877ad Merge branch 'release-3.0' 2016-05-11 11:53:04 -04:00
Corey Hulen
d7197943f0 Fixing compliance reporting (#2964) 2016-05-11 09:24:20 -03:00
Christopher Speller
720222f3a6 Removing export route (#2955) 2016-05-11 08:04:01 -04:00
Corey Hulen
c8285185a9 PLT-2806 sending websocket when adding user to team (#2953) 
* PLT-2806 sending websocket when adding user to team

* Fixing config file
 2016-05-10 12:54:11 -04:00
enahum
45b22f312d PLT-2674 Private Group should not have Leave option when only one member remains (#2888) 2016-05-10 08:24:52 -04:00
Harrison Healey
ff72a126d3 PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937) 
* Added ldap_only parameter for login API

* Re-added LDAP login boxes as part of signup flow
 2016-05-09 15:56:50 -04:00
Joram Wilander
07126101d3 Recent mention searches now OR terms instead of AND (#2931) 2016-05-09 09:00:08 -07:00
Harrison Healey
e1cae3b15b PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON string (#2914) 
* Removed unused channelId and userId parameters from web client getPublicLink method

* Changed getPublicLink api call to return a proper JSON string
 2016-05-06 11:32:08 -07:00
Corey Hulen
6c75662b82 PLT-2697 Fixing team admins (#2900) 
* PLT-2697 Fixing team admins

* Fixing eslint error

* Fixing loc issues

* Fixing func

* Fixing func
 2016-05-06 14:28:22 -04:00
Joram Wilander
0cfcf5c5de Add separator between DMs on your team and not (#2910) 2016-05-06 12:08:58 -04:00
Christopher Speller
d2f9fd52fe Fixing /logout command (#2908) 2016-05-06 12:08:49 -04:00
Joram Wilander
d75cb02948 Multiple cross-team functionality fixes (#2902) 2016-05-06 08:06:34 -04:00
Joram Wilander
f2e788f4b1 Allow system admins to switch user accounts to email/password (#2893) 2016-05-05 16:36:42 -04:00
Harrison Healey
d2ddf40f56 PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public file links (#2892) 
* Switched public file links to use a GetLinkModal

* Separated getFile and the new getPublicFile api calls
 2016-05-05 16:35:03 -04:00
Corey Hulen
6611229cd7 PLT-2707 Adding option to show DM list from all of server (#2871) 
* PLT-2707 Adding option to show DM list from all of server

* Fixing loc
 2016-05-04 09:31:42 -04:00
Joram Wilander
b18cf58c8f Sanitize sensitive data of out config file for the system console (#2849) 2016-05-03 14:45:36 -04:00
Harrison Healey
87989b8afd PLT-2258 Unified login screen and related APIs (#2820) 
* Unified login screen and related APIs

* Refactored login API call to be less convoluted

* Removed LDAP login prompt from invite process

* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled

* Gofmt

* Future proofed login API

* Updated login APIs based on feedback

* Added additional auditing to login API

* Actually removed loginById
 2016-05-03 14:10:36 -04:00
Arif Usman
e76a30bca0 Fixed typo (#2862) 2016-05-03 13:07:49 -04:00
David Lu
e4b744362b Added query escaping to emails (#2867) 2016-05-03 13:06:43 -04:00
Joram Wilander
08a3cf6b38 Port HPNS from 2.2 to master (#2863) 2016-05-03 08:54:49 -07:00
Christopher Speller
f8ed606a5f Fixing edit direct channel header (#2842) 2016-05-02 12:57:32 -04:00
=Corey Hulen
f31108b7c4 Fixing cookie 2016-04-28 17:14:19 -07:00
=Corey Hulen
62901defae Merge branch 'master' of https://github.com/mattermost/platform 2016-04-28 17:03:59 -07:00