Commit Graph

409 Commits

Author SHA1 Message Date
Christopher Speller
96bddf9016 Adding validation for LDAP settings to configuration (#3425) 2016-06-28 14:53:44 -04:00
enahum
1ac3bfa603 PLT-3364 Fix panic when load config failes (#3361) 2016-06-20 09:14:02 -06:00
David Lu
3f333678d8 PLT-2971 Added email footer for address (#3319)
* Added email footer for address

* added default

* Update html.go

* Changed according to PM
2016-06-16 08:44:02 -04:00
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
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
Thomas Balthazar
1d31b0eca6 PLT-2406 Add "Database:" to Mattermost About Dialog (#3261)
* Add "Database:" to Mattermost About Dialog

The property has been named SQLDriverName to make a difference with the
FileSettings DriverName.

* Add missing string for 'Database' in i18n file
2016-06-07 08:21:09 -04:00
Harrison Healey
2965a00e9b PLT-3168 Hide EnableFormatting advanced setting unless testing is enabled (#3237)
* Added EnableTesting to the client config

* Hid EnableFormatting advanced setting unless testing is enabled
2016-06-05 03:35:39 -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
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
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
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
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
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
Christopher Speller
fd24902194 Removing looking for config in /tmp/ (#3055) 2016-05-19 13:56:00 -03:00
enahum
50454bc81e PLT-2972 Fix config Desanitaze (#3018) 2016-05-17 10:52:49 -04: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
Joram Wilander
08a3cf6b38 Port HPNS from 2.2 to master (#2863) 2016-05-03 08:54:49 -07:00
Christopher Speller
c63e027aec Fixing LDAP editing of attributes (#2824) 2016-05-02 08:07:58 -04:00
Corey Hulen
9fecf96d3b PLT-2687 sending email on upgrade and moving profile pic to new location (#2808)
* Fixing CLI and adding unit tests

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Fixing CLI tests

* PLT-2687 sending email on upgrade and moving profile pic to new location

* Fixing img move

* Fixing moving of profile image

* making upgrade email localizable

* Fixing email template
2016-04-28 09:53:30 -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
Joram Wilander
5b5d9c0eaf Only add Enterprise features to client config if enabled by license (#2768) 2016-04-21 07:38:14 -07:00
Joram Wilander
c6c3f1e478 Update client license etag to handle new features (#2716) 2016-04-15 08:48:14 -04:00
Joram Wilander
8c2c892144 Allow customization of LDAP login fields (#2692) 2016-04-13 16:31:01 -07:00
Joram Wilander
49ab8b2161 Add custom branding functionality (#2667) 2016-04-11 13:45:03 -04:00
Christopher Speller
1954c44993 Adding LDAP user filtering capability 2016-04-06 08:19:56 -04:00
JoramWilander
f9a3a4b394 Add MFA functionality 2016-03-30 12:49:29 -04:00
=Corey Hulen
36b17bf99d PLT-2115 Adding compliance 2016-03-15 18:27:45 -07:00
Christopher Speller
d7cdcf082f Convering client to react-router. 2016-03-14 00:38:25 -04:00
JoramWilander
f11a1e764f Show filename for license settings, add loc 2016-03-09 11:23:29 -05:00
Elias Nahum
81f97ebc88 Add default value to AllowCorsFrom setting 2016-03-01 14:17:29 -03:00
Elias Nahum
ba6a38a7f6 Allow CORS 2016-03-01 13:00:54 -03:00
JoramWilander
e45282deaa Move license storage to database 2016-02-04 13:35:44 -05:00
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
Reed Garmsen
b013f02209 Added ability to sign in via username; separated email sign in and sign up config settings 2016-02-02 12:07:42 -08:00
=Corey Hulen
b4ec690051 Fixing merge 2016-02-01 14:44:17 -08:00
=Corey Hulen
c7c30a063d Adding english fallback 2016-01-28 09:51:37 -05:00
=Corey Hulen
c7d9754f4b Adding english fallback to server 2016-01-28 09:36:32 -05:00
=Corey Hulen
ea71731f83 merging 2016-01-25 11:23:55 -05:00
Elias Nahum
7b3be6c77e PLT-7: Refactoring manuatesting & utils to use translations (chunk 5)
- Add spanish translations
- Skip tests
2016-01-25 00:57:16 -03:00
Corey Hulen
1a0b12313b Merge pull request #1956 from mattermost/plt-1779
PLT-1779 Add system-wide statistics page
2016-01-22 17:00:09 -06:00
=Corey Hulen
c2d98c2c1f merging 2016-01-22 16:31:58 -06:00
=Corey Hulen
847754b3d7 PLT-7 adding loc header 2016-01-22 10:38:49 -06:00
=Corey Hulen
7e9b6dfcd0 PLT-7 adding loc header 2016-01-22 10:38:14 -06:00
=Corey Hulen
34b461c1b2 PLT-7 adding loc header 2016-01-22 10:33:41 -06:00