Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 22 | -45/+221 |
|\ | |||||
| * | Fix old l4g references | JoramWilander | 2016-01-14 | 1 | -1/+1 |
| * | 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 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | Added the ability to get more channel members from getChannelExtraInfo | hmhealey | 2016-01-06 | 3 | -10/+61 |
* | | | 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 #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 2 | -5/+12 |
|\ \ | |/ |/| | |||||
| * | 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 | =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 | =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 | =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 |
|\ | |||||
| * | 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 | 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 | Ben Burkert | 2015-12-21 | 1 | -2/+16 |
| |/ | |||||
* | | Correct mail templates to show 'You've been invited to [teamname] team' rathe... | Hjf288 | 2015-12-28 | 2 | -2/+2 |
* | | 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 |
|\ | |||||
| * | 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 | =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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | Fixed broken unsubscribe instructions | Reed Garmsen | 2015-12-11 | 12 | -135/+41 |
| |/ / |