Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Changed positioning of root elements to fix weird IE11 bug | hmhealey | 2015-12-11 | 1 | -3/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #1701 from mattermost/PLT-1472 | Christopher Speller | 2015-12-11 | 2 | -9/+7 | |
| |\ \ \ | | | | | | | | | | | PLT-1472 Adding back button to search click through | |||||
| | * \ \ | Merge branch 'PLT-1472' of https://github.com/mattermost/platform into PLT-1472 | =Corey Hulen | 2015-12-11 | 0 | -0/+0 | |
| | |\ \ \ | ||||||
| | | * | | | Fixing eslint error | =Corey Hulen | 2015-12-10 | 1 | -1/+0 | |
| | | | | | | ||||||
| | | * | | | PLT-1472 Adding back button to search click through | =Corey Hulen | 2015-12-10 | 2 | -8/+7 | |
| | | | | | | ||||||
| | * | | | | Fixing eslint error | =Corey Hulen | 2015-12-11 | 1 | -1/+0 | |
| | | | | | | ||||||
| | * | | | | PLT-1472 Adding back button to search click through | =Corey Hulen | 2015-12-11 | 2 | -8/+7 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1699 from mattermost/plt-1455 | Christopher Speller | 2015-12-11 | 1 | -0/+1 | |
| |\ \ \ \ | | |/ / / | |/| | | | PLT-1455 Fixing jumping of center channel with few posts on IE11 | |||||
| | * | | | Fixing jumping of center channel with few posts on IE11 | Christopher Speller | 2015-12-10 | 1 | -0/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #1711 from asaadmahmoodspin/code-themes | Corey Hulen | 2015-12-14 | 12 | -42/+90 | |
|\ \ \ \ | | | | | | | | | | | Multiple UI Improvements | |||||
| * | | | | Removing sidebar right fix | Asaad Mahmood | 2015-12-14 | 1 | -1/+5 | |
| | | | | | ||||||
| * | | | | Fixing sidebar--right | Asaad Mahmood | 2015-12-14 | 1 | -5/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into code-themes | Asaad Mahmood | 2015-12-14 | 13 | -45/+402 | |
| |\ \ \ \ | ||||||
| * | | | | | Updating the naming for the docs page | Asaad Mahmood | 2015-12-14 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-11 | 11 | -41/+89 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #1728 from mattermost/lfbrock-patch-1 | Corey Hulen | 2015-12-14 | 3 | -4/+4 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-1457 Update syntax highlighting tests/documentation | |||||
| * | | | | Update CHANGELOG.md | lfbrock | 2015-12-14 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Update Markdown.md | lfbrock | 2015-12-14 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | 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 | |||||
| * | | | | Update Sign-in.md | Eric Sethna | 2015-12-11 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | rebase to master | |||||
* | | | | Merge pull request #1707 from mattermost/plt-1495 | Christopher Speller | 2015-12-14 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | PLT-1495 Include SiteURL in props for invite email | |||||
| * | | | | 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 | |||||
| * | | | | Trim callback urls for outgoing webhooks | Yi EungJun | 2015-12-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Adding traling whitespace is common mistake. | |||||
* | | | | | Merge pull request #1697 from asaadmahmoodspin/master | Harrison Healey | 2015-12-14 | 2 | -14/+21 | |
|\ \ \ \ \ | | | | | | | | | | | | | FIxing scroll for more direct channels | |||||
| * | | | | | 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 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1263 Fixed broken email unsubscribe instructions | |||||
| * | | | | | 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 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1453 No longer errors upon saving the same info in Account Settings -> General | |||||
| * | | | | | 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 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1026 Bolds the team name when the team's statistics page is selected in the system console | |||||
| * | | | | | When a team's statistics is selected in the sys console the team name is now ↵ | Reed Garmsen | 2015-12-11 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | also bolded | |||||
* | | | | | Merge pull request #1720 from rgarmsen2295/plt-860 | Harrison Healey | 2015-12-14 | 16 | -130/+130 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+' | |||||
| * | | | | 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 | |
|\ \ \ \ | |/ / / |/| | | | PLT-881 Adds Legal and Support Settings to the System Console | |||||
| * | | | Added legal and support settings to sys console and implemented support for ↵ | Reed Garmsen | 2015-12-10 | 13 | -51/+400 | |
| | | | | | | | | | | | | | | | | options in app | |||||
| * | | | 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 | |
|\ \ \ \ | | | | | | | | | | | PLT-1244 Changed serverside mention parsing to support usernames containing periods | |||||
| * | | | | 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 | |||||
| * | | | | | 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 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists | |||||
| * | | | | | | Changed Sidebar direct channel list to be driven by preferences | hmhealey | 2015-12-08 | 2 | -17/+31 | |
| | | | | | | |