Граф коммитов

1159 Коммитов

Автор SHA1 Сообщение Дата
Harrison Healey
a0cc913b85 PLT-3143 Added serverside code for custom Emoji (#3311)
* Added model objects for emoji

* Added database tables for emoji

* Added settings for custom emoji

* Added serverside APIs and unit tests for custom emoji

* Added additional validation to catch duplicate emoji names earlier on

* Added additional validation to prevent users from adding emoji as another user
2016-06-14 07:38:19 -06:00
JoramWilander
5af526c259 Merge branch 'release-3.1'
Conflicts:
	webapp/components/create_comment.jsx
2016-06-13 15:29:24 -04:00
Martin Schenck
24a2805456 PLT-2058 Debugging incoming web hook content (#3150)
* PLT-2058 Debugging incoming web hook content

This change debugs contents of incoming webhooks using l4g.

The problem is that in order to debug the request body, it neads to be
read. And a Reader can only be read once. Hence, the body is only read
for Debugging if it is actually enabled. Furthermore, a new reader is
created from the content of the old reader in order for the rest of the
method to work as usual (with or without debugging).

The debug statement is wrapped in a closure, so that the content is
only copied if Debug is actually enabled.

It is not possible to return `(string, string)` from the closure to
`l4g.Debug()`. That is the reason the debugging is not done with `=%v`,
but the translations strings end with a space.

I tested the change with a `application/json` HTTP header as well as
`payload=`

The debug method is extracted into util/log.go in order to be re-usable
for debugging `io.Reader`

* Added a config flag to turn off incoming webhook debugging

Setting `EnableWebhookDebugging` to false in the `config.json` will
disable the printing of the content of incoming webhooks to the console

* Defaulting webhook debugging to true

* Added the setting of debugging incoming webhooks to the system console
2016-06-10 09:59:24 -04:00
Joram Wilander
f34a820a22 Correctly set defaults for all LDAPSettings in the config (#3301) 2016-06-09 12:08:02 -04:00
Harrison Healey
ce5f3aeee1 Changed default LocalizationSettings.AvailableLocales to include all locales (#3280) 2016-06-07 17:43:46 -04:00
Mattermost Build
c3b3a36dc3 Bumping version to: 3.1.0-rc1 2016-06-06 21:57:07 +00: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
enahum
6ab893dcba PLT-2939 Fix Default slash command icon is invalid (#3250) 2016-06-06 08:59:19 -04:00
Christopher Speller
ea3342aa6c Adding LDAP Syncronization (#3219) 2016-06-03 09:33:59 -04: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
Harrison Healey
2ea54b9d1e PLT-2283 Improved trimming of punctuation from hashtags and search terms (#3178)
* Improved trimming of punctuation from hashtags and search terms

* Separated punctuation regexes used for hashtags and for search terms
2016-06-01 13:05:36 -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
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
Harrison Healey
c5deb333db Added validation to make sure theme entries are colours (#3107)
* Added validation to make sure theme entries are colours

* Added serverside validation for theme
2016-05-31 08:15:33 -04: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
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
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
e81fa3220d Added validation for command triggers (#3068) 2016-05-20 14:47:10 -04:00
Christopher Speller
2a137e97c4 Adding enterprise build hash to about dialog (#3058) 2016-05-20 07:41:47 -07: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
Thomas Balthazar
4f34730b3f Integrations: Enable <!channel> notifications in incoming webhooks (#3039) 2016-05-18 16:36:01 -04:00
Christopher Speller
edd453c6cd Merge branch 'release-3.0' 2016-05-17 17:51:42 -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
enahum
52694f676e PLT-2965 Fix config sanitation (#3005) 2016-05-16 11:15:31 -04:00
ArthurH
3564df106d Fix heavy regression on GitLab for version 3.0.0 (#3000)
Fix regression on GitLab
2016-05-16 08:00:44 -04:00
ArthurH
7fa7bee9fc Fix heavy regression on GitLab for version 3.0.0 (#3000)
Fix regression on GitLab
2016-05-16 08:00:04 -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
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
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
enahum
3a0734ec9d PLT-2798 Config sanitation fails when no LDAP Settings are present in config.json (#2882) 2016-05-05 12:36:17 -07:00
enahum
04b61d1f38 PLT-2797 Remove LDAP Password Field Name setting (#2884) 2016-05-05 09:36:58 -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
Joram Wilander
08a3cf6b38 Port HPNS from 2.2 to master (#2863) 2016-05-03 08:54:49 -07:00
Cyril Terets
709f9dcbba added TrimSpace() to GLU email (#2827) 2016-04-29 10:43:02 -04:00
=Corey Hulen
30418b81a5 Fixing help links 2016-04-28 17:34:56 -07:00
Joram Wilander
7695cbd1b4 Add websocket event and cache invalidation for deleting channels (#2807) 2016-04-27 16:05:39 -04:00
Christopher Speller
fa807d8e43 Fixing permalinks to channels your not a memeber of (#2805) 2016-04-27 16:02:58 -04:00
Harrison Healey
d8df66c00c Fixed updating mention keys when a user's username changes (#2774) 2016-04-25 08:20:45 -04:00
Corey Hulen
2e5617c29b PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams
2016-04-21 22:37:01 -07:00