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

417 Коммитов

Автор SHA1 Сообщение Дата
it33
90b94f8fa9 PLT-629 - Update the reset password notification email
PLT-629 - Update the reset password notification email
2015-10-23 13:51:58 -07:00
Christopher Speller
c8edad29c1 Merge pull request #1149 from mattermost/plt-808
PLT-808 Fix deleting channels breaking the webhook UI
2015-10-23 08:34:57 -04:00
Corey Hulen
22d7f0f116 Merge pull request #1143 from mattermost/plt-803
PLT-803 Prevent users from resetting their password when the user is using SSO
2015-10-22 21:38:31 -07:00
Corey Hulen
640176bd4c Merge pull request #1142 from mattermost/plt-414
PLT-414 Fix direct channel creation.
2015-10-22 21:37:41 -07:00
=Corey Hulen
079f047540 Fixing code review issues 2015-10-22 18:06:22 -07:00
JoramWilander
a431ba2c22 Delete webhooks when the associated channel gets deleted 2015-10-22 14:27:47 -04:00
=Corey Hulen
ab18616725 Fixing group code review issues 2015-10-22 10:17:25 -07:00
=Corey Hulen
cbbee5cadb Addressing issues from group code review 2015-10-22 09:36:46 -07:00
=Corey Hulen
54894e90ac Fixing merge conflict 2015-10-22 09:19:18 -07:00
JoramWilander
4734912c52 Prevent users from resetting their password when the user is using SSO 2015-10-22 10:53:39 -04:00
Christopher Speller
6cc3bfe7a9 Refactoring direct channel creation to use transaction to avaoid state where channel is created without both users 2015-10-22 09:31:27 -04:00
Joram Wilander
2d922fde7e Merge pull request #1094 from trashcan/slash-shrug
Add a /shrug command
2015-10-22 08:11:26 -04:00
Florian Orben
d167e18f00 PLT-616: Enable playing of animated GIF in thumbnails and preview 2015-10-21 18:13:59 +02:00
=Corey Hulen
b9ce4a644d PLT-350 allow ability to disable restricted team names 2015-10-20 17:30:24 -07:00
=Corey Hulen
e1f9459029 Merge branch 'master' into PLT-44 2015-10-20 14:50:03 -07:00
=Corey Hulen
1fc12dd8ba Multi-session login 2015-10-20 14:49:42 -07:00
Joram Wilander
460a82878a Merge pull request #1113 from hmhealey/plt716
PLT-716/717 Added from:, in:, and channel: search filters
2015-10-20 08:00:21 -04:00
=Corey Hulen
fa3a0df2b6 Adding multi-session cookie 2015-10-20 04:37:51 -07:00
Reed Garmsen
04bf527966 Changed all goroutine functions to use '...AndForget' as the standard naming system 2015-10-19 13:58:15 -07:00
=Corey Hulen
36658c13a4 Fixing merge conflicts 2015-10-19 11:42:40 -07:00
Harrison Healey
d139c9e825 Merge pull request #1108 from mattermost/plt-235
PLT-235 Implement outgoing webhooks.
2015-10-19 14:24:02 -04:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
hmhealey
06fd374c19 Added from:, in:, and channel: search modifiers 2015-10-19 13:25:19 -04:00
JoramWilander
a3ca106740 Generalized webhook post code and added it to outgoing webhooks 2015-10-19 10:19:48 -04:00
JoramWilander
f24ea30a75 Refactor to hit database less often. 2015-10-19 09:00:30 -04:00
JoramWilander
9de8bc4727 Remove special team logic. 2015-10-19 09:00:30 -04:00
JoramWilander
5bb22ed454 Fix minor style for gofmt. 2015-10-19 09:00:30 -04:00
JoramWilander
a91956e180 Add api unit tests for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
=Corey Hulen
a8f3f76c59 Refactoring web classes to use multi-session 2015-10-16 19:05:55 -07:00
Pat Lathem
b1d9af2154 Add a /shrug command 2015-10-16 15:13:29 -05:00
=Corey Hulen
8b2d7f391a Fixing merge 2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3 Inital support for multi-tab loging 2015-10-16 09:10:54 -07:00
JoramWilander
2b5ec4a3c0 Small refactor of websocket code on client and server 2015-10-16 11:48:55 -04:00
hmhealey
5832f10bb9 Fixed preference test that was failing 2015-10-16 09:55:50 -04:00
Christopher Speller
099d853877 Merge pull request #1079 from hmhealey/initprefs
Added an initial call to get all user preferences on page load
2015-10-16 08:16:40 -04:00
Christopher Speller
269476d694 Merge pull request #1078 from hmhealey/plt701
PLT-701 Removed preference migration code
2015-10-16 08:11:03 -04:00
Joram Wilander
7718783d0c Merge pull request #1049 from apaatsio/full-teams-data
Use display name instead of name in team switcher menu
2015-10-16 07:57:38 -04:00
hmhealey
327b0b5a21 Added an initial call to get all user preferences on page load 2015-10-15 15:17:07 -04:00
hmhealey
4b99e17140 Removed preference migration code 2015-10-15 15:16:34 -04:00
hmhealey
b438eefad1 Removed preference migration code 2015-10-15 15:00:17 -04:00
=Corey Hulen
de717aef56 Marking when user ran the unit tests 2015-10-15 11:16:26 -07:00
Antti Ahti
8f96db4d0b Sanitize team data
We don't want to expose sensitive data that might pose a security risk.
2015-10-14 19:27:19 +03:00
Antti Ahti
731595c1a9 Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed) 2015-10-14 18:31:58 +03:00
Antti Ahti
1ab7034574 Use team display name in team switcher menu
- /teams/find_teams returns team objects instead of just team names
- use display_name in UI instead of name in the team switch menu
2015-10-14 18:27:03 +03:00
Christopher Speller
cdbe6342bb Merge release branch 'release-1.1.0' 2015-10-14 08:27:34 -04:00
hmhealey
97b2f6ffe7 Made further changes based on feedback 2015-10-13 15:36:58 -04:00
=Corey Hulen
0187e702ea PLT-602 combining welcome and verify email 2015-10-13 09:47:31 -07:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
hmhealey
5cecf1afcd Made structural changes to server-side Preference code based on feedback 2015-10-13 09:42:27 -04:00