Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1814 from mattermost/PLT-1485a | Christopher Speller | 2016-01-06 | 1 | -0/+9 | |
|\ \ \ | | | | | | | | | PLT-1485 Adding last view channel sticky | |||||
| * | | | PLT-1485 Adding last view channel sticky | =Corey Hulen | 2016-01-05 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | Merge pull request #1809 from mattermost/PLT-1557 | Christopher Speller | 2016-01-06 | 2 | -7/+56 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | PLT-1557 revoking sessions from same device | |||||
| * | | PLT-1557 revoking sessions from same device | =Corey Hulen | 2016-01-05 | 2 | -7/+56 | |
| |/ | ||||||
* | | Fixing Import | =Corey Hulen | 2016-01-05 | 1 | -0/+1 | |
| | | ||||||
* | | Moving to constnt | =Corey Hulen | 2016-01-05 | 1 | -1/+1 | |
| | | ||||||
* | | Fixing error message | =Corey Hulen | 2016-01-05 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #1745 from mattermost/plt-1118 | Christopher Speller | 2016-01-04 | 4 | -22/+465 | |
|\ | | | | | PLT-1118 Add ability to switch between SSO and email account | |||||
| * | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 4 | -22/+465 | |
| | | ||||||
* | | Merge pull request #1800 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-01-04 | 1 | -1/+1 | |
|\ \ | | | | | | | Multiple UI Improvements | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-01-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #1763 from benburkert/non-s3-region | Christopher Speller | 2016-01-04 | 1 | -2/+16 | |
|\ \ \ | |/ / |/| | | support unofficial S3 regions | |||||
| * | | support unofficial S3 regions | Ben Burkert | 2015-12-21 | 1 | -2/+16 | |
| |/ | | | | | | | Adds support for S3 clones like Ceph. | |||||
* | | Correct mail templates to show 'You've been invited to [teamname] team' ↵ | Hjf288 | 2015-12-28 | 2 | -2/+2 | |
| | | | | | | | | rather than you've been invited when signing up | |||||
* | | Fixed TestGetFile unit test | hmhealey | 2015-12-18 | 1 | -4/+3 | |
| | | ||||||
* | | Added additional information to getFileInfo api call | hmhealey | 2015-12-18 | 1 | -26/+10 | |
|/ | ||||||
* | Some refactoring | Christopher Speller | 2015-12-16 | 2 | -20/+85 | |
| | ||||||
* | Merge pull request #1729 from hmhealey/plt886 | Joram Wilander | 2015-12-15 | 1 | -0/+6 | |
|\ | | | | | PLT-886 Add additional max file size checks | |||||
| * | Added serverside file size check for post attachments | hmhealey | 2015-12-15 | 1 | -0/+6 | |
| | | ||||||
* | | Merge pull request #1726 from mattermost/PLT-1447 | Christopher Speller | 2015-12-15 | 1 | -2/+2 | |
|\ \ | | | | | | | PLT-1447 fixing sending name in push notifications | |||||
| * | | PLT-1447 fixing sending name in push notifications | =Corey Hulen | 2015-12-14 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge branch 'release-1.3' | Christopher Speller | 2015-12-14 | 1 | -0/+2 | |
|\ \ | |/ |/| | ||||||
| * | Fixing cacheing issue on IE and Edge | Christopher Speller | 2015-12-14 | 1 | -0/+2 | |
| | | ||||||
* | | 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 #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 | |
| |/ / | ||||||
* / / | Updated emails in unit tests to include '+' | Reed Garmsen | 2015-12-13 | 11 | -121/+121 | |
|/ / | ||||||
* | | 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 #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 3 | -1/+110 | |
|\ \ | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists | |||||
| * | | Moved logic for making direct channels visible to both members on post to ↵ | hmhealey | 2015-12-07 | 2 | -0/+107 | |
| | | | | | | | | | | | | the server | |||||
| * | | Added preference_changed web socket event | hmhealey | 2015-12-07 | 1 | -1/+3 | |
| | | | ||||||
* | | | Fixed issue with Team Settings modal saving items instead of cancelling; ↵ | Reed Garmsen | 2015-12-10 | 2 | -2/+2 | |
| | | | | | | | | | | | | changed remaining copyrights | |||||
* | | | Merge pull request #1648 from npcode/notification-email-local-timezone | Christopher Speller | 2015-12-10 | 2 | -3/+3 | |
|\ \ \ | |_|/ |/| | | Use local timezone for notification email | |||||
| * | | Use local timezone for notification email | Yi EungJun | 2015-12-08 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | Local timezone is better default than UTC because it is common that all users of a mattermost server live near the server. | |||||
* | | | fixing typo | =Corey Hulen | 2015-12-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | Updating the push message | =Corey Hulen | 2015-12-08 | 1 | -1/+5 | |
| | | | ||||||
* | | | Merge pull request #1646 from mattermost/PLT-1302 | Joram Wilander | 2015-12-08 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | PLT-1302 fixing hiding email adddress | |||||
| * | | | PLT-1302 fixing hiding email adddress | =Corey Hulen | 2015-12-07 | 1 | -4/+4 | |
| | |/ | |/| | ||||||
* / | | Return 100 channel users in extra info call | JoramWilander | 2015-12-07 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1629 from mattermost/PLT-1369 | Christopher Speller | 2015-12-07 | 1 | -1/+2 | |
|\ \ | | | | | | | PLT-1369 send core message | |||||
| * | | Fixing message | =Corey Hulen | 2015-12-04 | 1 | -23/+1 | |
| | | | ||||||
| * | | PLT-1369 send core message | =Corey Hulen | 2015-12-04 | 1 | -1/+24 | |
| | | | ||||||
* | | | Merge pull request #1616 from florianorben/PLT-1380 | Christopher Speller | 2015-12-07 | 1 | -1/+33 | |
|\ \ \ | |/ / |/| | | PLT-1380: Post system message when user updates channel header | |||||
| * | | PLT-1380: Post system message when user updates channel header | Florian Orben | 2015-12-04 | 1 | -1/+33 | |
| | | | ||||||
* | | | Merge pull request #1613 from florianorben/PLT-1326 | Corey Hulen | 2015-12-04 | 1 | -1/+1 | |
|\| | | | | | | | | PLT-1326: Enable channel posts of type join or leave not trigger unread notifications | |||||
| * | | PLT-1326: Enable channel posts of type join or leave not trigger unread ↵ | Florian Orben | 2015-12-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | notifications | |||||
* | | | Remove <> link replacement | JoramWilander | 2015-12-04 | 1 | -4/+0 | |
| | | | ||||||
* | | | Convert links in Slack attachment text to Markdown format | JoramWilander | 2015-12-03 | 1 | -1/+16 | |
|/ / |