Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix change email subject | Elias Nahum | 2016-02-10 | 1 | -1/+1 |
| | |||||
* | Fixing attaching device id | =Corey Hulen | 2016-02-08 | 1 | -1/+1 |
| | |||||
* | PLT-1900 removing lang from preview and making spanish beta | =Corey Hulen | 2016-02-08 | 1 | -6/+6 |
| | |||||
* | Merge pull request #2102 from mattermost/plt-1697 | Corey Hulen | 2016-02-08 | 1 | -0/+3 |
|\ | | | | | PLT-1697 Add ExpiresAt to session cookie so that IE/Edge store the cookie | ||||
| * | Add ExpiresAt to session cookie so that IE/Edge store the cookie | JoramWilander | 2016-02-08 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #2097 from mattermost/plt-1781 | Joram Wilander | 2016-02-08 | 1 | -1/+4 |
|\ \ | |/ |/| | PLT-1781 Fixing slack import. | ||||
| * | Fixing slack import. | Christopher Speller | 2016-02-08 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #2083 from mattermost/plt-1879 | Christopher Speller | 2016-02-08 | 4 | -5/+21 |
|\ \ | | | | | | | PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete… | ||||
| * | | Make insecure TLS connections configurable | JoramWilander | 2016-02-05 | 3 | -6/+12 |
| | | | |||||
| * | | Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bug | JoramWilander | 2016-02-05 | 3 | -3/+13 |
| |/ | |||||
* | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -8/+46 |
| | | |||||
* | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -6/+9 |
|/ | |||||
* | Merge pull request #2073 from mattermost/ee-updates | Corey Hulen | 2016-02-04 | 1 | -6/+26 |
|\ | | | | | Some general updates to EE | ||||
| * | Move license storage to database | JoramWilander | 2016-02-04 | 1 | -6/+26 |
| | | |||||
* | | Merge pull request #2064 from hmhealey/plt882 | Christopher Speller | 2016-02-04 | 3 | -246/+432 |
|\ \ | |/ |/| | PLT-882 Ephemeral Messages and Out-Of-Channel mentions | ||||
| * | Changed sendNotificationsAndForget to be synchronous and called as a go func | hmhealey | 2016-02-04 | 1 | -228/+225 |
| | | |||||
| * | Added helper methods to send ephemeral messages to specific users | hmhealey | 2016-02-04 | 1 | -19/+35 |
| | | |||||
| * | Changed how posts are marked ephemeral | hmhealey | 2016-02-04 | 1 | -2/+1 |
| | | |||||
| * | Reworked the code for sending notifications and checking for out of channel ↵ | hmhealey | 2016-02-04 | 2 | -248/+262 |
| | | | | | | | | mentions to share some data | ||||
| * | Changed out of channel mention tests to use proper email addresses | hmhealey | 2016-02-04 | 1 | -6/+7 |
| | | |||||
| * | Added ephemeral messages sent when a user mentions someone not in the channel | hmhealey | 2016-02-04 | 2 | -5/+43 |
| | | |||||
| * | Added serverside check for a post that @mentions someone who isn't in the ↵ | hmhealey | 2016-02-04 | 2 | -0/+121 |
| | | | | | | | | channel | ||||
* | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 17 | -666/+1689 |
|\ \ | |/ |/| | PLT-1429 adding user created slash commands | ||||
| * | PLT-1429 Fixing code review comments | =Corey Hulen | 2016-02-04 | 3 | -6/+6 |
| | | |||||
| * | Fixing build | =Corey Hulen | 2016-02-03 | 1 | -2/+2 |
| | | |||||
| * | Fixing based on feedback | =Corey Hulen | 2016-02-03 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 4 | -4/+263 |
| |\ \ | |||||
| * | | | Fixing unit test | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 1 | -6/+6 |
| | | | | |||||
| * | | | Adding loc to new command backend | =Corey Hulen | 2016-02-01 | 8 | -67/+117 |
| | | | | |||||
| * | | | Fixing merge | =Corey Hulen | 2016-02-01 | 21 | -149/+219 |
| |\ \ \ | |||||
| * \ \ \ | merging | =Corey Hulen | 2016-01-25 | 38 | -166/+298 |
| |\ \ \ \ | |||||
| * | | | | | Merging | =Corey Hulen | 2016-01-22 | 2 | -3/+4 |
| | | | | | | |||||
| * | | | | | merging | =Corey Hulen | 2016-01-22 | 19 | -352/+410 |
| |\ \ \ \ \ | |||||
| * | | | | | | Adding test command | =Corey Hulen | 2016-01-15 | 2 | -16/+201 |
| | | | | | | | |||||
| * | | | | | | merging | =Corey Hulen | 2016-01-15 | 1 | -3/+10 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 22 | -45/+221 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Chaning webhooks to be team wide | =Corey Hulen | 2016-01-11 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Switching to enable integrations for testing | =Corey Hulen | 2016-01-11 | 2 | -8/+73 |
| | | | | | | | | | |||||
| * | | | | | | | | Adding loading testing commands | =Corey Hulen | 2016-01-10 | 5 | -395/+578 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-09 | 3 | -11/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | adding different commands | =Corey Hulen | 2016-01-09 | 11 | -439/+346 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-08 | 1 | -0/+28 |
| | | | | | | | | | |||||
| * | | | | | | | | Adding web service methods | =Corey Hulen | 2016-01-08 | 3 | -16/+261 |
| | | | | | | | | | |||||
| * | | | | | | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 5 | -36/+399 |
| | | | | | | | | | |||||
| * | | | | | | | | PLT-1429 adding sql storage for slash commands | =Corey Hulen | 2016-01-06 | 2 | -830/+830 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #2059 from mattermost/plt-1732 | Harrison Healey | 2016-02-04 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | PLT-1732 Update user email when switching to SSO | ||||
| * | | | | | | | | Update user email when switching to SSO | JoramWilander | 2016-02-03 | 1 | -2/+5 |
| | |_|_|_|_|_|/ | |/| | | | | | |