Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 7 | -45/+50 | |
| | | | | | | ||||||
* | | | | | | PLT-7 Adding translation function to context | =Corey Hulen | 2016-01-19 | 4 | -7/+9 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding server side libraries | =Corey Hulen | 2016-01-19 | 1 | -0/+3 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge branch 'master' into fix-droid | =Corey Hulen | 2016-01-14 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Fix old l4g references | JoramWilander | 2016-01-14 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fixing android push | =Corey Hulen | 2016-01-14 | 1 | -3/+10 | |
|/ / / / | ||||||
* | | | | Final updates | JoramWilander | 2016-01-14 | 2 | -7/+16 | |
| | | | | ||||||
* | | | | Add some unit tests | JoramWilander | 2016-01-14 | 1 | -9/+20 | |
| | | | | ||||||
* | | | | Added license validation and settings | JoramWilander | 2016-01-14 | 4 | -6/+111 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Release 1.4 RC2 | |||||
| * | | | Support old oauth routes | JoramWilander | 2016-01-12 | 1 | -1/+1 | |
| |/ / | ||||||
* / / | Upgrade logging package | =Corey Hulen | 2016-01-11 | 19 | -19/+19 | |
|/ / | ||||||
* | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 3 | -10/+61 | |
|\ \ | |/ |/| | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | |||||
| * | Added the ability to get more channel members from getChannelExtraInfo | hmhealey | 2016-01-06 | 3 | -10/+61 | |
| | | ||||||
* | | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 2 | -5/+12 | |
|\ \ | |/ |/| | PLT-1558 adding session length to config file | |||||
| * | PLT-1558 adding session length to config file | =Corey Hulen | 2016-01-05 | 2 | -5/+12 | |
| | | ||||||
* | | Merge pull request #1816 from mattermost/PLT-1607 | Christopher Speller | 2016-01-06 | 1 | -0/+1 | |
|\ \ | | | | | | | PLT-1607 adding more debugging info for email and push notifications | |||||
| * | | PLT-1607 adding more debugging info for email and push notifications | =Corey Hulen | 2016-01-05 | 1 | -0/+1 | |
| | | | ||||||
* | | | 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 |