309 Commits

Author	SHA1	Message	Date
=Corey Hulen	dffc5323ec	PLT-1429 Fixing code review comments	2016-02-04 08:03:42 -08:00
=Corey Hulen	4da7b0ccbd	Fixing based on feedback	2016-02-03 12:16:37 -08:00
=Corey Hulen	bdfa4715d6	Merge branch 'master' into PLT-1429	2016-02-03 10:45:58 -08:00
Christopher Speller	75f412c4be	Merge pull request #2049 from mattermost/plt-1856 ... PLT-1856 Add basic server audit tab to system console for EE	2016-02-03 08:52:18 -05:00
=Corey Hulen	581785f504	Fixing version	2016-02-02 16:24:03 -08:00
JoramWilander	d153d661db	Add basic server audit tab to system console for EE	2016-02-02 16:49:27 -05:00
Reed Garmsen	b013f02209	Added ability to sign in via username; separated email sign in and sign up config settings	2016-02-02 12:07:42 -08:00
=Corey Hulen	27586a320a	Adding loc to new command backend	2016-02-01 18:52:43 -08:00
=Corey Hulen	b4ec690051	Fixing merge	2016-02-01 14:44:17 -08:00
=Corey Hulen	2138b46f6c	PLT-1765 allowing support of 2 previous versions	2016-01-28 11:39:48 -05:00
=Corey Hulen	c50b8661ec	Fixing build	2016-01-27 11:05:46 -05:00
=Corey Hulen	dc4b71bba2	PLT-7 Removing AppError ctor	2016-01-27 10:56:15 -05:00
Christopher Speller	f0e6e7de93	Merge pull request #1993 from mattermost/PLT-1586 ... PLT-1586 adding LDAP/OAuth to iOS	2016-01-27 09:22:27 -05:00
=Corey Hulen	0dec26bb9f	Fixing version	2016-01-26 21:11:39 -05:00
=Corey Hulen	c2bc9454ce	PLT-1586 adding attach device id method	2016-01-26 20:32:24 -05:00
hmhealey	97ede2a428	Updated serverside hashtag regex to ignore more punctuation around words	2016-01-26 10:20:36 -05:00
=Corey Hulen	ea71731f83	merging	2016-01-25 11:23:55 -05:00
hmhealey	1cd25cf380	Fixed serverside errors occurring when getting files with no extension	2016-01-25 09:51:17 -05:00
Elias Nahum	f33cff21cf	PLT-7: Refactoring models to use translations (chunk 6) ... - Add spanish translations	2016-01-25 10:22:12 -03:00
Corey Hulen	1a0b12313b	Merge pull request #1956 from mattermost/plt-1779 ... PLT-1779 Add system-wide statistics page	2016-01-22 17:00:09 -06:00
=Corey Hulen	c2d98c2c1f	merging	2016-01-22 16:31:58 -06:00
JoramWilander	0d239a1a9e	Added unit test and fixed errors	2016-01-22 10:19:02 -05:00
JoramWilander	bbcf00f02e	Add create_at back to profile fields to fix analytics	2016-01-22 09:53:17 -05:00
Christopher Speller	c7faefbedc	Merge pull request #1924 from loafoe/master ... [#1923] Make Websocket ports configurable	2016-01-21 10:01:15 -05:00
=Corey Hulen	d74e2f3e11	tweaking	2016-01-20 14:53:12 -06:00
=Corey Hulen	e70428c1bd	tweak	2016-01-20 14:38:17 -06:00
=Corey Hulen	984fa7f1ca	PLT-7-server-db	2016-01-20 14:36:34 -06:00
=Corey Hulen	96f8394bf4	Fxing version	2016-01-19 22:03:53 -06:00
=Corey Hulen	8e404c1dcf	PLT-7 Adding translation function to context	2016-01-19 22:00:01 -06:00
Andy Lo-A-Foe	6faabe34e8	Optionally specify ws:// and wss:// port in config	2016-01-19 19:41:39 +01:00
=Corey Hulen	6d6cada097	Merge branch 'master' into PLT-1429	2016-01-14 09:08:13 -06:00
JoramWilander	c26edcf678	Final updates	2016-01-14 08:24:09 -05:00
JoramWilander	874d120535	Add some unit tests	2016-01-14 08:24:09 -05:00
JoramWilander	9110dd54a1	Added license validation and settings	2016-01-14 08:24:09 -05:00
Joram Wilander	691380a60a	Merge pull request #1852 from mattermost/PLT-1608 ... PLT-1608 Upgrading logging package	2016-01-12 11:29:21 -05:00
=Corey Hulen	5083a3947a	Release 1.4 rc1	2016-01-11 13:04:55 -06:00
=Corey Hulen	b1251b9393	Upgrade logging package	2016-01-11 09:12:51 -06:00
Joram Wilander	7aa7f83524	Merge pull request #1824 from hmhealey/plt1525 ... PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel	2016-01-11 06:54:55 -05:00
=Corey Hulen	b1a7c1acf1	adding different commands	2016-01-09 08:54:07 -06:00
=Corey Hulen	e1f4cc4bb0	Adding web service methods	2016-01-08 22:57:38 -06:00
=Corey Hulen	3fba8e42b1	partial fix for UI	2016-01-08 12:41:26 -06:00
=Corey Hulen	001a4448ca	PLT-1429 adding sql storage for slash commands	2016-01-06 21:09:05 -06:00
hmhealey	0e7a149982	Added the ability to get more channel members from getChannelExtraInfo	2016-01-06 18:04:24 -05:00
Harrison Healey	5bcb9f1c50	Merge pull request #1813 from mattermost/PLT-1558 ... PLT-1558 adding session length to config file	2016-01-06 16:13:10 -05:00
=Corey Hulen	f0e620a485	PLT-1485 Adding last view channel sticky	2016-01-05 14:48:05 -06:00
=Corey Hulen	214c6bc15e	Adding UI for session length settings	2016-01-05 11:46:51 -06:00
=Corey Hulen	bd4314e977	PLT-1558 adding session length to config file	2016-01-05 11:13:25 -06:00
Christopher Speller	67db3ca8ce	Merge pull request #1745 from mattermost/plt-1118 ... PLT-1118 Add ability to switch between SSO and email account	2016-01-04 15:55:51 -05:00
Christopher Speller	59a3d6e725	Merge pull request #1770 from mattermost/GIT-1766 ... GIT-1766 fixing typo	2016-01-04 07:15:13 -05:00
Christopher Speller	c44873c61b	Merge pull request #1763 from benburkert/non-s3-region ... support unofficial S3 regions	2016-01-04 07:13:38 -05:00