=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 |
|
hmhealey
|
ed6b2cd164
|
Removed setting direct channels for a new user at creation time
|
2015-10-13 09:42:26 -04:00 |
|
hmhealey
|
a6cd2a7961
|
Moved saving multiple user preferences into a database transaction
|
2015-10-13 09:42:26 -04:00 |
|
hmhealey
|
5832232b6d
|
Fixed preference tests
|
2015-10-13 09:42:25 -04:00 |
|
hmhealey
|
a11421c74b
|
Added default direct channels for previously existing users
|
2015-10-13 09:42:25 -04:00 |
|
hmhealey
|
599644fb2f
|
Renamed show_hide preference to show
|
2015-10-13 09:42:25 -04:00 |
|
hmhealey
|
4678794133
|
Re-added default direct channels for new users
|
2015-10-13 09:42:24 -04:00 |
|
hmhealey
|
a087403e9f
|
Added api to get and set preferences
|
2015-10-13 09:42:23 -04:00 |
|
Corey Hulen
|
191e248b0f
|
Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
|
2015-10-12 14:22:05 -07:00 |
|
=Corey Hulen
|
9f83a72f73
|
Merge branch 'release-1.1.0' into PLT-586
|
2015-10-12 13:16:46 -07:00 |
|
hmhealey
|
e5a019390d
|
Fixed download links in Safari
|
2015-10-09 16:45:40 -04:00 |
|
Reed Garmsen
|
3a3b24e6be
|
Replaced change email verification email logo image with a static link
|
2015-10-09 13:44:20 -07:00 |
|
=Corey Hulen
|
61f92517f3
|
PLT-586 fixing issues with security alert
|
2015-10-09 12:24:39 -07:00 |
|
Christopher Speller
|
806fd77ec9
|
Merge pull request #981 from mattermost/plt-517
PLT-517 Changing SpinPunch to Mattermost in copyright
|
2015-10-08 12:55:11 -04:00 |
|
Corey Hulen
|
e36227405b
|
Merge pull request #978 from mattermost/plt-355
PLT-355 Fixing ability to dynamicly update members list.
|
2015-10-08 09:51:04 -07:00 |
|
Christopher Speller
|
b85b529373
|
Changing SpinPunch to Mattermost in copyright
|
2015-10-08 12:27:09 -04:00 |
|
Christopher Speller
|
7014496252
|
Fixing ability to dynamicly update members list.
|
2015-10-08 10:54:27 -04:00 |
|
Christopher Speller
|
7a601afc64
|
Merge pull request #966 from mattermost/GIT-960
GIT-960 show error when you cannot create a team
|
2015-10-08 10:00:31 -04:00 |
|
Christopher Speller
|
7571d21f32
|
Merge pull request #931 from rgarmsen2295/plt-112
PLT-112 Improves email change verification process
|
2015-10-08 09:56:00 -04:00 |
|
=Corey Hulen
|
80b0567257
|
GIT-957 fixing email templates and logos
|
2015-10-07 13:45:57 -07:00 |
|
=Corey Hulen
|
81b7f649ed
|
GIT-960 show error when you cannot create a team
|
2015-10-07 10:07:08 -07:00 |
|
JoramWilander
|
1421e1ec4a
|
Fix user_added websocket event and update websocket channel access cache on add/remove member.
|
2015-10-07 11:39:45 -04:00 |
|