Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #697 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 9 | -18/+18 |
|\ | | | | | PLT-93 Fixing broken email templates | ||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+0 |
| | | |||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+1 |
| | | |||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 10 | -19/+20 |
| | | |||||
* | | Merge pull request #696 from mattermost/PLT-23 | Christopher Speller | 2015-09-16 | 1 | -7/+17 |
|\ \ | | | | | | | PLT-23 error.html pulls files from static | ||||
| * | | PLT-23 error.html pulls files from static | =Corey Hulen | 2015-09-16 | 1 | -3/+3 |
| | | | |||||
| * | | PLT-23 error.html pulls files from static | =Corey Hulen | 2015-09-16 | 1 | -5/+15 |
| |/ | |||||
* / | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 11 | -71/+408 |
|/ | |||||
* | Adding config file timestamp to X-Version header | =Corey Hulen | 2015-09-16 | 1 | -1/+2 |
| | |||||
* | Removing old config stuff | =Corey Hulen | 2015-09-15 | 2 | -35/+0 |
| | |||||
* | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 24 | -71/+101 |
| | |||||
* | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 8 | -17/+30 |
|\ | |||||
| * | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -0/+1 |
| |\ | | | | | | | Blank Content-Type for file GETs. | ||||
| | * | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 1 | -1/+10 |
| |\ \ | | |/ | |/| | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names. | ||||
| | * | Allowing underscores in channel names. Added conversion of some slack ↵ | Christopher Speller | 2015-09-14 | 1 | -1/+10 |
| | | | | | | | | | | | | channel names into valid mattermost names. | ||||
| * | | Merge pull request #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 7 | -61/+91 |
| |\ \ | | |/ | |/| | PLT-12: Work in progress for Admin Console UI | ||||
| | * | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN | =Corey Hulen | 2015-09-11 | 6 | -16/+16 |
| | | | |||||
| * | | Set default Content-Type to application/json for all API requests | JoramWilander | 2015-09-12 | 1 | -0/+3 |
| | | | |||||
* | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 4 | -0/+97 |
| |/ |/| | |||||
* | | merging | =Corey Hulen | 2015-09-10 | 4 | -4/+356 |
|\| | |||||
| * | Removed pointless attempt to verify a new user's username | hmhealey | 2015-09-09 | 1 | -4/+1 |
| | | |||||
| * | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 3 | -0/+355 |
| | | |||||
* | | Fixing unit test | =Corey Hulen | 2015-09-10 | 1 | -4/+4 |
| | | |||||
* | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 2 | -15/+19 |
| | | |||||
* | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 1 | -1/+1 |
| | | |||||
* | | Adding cmd line options | =Corey Hulen | 2015-09-04 | 5 | -52/+78 |
|/ | |||||
* | Updating help text to fix typo | mishimi | 2015-09-02 | 1 | -1/+1 |
| | |||||
* | Merging release branch 'release-0.7.0' | Christopher Speller | 2015-09-01 | 3 | -10/+4 |
|\ | |||||
| * | MM-2056 fixes problem with creating team | =Corey Hulen | 2015-08-31 | 3 | -10/+4 |
| | | |||||
* | | Merge pull request #520 from zackify/master | Joram Wilander | 2015-08-31 | 1 | -1/+1 |
|\ \ | | | | | | | Fix TLS warning due to insecure content | ||||
| * | | fixed ssl warning on signup page | Zach Silveira | 2015-08-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #523 from mattermost/it33-patch-6-1 | Christopher Speller | 2015-08-31 | 1 | -1/+1 |
|\ \ | | | | | | | Updating text on "Find Teams" email | ||||
| * | | Updating text on "Find Teams" email | it33 | 2015-08-30 | 1 | -1/+1 |
| |/ | | | | | Making it clear that user requested email. | ||||
* | | Merge pull request #522 from mattermost/it33-patch-1 | Christopher Speller | 2015-08-31 | 1 | -1/+1 |
|\ \ | | | | | | | Updated marketing text on email sign-up | ||||
| * | | Updated marketing text on email sign-up | it33 | 2015-08-30 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #468 from nickago/MM-1848 | Christopher Speller | 2015-08-31 | 2 | -60/+89 |
|\ \ | |/ |/| | Mm 1848 Add /echo command | ||||
| * | Added unit tests | nickago | 2015-08-26 | 1 | -1/+36 |
| | | |||||
| * | Added semaphore for resource allocation to echo command | nickago | 2015-08-25 | 1 | -1/+20 |
| | | |||||
| * | Created a /echo command that will post on the user's behalf after | nickago | 2015-08-25 | 1 | -63/+38 |
| | | | | | | | | a specified amount of time | ||||
* | | Merge pull request #496 from mattermost/mm-2015 | Christopher Speller | 2015-08-28 | 2 | -1/+95 |
|\ \ | | | | | | | MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up. | ||||
| * | | Added the ability to create a team with SSO services and added the ability ↵ | JoramWilander | 2015-08-28 | 2 | -1/+95 |
| | | | | | | | | | | | | to turn off email sign up. | ||||
* | | | Merge pull request #511 from mattermost/MM-1698 | Christopher Speller | 2015-08-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | MM-1698 Fixes upgrade db from 0.6 for postgres | ||||
| * | | | Fixing bug where the err msg gets gobbled up | =Corey Hulen | 2015-08-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #486 from asubset/master | Joram Wilander | 2015-08-28 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix getParentsPosts() query | ||||
| * | | | fix GetParentPosts() query | Jason Rossman | 2015-08-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | MM-2033 fixes img showing infinity progress | =Corey Hulen | 2015-08-27 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #474 from mattermost/PL-4 | Christopher Speller | 2015-08-27 | 1 | -0/+42 |
|\ \ \ | | | | | | | | | Fixes PL-1 and PL-3 Restricting team creation | ||||
| * | | | Fixes PL-3 Restrict team creation to specific domains | =Corey Hulen | 2015-08-25 | 1 | -9/+36 |
| | | | | |||||
| * | | | Fixes PL-1 added ability to disable team creation | =Corey Hulen | 2015-08-25 | 1 | -0/+15 |
| |/ / |