Commit Graph

865 Commits

Author SHA1 Message Date
David Lu
34077a407b made /shortcuts separate for mac (#3571) 2016-07-14 11:57:06 -08:00
Joram Wilander
c67729d7b6 Increased wait time for TestUserTyping event test case (#3587) 2016-07-14 09:06:15 -08:00
Harrison Healey
caabfbcdd5 PLT-2992 Added the ability to use different themes for each team (#3411)
* Cleaned up user_settings_theme.jsx and import_theme_modal.jsx

* Made ImportThemeModal use a callback to return the theme to the user settings modal instead of saving it directly

* Moved user theme from model to preferences

* Added serverside API to delete preferences TODO update package with client stuff

* Changed constants.jsx so that Preferences and ActionTypes can be imported on their own

* Updated ThemeProps migration code to properly rename solarized code themes

* Fixed warnings thrown by AppDispatcher

* Added clientside UI to support team-specific themes

* Removed debugging code from test

* Fixed setting a user's theme when they haven't set their theme before
2016-07-14 10:08:36 -04:00
David Lu
8e810bc2eb PLT-3153 Converted slash command triggers to lowercase on save (#3577)
* Converted slash command triggers to lowercase on save

* Made slash commands case insensitive
2016-07-14 10:05:25 -04:00
samogot
9b9facd3d2 PLT-3366 Holding down the ALT key and clicking on a message adds a new messages indicator (squashed) (#3374) 2016-07-14 08:19:27 -04:00
David Lu
2e7e0d09b8 Removed system message on /msg success (#3579) 2016-07-14 08:17:24 -04:00
enahum
8346bfec37 PLT-3584 Fix no team found when creating account (#3552) 2016-07-13 09:13:13 -08:00
enahum
0a6bdceccb PLT-3384 Improve the "Verify Email" email (#3564) 2016-07-13 09:03:46 -08:00
David Lu
1df0488932 Fixed invalid password error when admin resets password (#3578) 2016-07-13 12:44:26 -04:00
Harrison Healey
954e251188 Merged release-3.2 into master 2016-07-12 10:52:43 -04:00
Christopher Speller
c976c2881c Some improvments to password handling (#3549) 2016-07-12 10:09:04 -04:00
Christopher Speller
128e4f984a Letting email not validated error message through login. Changing invalid credentials error. (#3546) 2016-07-12 10:08:54 -04:00
Joram Wilander
ad343a0f4a Added infrastructure for basic WebSocket API (#3432) 2016-07-12 09:36:27 -04:00
Harrison Healey
9481a4f0ef Merge release 3.2 into master (#3548)
* Bumping version to: 3.2.0-rc1

* PLT-2863 fixing bad merge that broke this PR (#3523)

* PLT-2863 adding remove user from team

* PLT-2863 adding the client side UI

* Fixing trailing space

* Fixing reported issues

* Adding documentatino

* Switching to final javascript driver

* Fixing bad merge

* Fixing bad merge

* PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524)

* Login error messages fix (#3525)

* daily translations 20160708 (#3533)

* Fixed permissions when getting a file attachment to use the correct user id (#3535)

* PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534)

* PLT-3560 blocking adding to channel once user is removed (#3537)

* Always allow system admins to see the Integrations sidebar (#3536)

* Plt 3475 - Post control improvements (#3538)

* Adding class to post when dropdown is active.

* plt-3475 - Post controls improvements

* daily translations 20160711 (#3544)
2016-07-11 14:21:51 -04:00
Corey Hulen
dd99252278 PLT-3560 blocking adding to channel once user is removed (#3537) 2016-07-11 08:37:20 -04:00
Harrison Healey
2d1c0924ee Fixed permissions when getting a file attachment to use the correct user id (#3535) 2016-07-08 17:03:28 -04:00
Christopher Speller
2e513c8fd4 Login error messages fix (#3525) 2016-07-08 09:17:14 -04:00
David Lu
683f713319 PLT-1465 Added password requirements (#3489)
* Added password requirements

* added tweaks

* fixed error code

* removed http.StatusNotAcceptable
2016-07-06 14:54:54 -08:00
Corey Hulen
d5f243dad6 PLT-2863 adding remove user from team (#3429)
* PLT-2863 adding remove user from team

* PLT-2863 adding the client side UI

* Fixing trailing space

* Fixing reported issues

* Adding documentatino

* Switching to final javascript driver
2016-07-06 13:40:59 -08:00
Corey Hulen
b1520d0b94 PLT-3512 adding join/leave channel to the CLI (#3498)
* PLT-3512 adding join/leave channel to the CLI

* PLT-3512 adding list channels to the CLI

* PLT-3512 adding restore channel

* Adding make run-cli command

* Updating txt

* Fixing txt purposed by PMs
2016-07-06 14:11:21 -04:00
enahum
9d0f9169df PLT-3502 Fix Team admins can't give "team admin" privilege to members (#3499) 2016-07-06 13:57:32 -04:00
Joram Wilander
5f7cb8cfbf PLT-3346/PLT-3342/PLT-3360 EE: Add the ability to restrict channel management permissions (#3453)
* EE: Add the ability to restrict channel management permissions

* Always allow last user in a channel to delete that channel
2016-07-06 08:23:24 -04:00
Joram Wilander
19d452c74e Fix connection leaks in push notifications, diagnostics and oauth (#3469) 2016-07-06 08:23:06 -04:00
enahum
5f04dc4f45 SAML support (#3494)
* PLT-3073: Implement SAML/Okta Server side (EE) (#3422)

* PLT-3137 Support for SAML configuration

* PLT-3410 SAML Database Store

* PLT-3411 CLI to add Identity Provider Certificate and Service Provider Private Key

* PLT-3409 SAML Interface for EE

* PLT-3139 Handle SAML authentication server side

* Add localization messages

* PLT-3443 SAML Obtain SP metadata

* PLT-3142 Login & Switch to/from SAML

* Remove Certs for Database & Clean SAML Request

* Make required Username, FirstName and LastName

* PLT-3140 Add SAML to System Console (#3476)

* PLT-3140 Add SAML to System Console

* Move web_client functions to client.jsx

* Fix issues found by PM

* update package.json mattermost driver

* Fix text messages for SAML
2016-07-05 15:49:00 -04:00
Joram Wilander
f89e7c6d54 Sanitize personal information out of license for non system admin users (#3487) 2016-07-05 14:02:00 -04:00
Harrison Healey
dc2f2a8001 PLT-3145 Custom Emojis (#3381)
* Reorganized Backstage code to use a view controller and separated it from integrations code

* Renamed InstalledIntegrations component to BackstageList

* Added EmojiList page

* Added AddEmoji page

* Added custom emoji to autocomplete and text formatter

* Moved system emoji to EmojiStore

* Stopped trying to get emoji before logging in

* Rerender posts when emojis change

* Fixed submit handler on backstage pages to properly support enter

* Removed debugging code

* Updated javascript driver

* Fixed unit tests

* Fixed backstage routes

* Added clientside validation to prevent users from creating an emoji with the same name as a system one

* Fixed AddEmoji page to properly redirect when an emoji is created successfully

* Fixed updating emoji list when an emoji is deleted

* Added type prop to BackstageList to properly support using a table for the list

* Added help text to EmojiList

* Fixed backstage on smaller screen sizes

* Disable custom emoji by default

* Improved restrictions on creating emojis

* Fixed non-admin users seeing the option to delete each other's emojis

* Fixing gofmt

* Fixed emoji unit tests

* Fixed trying to get emoji from the server when it's disabled
2016-07-05 11:58:18 -04:00
Joram Wilander
f9e5a9029c Fixed error when adding incoming webhook to public channel not currently in (#3483) 2016-07-05 11:32:28 -04:00
enahum
0f873c01da PLT-3454 Verification Email fails to send when logging in with username (#3475) 2016-07-05 11:20:26 -04:00
enahum
2305b2597f PLT-3456 Fix Errors while starting the server (#3445)
* PLT-3456 AppErrors that are triggered before translations are loaded crash server or produce bad error messages.

* Fixing tests
2016-07-04 09:30:57 -04:00
Corey Hulen
b7e7474a5e Fixing invalid session (#3463) 2016-07-01 11:57:17 -08:00
Harrison Healey
74f86da822 Revert "Moved file attachments to be stored in data/channels instead of data/teams/ID/channels (#3416)" (#3461)
This reverts commit ed75dfc6c0.
2016-06-30 10:53:36 -08:00
David Lu
1c8962cf99 enabled team creation for sysadmins (#3433) 2016-06-30 08:43:46 -04:00
Joram Wilander
b97b3ae617 EE: Add the ability to restrict the user roles that can send team invites (#3442) 2016-06-29 14:16:17 -04:00
Corey Hulen
b63f61fe7d PLT-3440 (#3440) 2016-06-29 08:16:20 -04:00
Christopher Speller
6c5a8be6bf Implementing server side of LDAP sync now button (#3430) 2016-06-28 16:11:33 -08:00
Christopher Speller
422e12c364 Changing email notifications to use permalinks (#3399) 2016-06-28 14:44:37 -04:00
Harrison Healey
ed75dfc6c0 Moved file attachments to be stored in data/channels instead of data/teams/ID/channels (#3416) 2016-06-28 14:44:06 -04:00
Thiyagaraj Krishna
11afa405ba Email check shouldn't be case-sensitive #3349 (#3350)
Email address "allowed domains" check appears to be case-sensitive #3349
2016-06-27 08:08:16 -04:00
enahum
944966f7d1 PLT-3415 Fix Sending Test email fails with error (#3396) 2016-06-22 09:32:39 -04:00
Joram Wilander
5f176e4974 Make sure profile is not nil when assigning in sendNotifications (#3395) 2016-06-21 23:05:54 -04:00
enahum
e6fcea8459 PLT-3261 Fix Can't create a team with GitLab if the email domain is restricted (#3379) 2016-06-21 05:49:48 -08:00
Joram Wilander
878465b528 Only check team Id in getChannel for non-DMs (#3382) 2016-06-20 15:39:13 -06:00
David Lu
dbcf8572e5 Fixed @all not working as intended (#3335) 2016-06-15 08:13:47 -04:00
Corey Hulen
c7e9f3cb1b PLT-3264 remove session cookie when switching accounts (#3341) 2016-06-15 08:10:22 -04:00
Joram Wilander
1cfb35fd32 Fix channels showing up across teams when multiple teams open in same browser (#3329) 2016-06-15 08:00:55 -04:00
Joram Wilander
8f87e60231 Fix bad condition on hiding email addresses and update user etag to include privacy settings (#3327) 2016-06-14 12:12:46 -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
David Lu
661f221727 Made error message clearer (#3318) 2016-06-14 08:59:55 -04: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