120 Commits

Author	SHA1	Message	Date
Jack	503501ab3b	rebase	2015-09-28 08:14:57 -07:00
=Corey Hulen	8ad9a88bda	Fixing merge	2015-09-24 12:12:27 -07:00
=Corey Hulen	57269dcaf4	Removing default theme no longer in use	2015-09-24 11:08:39 -07:00
=Corey Hulen	a374419ad5	Removing old valet crud	2015-09-24 10:52:32 -07:00
Jack	396a535f10	use github.com/disintegration/imaging	2015-09-23 15:57:49 -07:00
=Corey Hulen	7f3bfdbe0c	Fixing merge	2015-09-23 14:38:34 -07:00
=Corey Hulen	ccf2e6e4e7	Changing image settings to file settings	2015-09-23 13:47:10 -07:00
=Corey Hulen	2b5b8f95ed	Merge branch 'master' into PLT-11-email	2015-09-23 12:55:58 -07:00
=Corey Hulen	1626a6de6f	PLT-349 adding team mgt to admin console	2015-09-23 12:49:28 -07:00
JoramWilander	e4a15076f4	Implement UI theme colors.	2015-09-23 10:12:40 -04:00
=Corey Hulen	554f017327	Fixing merge conflict	2015-09-22 13:20:24 -07:00
=Corey Hulen	6e60768abe	Fixing merge conflict	2015-09-22 13:18:42 -07:00
=Corey Hulen	88e5a71e8c	Adding service settings to admin console	2015-09-22 12:12:50 -07:00
=Corey Hulen	08a3acbb44	Adding team settings to admin console	2015-09-22 01:15:41 -07:00
=Corey Hulen	f05a2c03d5	Adding SQL settings to admin console	2015-09-22 00:00:19 -07:00
=Corey Hulen	afcff9b301	Fixing unit tests	2015-09-21 20:38:31 -07:00
=Corey Hulen	e78c79b832	Adding rate limiter settings to the admin console	2015-09-21 19:01:52 -07:00
=Corey Hulen	cae5dbd245	Adding privacy to admin console	2015-09-21 18:23:10 -07:00
=Corey Hulen	0529a494ae	Adding image properties	2015-09-21 17:34:13 -07:00
=Corey Hulen	ed9a2da83b	Adding email to admin console	2015-09-21 15:11:56 -07:00
JoramWilander	98186e5018	Implement incoming webhooks.	2015-09-21 14:22:23 -04:00
Harrison Healey	679e20aa4b	Merge pull request #709 from mattermost/PLT-11 ... PLT-11 adding config for logs to UI	2015-09-18 18:11:01 -04:00
Corey Hulen	0ddabaf8de	Merge pull request #717 from mattermost/fix-loadtest ... Fix authentication for server load tests.	2015-09-18 09:49:49 -07:00
=Corey Hulen	cdf813f07b	merging	2015-09-18 09:25:47 -07:00
JoramWilander	c42a547b4f	Fix authentication for loadtests.	2015-09-18 12:16:53 -04:00
=Corey Hulen	44714dfcb1	PLT-11 Adding ability to save config file	2015-09-17 21:00:59 -07:00
=Corey Hulen	522e4934c9	fixing versioning	2015-09-17 13:06:25 -07:00
=Corey Hulen	af4deb2369	Making changes to versioning	2015-09-17 13:01:40 -07:00
=Corey Hulen	9b5198c69c	Merge branch 'master' into PLT-92	2015-09-17 09:21:56 -07:00
Christopher Speller	eb4b80a484	Adding gofmt to travis build	2015-09-17 09:07:37 -04:00
=Corey Hulen	51c3445e69	Fixing postgres issue and bumping version number	2015-09-16 21:16:07 -07:00
=Corey Hulen	abda39b652	Adding database schema version	2015-09-16 19:59:57 -07:00
=Corey Hulen	cef7a1aae4	PLT-92 Adding server side versioning to the binary	2015-09-16 17:37:11 -07:00
JoramWilander	47e6a33a45	Implement OAuth2 service provider functionality.	2015-09-16 15:49:12 -04:00
=Corey Hulen	b2a679c25d	PLT-93 cleaing up client side configs	2015-09-15 18:59:14 -07:00
=Corey Hulen	3bd350dcaf	Merge branch 'master' into PLT-12-log	2015-09-14 16:59:24 -07: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
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
=Corey Hulen	e5e88d1604	Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN	2015-09-11 09:39:28 -07:00
=Corey Hulen	e06e292be7	PLT-12 adding log viewer	2015-09-10 18:32:22 -07:00
=Corey Hulen	83b04181da	merging	2015-09-10 15:15:04 -07:00
=Corey Hulen	616593f434	Adding back admin unit test	2015-09-10 15:05:19 -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
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
Christopher Speller	2384fe0c7b	Merge pull request #468 from nickago/MM-1848 ... Mm 1848 Add /echo command	2015-08-31 09:03:04 -04:00