245 Commits

Author	SHA1	Message	Date
Harrison Healey	c447db6e78	Merge pull request #679 from mattermost/fix-file-content-type ... Blank Content-Type for file GETs.	2015-09-14 16:17:22 -04:00
Joram Wilander	125b7dc71b	Merge pull request #677 from mattermost/plt-50 ... PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.	2015-09-14 14:32:15 -04:00
JoramWilander	0654b0c06b	Blank Content-Type for file GETs.	2015-09-14 14:18:01 -04:00
Christopher Speller	7b3c2d6d85	Allowing underscores in channel names. Added conversion of some slack channel names into valid mattermost names.	2015-09-14 12:18:38 -04:00
Christopher Speller	c3742aef71	Merge pull request #648 from mattermost/PLT-12 ... PLT-12: Work in progress for Admin Console UI	2015-09-14 08:58:53 -04:00
JoramWilander	27e59c32f9	Set default Content-Type to application/json for all API requests	2015-09-12 10:26:24 -04:00
=Corey Hulen	e5e88d1604	Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN	2015-09-11 09:39:28 -07:00
=Corey Hulen	83b04181da	merging	2015-09-10 15:15:04 -07:00
=Corey Hulen	1108ac5306	Fixing unit test	2015-09-10 15:10:57 -07:00
=Corey Hulen	8bf35081c8	PLT-12 UI framework for admin console	2015-09-10 14:56:37 -07:00
hmhealey	7a9e709bd2	Removed pointless attempt to verify a new user's username	2015-09-09 18:42:28 -04:00
=Corey Hulen	e54d0da392	Adding unit tests for cmd line	2015-09-04 16:56:18 -07:00
=Corey Hulen	58d0d9afd2	Adding cmd line options	2015-09-04 11:59:10 -07:00
Christopher Speller	f0fd9a9e8b	Adding ability to export data from mattermost	2015-09-04 11:11:38 -04:00
mishimi	0fc7457994	Updating help text to fix typo	2015-09-02 17:06:22 -07:00
Christopher Speller	72575ac7bd	Merging release branch 'release-0.7.0'	2015-09-01 08:49:54 -04:00
=Corey Hulen	7de7de6ad0	MM-2056 fixes problem with creating team	2015-08-31 13:33:22 -07:00
Joram Wilander	0b3db018d3	Merge pull request #520 from zackify/master ... Fix TLS warning due to insecure content	2015-08-31 15:46:26 -04:00
Christopher Speller	461f9f0546	Merge pull request #523 from mattermost/it33-patch-6-1 ... Updating text on "Find Teams" email	2015-08-31 09:04:51 -04:00
Christopher Speller	3a43966b95	Merge pull request #522 from mattermost/it33-patch-1 ... Updated marketing text on email sign-up	2015-08-31 09:04:45 -04:00
Christopher Speller	2384fe0c7b	Merge pull request #468 from nickago/MM-1848 ... Mm 1848 Add /echo command	2015-08-31 09:03:04 -04:00
it33	de4a9bdb59	Updating text on "Find Teams" email ... Making it clear that user requested email.	2015-08-30 12:37:56 -07:00
it33	a2497ba4c4	Updated marketing text on email sign-up	2015-08-30 12:31:41 -07:00
Zach Silveira	daf6815120	fixed ssl warning on signup page	2015-08-29 20:50:41 -07:00
Christopher Speller	75af5d4536	Merge pull request #496 from mattermost/mm-2015 ... MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.	2015-08-28 09:14:37 -04:00
JoramWilander	f5fec3a157	Added the ability to create a team with SSO services and added the ability to turn off email sign up.	2015-08-28 08:37:55 -04:00
Christopher Speller	d107b392a6	Merge pull request #511 from mattermost/MM-1698 ... MM-1698 Fixes upgrade db from 0.6 for postgres	2015-08-28 08:26:33 -04:00
Joram Wilander	2bc6451e39	Merge pull request #486 from asubset/master ... Fix getParentsPosts() query	2015-08-28 07:51:17 -04:00
=Corey Hulen	f96513809f	Fixing bug where the err msg gets gobbled up	2015-08-27 16:58:58 -07:00
Jason Rossman	879fa084c9	fix GetParentPosts() query	2015-08-27 12:45:47 -06:00
=Corey Hulen	30f22ec9c7	MM-2033 fixes img showing infinity progress	2015-08-27 11:05:18 -07:00
Christopher Speller	305a74c78d	Merge pull request #474 from mattermost/PL-4 ... Fixes PL-1 and PL-3 Restricting team creation	2015-08-27 12:09:35 -04:00
Corey Hulen	d3093028cf	Merge pull request #484 from mattermost/mm-1994 ... MM-1994 Improvements to import UI	2015-08-27 08:32:09 -07:00
Christopher Speller	e1c09605dc	Merge pull request #469 from mattermost/mm-1699 ... MM-1699 Refactored post handling/updating on both the client and server	2015-08-27 11:22:19 -04:00
Christopher Speller	ea4beb7c45	Merge pull request #487 from rgarmsen2295/mm-2000 ... MM-2000 Added links to the teams listed in the 'Find your teams' email	2015-08-27 10:02:19 -04:00
JoramWilander	041d89b85a	Refactored post handling/updating on both the client and server.	2015-08-27 08:21:26 -04:00
Joram Wilander	232fd59ef4	Merge pull request #470 from nickago/MM-1945 ... MM-1945 Added a link to error page that returns users to the root page	2015-08-27 08:18:59 -04:00
Reed Garmsen	841aef34f5	Added links to the teams listed in the 'Find your teams' email	2015-08-26 15:02:34 -07:00
Christopher Speller	1ed6718dd9	Improvements to import UI	2015-08-26 15:24:17 -04:00
nickago	7578204352	Added unit tests	2015-08-26 07:21:37 -07:00
=Corey Hulen	67bc12e4b7	Fixes PL-3 Restrict team creation to specific domains	2015-08-25 14:40:16 -07:00
=Corey Hulen	d132de4400	Fixes PL-1 added ability to disable team creation	2015-08-25 14:28:02 -07:00
nickago	6ac39ef687	Added a link to error page that returns users to the root page	2015-08-25 11:06:11 -07:00
nickago	4a0eeba237	Added semaphore for resource allocation to echo command	2015-08-25 09:19:07 -07:00
nickago	19a48acfc6	Created a /echo command that will post on the user's behalf after ... a specified amount of time	2015-08-25 07:17:10 -07:00
=Corey Hulen	64b179ab0e	Fixes mm-1912 move get file info into its own web service call	2015-08-24 15:03:52 -07:00
=Corey Hulen	e4b66c3ff4	Fixing audit log to wait for confirm	2015-08-20 15:04:37 -07:00
=Corey Hulen	3f0ec24dc1	Fixing build	2015-08-20 14:20:39 -07:00
Christopher Speller	65f1d0297e	Merge pull request #406 from mattermost/mm-1281 ... MM-1281 Track channel creator in DB and show in channel intro message	2015-08-19 14:15:01 -04:00
Joram Wilander	5f43945805	Merge pull request #394 from mattermost/mm-1410 ... MM-1410 Initial implementaiton of import from Slack	2015-08-19 12:19:02 -04:00