IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,143 Commits 845 Branches 1,202 Tags
cbbfe0112bf0d795d3c51382d6fddf5b20d19736
Commit Graph

166 Commits

Author SHA1 Message Date
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
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
=Corey Hulen
3863c3c15e Adding offical build function 2015-10-02 09:01:50 -07:00
=Corey Hulen
b2052de746 Merge branch 'master' into PLT-462 2015-10-02 08:36:56 -07:00
Christopher Speller
92404d6452 Merge pull request #906 from teviot/teviot-patch-2 
Pass-through post creation time when importing posts
 2015-10-02 08:50:23 -04:00
Joram Wilander
08d390953a Merge pull request #881 from hmhealey/plt194 
PLT-194 Changes to ChannelMember notification settings
 2015-10-02 08:45:38 -04:00
Teviot Systems
fc82f57102 Pass-through post creation time when importing posts 2015-10-02 20:16:27 +10:00
=Corey Hulen
430806301d PLT-44 allow team switching without the need to login 2015-10-01 17:52:47 -07:00
=Corey Hulen
9d688821aa PLT-462 Adding diagnostic info 2015-10-01 13:02:04 -07:00
hmhealey
c9a0030551 Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps 2015-10-01 08:31:17 -04:00
hmhealey
c16b9de8dc Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps 2015-10-01 08:31:11 -04:00
Christopher Speller
2d3ddfd467 Merge release branch 'release-1.0.0' 2015-09-30 15:38:15 -04:00
Christopher Speller
7d31f3a271 Fixing some locations to use the IsTeamAdmin function which properly checks for system admin permissions. 2015-09-30 14:26:37 -04:00
hmhealey
284a660a47 Removed deprecated constants related to quiet mode 2015-09-30 09:59:59 -04:00
hmhealey
9995c7ccfc Added additional test cases and fixed existing ones for ChannelMember.MarkUnreadLevel 2015-09-30 09:59:58 -04:00
hmhealey
7c319f0524 Removed UI for quiet mode and added UI to set when a channel will be marked unread in the sidebar 2015-09-30 09:59:58 -04:00
hmhealey
4bc625e8d1 Added 'default' option to channel notification settings that just uses the user's notification level 2015-09-30 09:59:58 -04:00
=Corey Hulen
8fadea44de PLT-404 adding basic error checking to config file. 2015-09-29 14:17:16 -07:00
Christopher Speller
942702ff1a Merge release branch 'release-1.0.0' 2015-09-29 15:34:21 -04:00
Jack
503501ab3b rebase 2015-09-28 08:14:57 -07:00
Christopher Speller
ce74afd9ed Fixing version unit test 2015-09-28 08:05:40 -04:00
Christopher Speller
348e931a20 Updating dockerfiles and version.go 2015-09-28 07:55:59 -04:00
=Corey Hulen
8ad9a88bda Fixing merge 2015-09-24 12:12:27 -07:00
=Corey Hulen
57269dcaf4 Removing default theme no longer in use 2015-09-24 11:08:39 -07:00
=Corey Hulen
a374419ad5 Removing old valet crud 2015-09-24 10:52:32 -07:00