Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1113 from hmhealey/plt716 | Joram Wilander | 2015-10-20 | 3 | -2/+202 | |
|\ \ \ | |/ / |/| | | PLT-716/717 Added from:, in:, and channel: search filters | |||||
| * | | Added from:, in:, and channel: search modifiers | hmhealey | 2015-10-19 | 3 | -2/+202 | |
| | | | ||||||
* | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 6 | -0/+269 | |
|\ \ \ | | | | | | | | | PLT-235 Implement outgoing webhooks. | |||||
| * | | | Refactor to hit database less often. | JoramWilander | 2015-10-19 | 1 | -0/+14 | |
| | | | | ||||||
| * | | | Remove temporary test code. | JoramWilander | 2015-10-19 | 1 | -4/+0 | |
| | | | | ||||||
| * | | | Add api unit tests for outgoing webhooks. | JoramWilander | 2015-10-19 | 1 | -0/+36 | |
| | | | | ||||||
| * | | | Add model test for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -0/+97 | |
| | | | | ||||||
| * | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 4 | -0/+126 | |
| | | | | ||||||
* | | | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 1 | -8/+8 | |
|\ \ \ \ | |/ / / |/| | | | PLT-554 Small refactor of websocket code on client and server | |||||
| * | | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 1 | -8/+8 | |
| |/ / | ||||||
* | | | Merge pull request #1085 from mattermost/plt-633 | Harrison Healey | 2015-10-16 | 1 | -0/+5 | |
|\ \ \ | |/ / |/| | | PLT-633 Add default username and icon to incoming webhooks. | |||||
| * | | Add default username and icon to incoming webhooks. | JoramWilander | 2015-10-16 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 1 | -0/+9 | |
|\ \ \ | |/ / |/| | | Added an initial call to get all user preferences on page load | |||||
| * | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 1 | -0/+9 | |
| | | | ||||||
* | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 2 | -1/+7 | |
|\ \ \ | |/ / |/| | | Use display name instead of name in team switcher menu | |||||
| * | | Sanitize team data | Antti Ahti | 2015-10-14 | 1 | -0/+6 | |
| | | | | | | | | | | | | We don't want to expose sensitive data that might pose a security risk. | |||||
| * | | Use team display name in team switcher menu | Antti Ahti | 2015-10-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu | |||||
* | | | Marking when user ran the unit tests | =Corey Hulen | 2015-10-15 | 1 | -0/+6 | |
|/ / | ||||||
* | | Made further changes based on feedback | hmhealey | 2015-10-13 | 2 | -21/+5 | |
| | | ||||||
* | | Removed Preference.AltId | hmhealey | 2015-10-13 | 4 | -29/+31 | |
| | | ||||||
* | | Made structural changes to server-side Preference code based on feedback | hmhealey | 2015-10-13 | 3 | -25/+36 | |
| | | ||||||
* | | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 2 | -3/+3 | |
| | | ||||||
* | | Added api to get and set preferences | hmhealey | 2015-10-13 | 2 | -0/+38 | |
| | | ||||||
* | | Added Preferences table to store user preferences | hmhealey | 2015-10-13 | 1 | -2/+4 | |
| | | ||||||
* | | Added model class for user preferences object | hmhealey | 2015-10-13 | 2 | -0/+136 | |
|/ | ||||||
* | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 1 | -3/+10 | |
| | ||||||
* | Adding release 1.1.0 version | Christopher Speller | 2015-10-08 | 1 | -0/+1 | |
| | ||||||
* | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 49 | -49/+49 | |
| | ||||||
* | Merge pull request #944 from mattermost/PLT-518 | Christopher Speller | 2015-10-08 | 2 | -3/+58 | |
|\ | | | | | PLT-518 check for security bulletins | |||||
| * | PLT-518 check for security bulletins | =Corey Hulen | 2015-10-05 | 2 | -3/+58 | |
| | | ||||||
* | | Fix user_added websocket event and update websocket channel access cache on ↵ | JoramWilander | 2015-10-07 | 1 | -2/+2 | |
|/ | | | | add/remove member. | |||||
* | Merge pull request #914 from mattermost/plt-297 | Joram Wilander | 2015-10-05 | 1 | -0/+2 | |
|\ | | | | | PLT-297 Add ability to override username and icon for posts from incoming webhooks. | |||||
| * | Add config options for overriding username and icon, and add BOT indicator ↵ | JoramWilander | 2015-10-05 | 1 | -0/+2 | |
| | | | | | | | | next to webhook posts. | |||||
* | | Merge pull request #915 from mattermost/plt-300 | Christopher Speller | 2015-10-05 | 1 | -0/+1 | |
|\ \ | | | | | | | PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word. | |||||
| * | | Update allow/deny oauth page UI, and add ouath as reserved word. | JoramWilander | 2015-10-02 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | PLT-44 allow team switching without the need to login | |||||
| * | | | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 1 | -0/+1 | |
| | |/ | |/| | ||||||
* | | | Fixing break | =Corey Hulen | 2015-10-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Adding offical build function | =Corey Hulen | 2015-10-02 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge branch 'master' into PLT-462 | =Corey Hulen | 2015-10-02 | 5 | -23/+75 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #906 from teviot/teviot-patch-2 | Christopher Speller | 2015-10-02 | 2 | -1/+17 | |
| |\ \ | | | | | | | | | Pass-through post creation time when importing posts | |||||
| | * | | Pass-through post creation time when importing posts | Teviot Systems | 2015-10-02 | 2 | -1/+17 | |
| | |/ | ||||||
| * | | Merge pull request #881 from hmhealey/plt194 | Joram Wilander | 2015-10-02 | 3 | -22/+58 | |
| |\ \ | | |/ | |/| | PLT-194 Changes to ChannelMember notification settings | |||||
| | * | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -16/+6 | |
| | | | ||||||
| | * | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -16/+28 | |
| | | | ||||||
| | * | Removed deprecated constants related to quiet mode | hmhealey | 2015-09-30 | 1 | -3/+1 | |
| | | | ||||||
| | * | Added additional test cases and fixed existing ones for ↵ | hmhealey | 2015-09-30 | 2 | -0/+20 | |
| | | | | | | | | | | | | ChannelMember.MarkUnreadLevel | |||||
| | * | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 1 | -14/+25 | |
| | | | | | | | | | | | | unread in the sidebar | |||||
| | * | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 1 | -2/+7 | |
| | | | | | | | | | | | | user's notification level | |||||
* | | | PLT-462 Adding diagnostic info | =Corey Hulen | 2015-10-01 | 1 | -0/+1 | |
|/ / |