Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 3 | -10/+16 | |
| |\| | ||||||
| * | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 5 | -11/+211 | |
| |\ \ | ||||||
| * | | | Multi-session login | =Corey Hulen | 2015-10-20 | 1 | -12/+13 | |
| * | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 2 | -14/+14 | |
* | | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 3 | -0/+101 | |
| |_|/ |/| | | ||||||
* | | | Fixing unit tests | =Corey Hulen | 2015-10-20 | 1 | -4/+4 | |
* | | | Fixing unit test | =Corey Hulen | 2015-10-20 | 1 | -4/+4 | |
* | | | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 2 | -2/+8 | |
| |/ |/| | ||||||
* | | Merge branch 'release-1.1.0' | Christopher Speller | 2015-10-20 | 1 | -8/+8 | |
|\ \ | ||||||
| * | | Allowing salts longer than 32 chars | =Corey Hulen | 2015-10-19 | 1 | -8/+8 | |
* | | | Merge pull request #1116 from sharms/master | Joram Wilander | 2015-10-20 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fixed missing colon | Steven Harms | 2015-10-19 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1113 from hmhealey/plt716 | Joram Wilander | 2015-10-20 | 3 | -2/+202 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | 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 | |
|\ \ \ | ||||||
| * | | | 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 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | 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 | hmhealey | 2015-10-15 | 1 | -0/+9 | |
* | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 2 | -1/+7 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Sanitize team data | Antti Ahti | 2015-10-14 | 1 | -0/+6 | |
| * | | Use team display name in team switcher menu | Antti Ahti | 2015-10-14 | 1 | -1/+1 | |
* | | | 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 | =Corey Hulen | 2015-10-05 | 2 | -3/+58 | |
* | | Fix user_added websocket event and update websocket channel access cache on a... | JoramWilander | 2015-10-07 | 1 | -2/+2 | |
|/ | ||||||
* | Merge pull request #914 from mattermost/plt-297 | Joram Wilander | 2015-10-05 | 1 | -0/+2 | |
|\ | ||||||
| * | Add config options for overriding username and icon, and add BOT indicator ne... | JoramWilander | 2015-10-05 | 1 | -0/+2 | |
* | | Merge pull request #915 from mattermost/plt-300 | Christopher Speller | 2015-10-05 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | 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 | =Corey Hulen | 2015-10-01 | 1 | -0/+1 | |
| | |/ | |/| | ||||||
* | | | Fixing break | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |