Commit Graph

189 Commits

Author SHA1 Message Date
=Corey Hulen
e22b9f5303 Adding new fields to team model 2015-10-26 22:11:22 -07:00
Florian Orben
c6bbebbf6f Mattermost can not send message start with slash
resolves #827
2015-10-25 23:55:50 +01:00
=Corey Hulen
54894e90ac Fixing merge conflict 2015-10-22 09:19:18 -07:00
=Corey Hulen
0bfdfd79f0 Fixing unit tests 2015-10-20 21:15:06 -07:00
=Corey Hulen
2022ed68f3 Fixing unit test 2015-10-20 20:39:06 -07: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
Christopher Speller
8b4771a6c7 Merge branch 'release-1.1.0' 2015-10-20 14:04:14 -04:00
Joram Wilander
f183f6673f Merge pull request #1116 from sharms/master
Fixed missing colon
2015-10-20 11:50:09 -04: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
Steven Harms
1d4e96605e Fixed missing colon 2015-10-19 16:02:30 -04: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
f7e51b14d7 Allowing salts longer than 32 chars 2015-10-19 11:23:44 -07:00
hmhealey
06fd374c19 Added from:, in:, and channel: search modifiers 2015-10-19 13:25:19 -04:00
Corey Hulen
ea1b312968 Merge pull request #1072 from mattermost/plt-554
PLT-554 Small refactor of websocket code on client and server
2015-10-19 09:56:34 -07:00
JoramWilander
f24ea30a75 Refactor to hit database less often. 2015-10-19 09:00:30 -04:00
JoramWilander
ba3cde024f Remove temporary test code. 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
8c8f1bdd63 Add model test for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
Harrison Healey
9c045f0d4b Merge pull request #1085 from mattermost/plt-633
PLT-633 Add default username and icon to incoming webhooks.
2015-10-16 11:59:34 -04:00
JoramWilander
2b5ec4a3c0 Small refactor of websocket code on client and server 2015-10-16 11:48:55 -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
JoramWilander
58c33f01d5 Add default username and icon to incoming webhooks. 2015-10-16 08:16:34 -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
=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
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
hmhealey
97b2f6ffe7 Made further changes based on feedback 2015-10-13 15:36:58 -04: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
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
a087403e9f Added api to get and set preferences 2015-10-13 09:42:23 -04:00
hmhealey
da66599fa3 Added Preferences table to store user preferences 2015-10-13 09:42:23 -04:00
hmhealey
3229457de0 Added model class for user preferences object 2015-10-13 09:42:23 -04:00
=Corey Hulen
61f92517f3 PLT-586 fixing issues with security alert 2015-10-09 12:24:39 -07:00
Christopher Speller
66cc4fa08f Adding release 1.1.0 version 2015-10-08 16:16:53 -04:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
Christopher Speller
a6629f95fe Merge pull request #944 from mattermost/PLT-518
PLT-518 check for security bulletins
2015-10-08 09:59:08 -04: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
=Corey Hulen
e26b77faf1 PLT-518 check for security bulletins 2015-10-05 17:33:45 -07:00
Joram Wilander
b591c4b32e Merge pull request #914 from mattermost/plt-297
PLT-297 Add ability to override username and icon for posts from incoming webhooks.
2015-10-05 11:48:10 -04:00
Christopher Speller
515d709c2e Merge pull request #915 from mattermost/plt-300
PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
2015-10-05 10:32:27 -04:00
Christopher Speller
f4afabd679 Merge pull request #903 from mattermost/PLT-44
PLT-44 allow team switching without the need to login
2015-10-05 10:20:14 -04:00
JoramWilander
2a23d90ca6 Add config options for overriding username and icon, and add BOT indicator next to webhook posts. 2015-10-05 08:46:23 -04:00
JoramWilander
6221927351 Update allow/deny oauth page UI, and add ouath as reserved word. 2015-10-02 12:47:54 -04:00
=Corey Hulen
e0743a6a2b Fixing break 2015-10-02 09:16:03 -07:00