Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update syntax-highlighting.md | lfbrock | 2015-12-14 | 1 | -1/+1 |
* | Merge pull request #1713 from esethna/patch-41 | Joram Wilander | 2015-12-14 | 1 | -1/+1 |
|\ | |||||
| * | Update Sign-in.md | Eric Sethna | 2015-12-11 | 1 | -1/+1 |
* | | Merge pull request #1707 from mattermost/plt-1495 | Christopher Speller | 2015-12-14 | 1 | -0/+1 |
|\ \ | |||||
| * | | Include SiteURL in props for invite email | JoramWilander | 2015-12-11 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #1690 from npcode/trim-outgoing-callback-url | Harrison Healey | 2015-12-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | Trim callback urls for outgoing webhooks | Yi EungJun | 2015-12-12 | 1 | -1/+1 |
* | | | Merge pull request #1697 from asaadmahmoodspin/master | Harrison Healey | 2015-12-14 | 2 | -14/+21 |
|\ \ \ | |||||
| * | | | ADding utilis mobile instead of width | Asaad Mahmood | 2015-12-11 | 1 | -3/+3 |
| * | | | Updating direct messages code | Asaad Mahmood | 2015-12-11 | 1 | -1/+1 |
| * | | | Updating code for direct messages | Asaad Mahmood | 2015-12-10 | 2 | -3/+5 |
| * | | | FIxing scroll for more direct channels | Asaad Mahmood | 2015-12-10 | 2 | -14/+19 |
* | | | | Merge pull request #1712 from rgarmsen2295/plt-1263 | Harrison Healey | 2015-12-14 | 12 | -135/+41 |
|\ \ \ \ | |||||
| * | | | | Fixed broken unsubscribe instructions | Reed Garmsen | 2015-12-11 | 12 | -135/+41 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1716 from rgarmsen2295/plt-1453 | Harrison Healey | 2015-12-14 | 1 | -7/+8 |
|\ \ \ \ | |||||
| * | | | | No longer errors upon saving the same info in Account Settings -> General | Reed Garmsen | 2015-12-11 | 1 | -7/+8 |
| |/ / / | |||||
* | | | | Merge pull request #1717 from rgarmsen2295/plt-1026 | Harrison Healey | 2015-12-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | When a team's statistics is selected in the sys console the team name is now ... | Reed Garmsen | 2015-12-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1720 from rgarmsen2295/plt-860 | Harrison Healey | 2015-12-14 | 16 | -130/+130 |
|\ \ \ \ | |||||
| * | | | | Fixed issue with emails containing a '+' | Reed Garmsen | 2015-12-13 | 1 | -1/+1 |
| * | | | | Fixing issues caused by changing test emails | Reed Garmsen | 2015-12-13 | 2 | -2/+2 |
| * | | | | Updated emails in unit tests to include '+' | Reed Garmsen | 2015-12-13 | 14 | -128/+128 |
| |/ / / | |||||
* | | | | Merge pull request #1588 from rgarmsen2295/plt-881 | Joram Wilander | 2015-12-12 | 13 | -45/+402 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added legal and support settings to sys console and implemented support for o... | Reed Garmsen | 2015-12-10 | 13 | -51/+400 |
| * | | | Added legal and support items to config file | Reed Garmsen | 2015-12-01 | 1 | -0/+8 |
* | | | | Create accepting-pull-request.md | it33 | 2015-12-11 | 1 | -0/+28 |
* | | | | Merge pull request #1677 from hmhealey/plt1244 | Corey Hulen | 2015-12-11 | 1 | -18/+35 |
|\ \ \ \ | |||||
| * | | | | Changed serverside mention parsing to support usernames containing periods | hmhealey | 2015-12-09 | 1 | -18/+35 |
* | | | | | Merge pull request #1676 from kh0r/master | Corey Hulen | 2015-12-11 | 2 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Update nginx ssl-conf | mklepp | 2015-12-09 | 2 | -2/+4 |
* | | | | | | Merge pull request #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 10 | -39/+176 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changed Sidebar direct channel list to be driven by preferences | hmhealey | 2015-12-08 | 2 | -17/+31 |
| * | | | | | | Moved logic for making direct channels visible to both members on post to the... | hmhealey | 2015-12-07 | 3 | -13/+109 |
| * | | | | | | Added preference_changed web socket event | hmhealey | 2015-12-07 | 6 | -13/+40 |
* | | | | | | | Merge pull request #1703 from rgarmsen2295/plt-583 | Christopher Speller | 2015-12-11 | 2 | -6/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Disables the ability to send email invites when user creation is disabled | Reed Garmsen | 2015-12-10 | 2 | -6/+14 |
* | | | | | | | | Merge pull request #1702 from rgarmsen2295/plt-1047 | Christopher Speller | 2015-12-11 | 12 | -30/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed issue with Team Settings modal saving items instead of cancelling; chan... | Reed Garmsen | 2015-12-10 | 12 | -30/+41 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #1698 from rgarmsen2295/plt-1346 | Christopher Speller | 2015-12-11 | 1 | -32/+52 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Disabling ability to enable team listing on a system where EnableTeamListing=... | Reed Garmsen | 2015-12-10 | 1 | -32/+52 |
* | | | | | | | | | Merge pull request #1684 from hmhealey/plt1184 | Joram Wilander | 2015-12-11 | 3 | -20/+43 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fixed EditChannelHeaderModal's contents not always being updated when a chang... | hmhealey | 2015-12-10 | 3 | -20/+43 |
* | | | | | | | | | Merge pull request #1648 from npcode/notification-email-local-timezone | Christopher Speller | 2015-12-10 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use local timezone for notification email | Yi EungJun | 2015-12-08 | 2 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1688 from mattermost/fix-salts | Christopher Speller | 2015-12-10 | 3 | -0/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixing unit test | =Corey Hulen | 2015-12-09 | 1 | -3/+0 |
| * | | | | | | | | Generate salts when empty | =Corey Hulen | 2015-12-09 | 3 | -0/+41 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1694 from mattermost/revert-1625-ephemeral_messages | Christopher Speller | 2015-12-10 | 5 | -103/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "add helper method to add ephemeral messages; also switch 'delete mess... | Christopher Speller | 2015-12-10 | 5 | -103/+48 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1680 from mattermost/lfbrock-patch-1 | it33 | 2015-12-09 | 1 | -59/+82 |
|\ \ \ \ \ \ \ \ |