59 Commits

Author	SHA1	Message	Date
Christopher Speller	d78ebab108	Implemention of slack import feature.	2015-08-19 08:52:49 -04:00
JoramWilander	32f7b50bb5	adds predictive posting on the client	2015-08-18 08:58:02 -04:00
JoramWilander	b704e9489b	added google sign-in functionality to the client, with minor model modifications	2015-08-14 12:38:16 -04:00
JoramWilander	e27db2ed63	initial server implementation for using google as a single-sign-on oauth service	2015-08-14 12:37:08 -04:00
Christopher Speller	a8930cbabe	Merge pull request #365 from mattermost/mm-1700 ... MM-1700 don't pull all channel data all the time	2015-08-14 08:35:19 -04:00
nickago	7a355d2f2e	Fixed typo	2015-08-12 08:05:52 -07:00
nickago	fe0b055981	Added server side validation of jpegs as images	2015-08-11 12:19:23 -07:00
JoramWilander	3f38c21796	fixed channel counts etag to only update when appropriate	2015-08-11 12:11:35 -04:00
JoramWilander	3d0133b5e8	added api unit test for GetChannelCounts	2015-08-11 12:11:35 -04:00
JoramWilander	4ec76e059c	incorporate channel updateAt into channel counts and pull channel data on channel update	2015-08-11 12:11:35 -04:00
JoramWilander	6c0fefad15	added getChannelCounts service and refactored the client to more intelligently pull channel data	2015-08-11 12:11:35 -04:00
JoramWilander	1c0ee4d2f6	added getChannel api service and use that over getChannels where appropriate on client	2015-08-11 12:09:54 -04:00
hmhealey	c9a1bf2d33	Changed post drafts to maintain a store a unique id for each file upload to fix issues with duplicate file names	2015-08-10 14:04:23 -04:00
Corey Hulen	38e44e8f61	Merge pull request #278 from mattermost/mm-1702 ... MM-1702 Adding etag to channel extra_info api call.	2015-08-02 09:17:52 -08:00
Christopher Speller	3f97e06bf8	Adding etag to channel extra_info api call.	2015-07-29 14:35:25 -04:00
=Corey Hulen	4244990bf1	Merge branch 'master' into mm-1355	2015-07-29 01:39:43 -08:00
=Corey Hulen	9677a9f717	Fixes mm-1355 adds rate limiting apis	2015-07-29 01:26:10 -08:00
hmhealey	892fe2b7b6	Added non-capturing group to regex used for matching local file urls	2015-07-28 10:10:44 -04:00
hmhealey	fbb2477643	Allow files without extensions to be uploaded as attachments to posts	2015-07-28 10:07:10 -04:00
Christopher Speller	de07cdaf29	Merge pull request #239 from nickago/MM-1295 ... MM-1295 Removal from a channel occurs in real time	2015-07-28 08:49:29 -04:00
nickago	c9459feb59	When removed from a channel, user is sent back to town square and that ... channel is removed from their sidebar	2015-07-27 14:07:23 -07:00
=Corey Hulen	4a28e6c5dc	Fixes mm-1502 changing session age to 30 days	2015-07-27 11:30:10 -08:00
=Corey Hulen	8d9449c068	Merge branch 'master' into mm-1420	2015-07-23 09:22:17 -08:00
=Corey Hulen	c277a98b5d	Merge branch 'master' into mm-1420	2015-07-22 18:05:44 -08:00
JoramWilander	41bbbbf446	add changes from team review	2015-07-22 15:05:20 -04:00
JoramWilander	03528b9619	made oauth architecture more generalized	2015-07-22 08:47:52 -04:00
JoramWilander	c39e95c7cb	inital implementation of using GitLab OAuth2 provider for signup/login	2015-07-22 08:41:53 -04:00
JoramWilander	b821d23ed7	fixed unit tests to work with team domain changes and update partial url regex for files	2015-07-21 19:23:00 -04:00
=Corey Hulen	848eeeeef4	fixing merge conflicts	2015-07-21 12:26:27 -08:00
Christopher Speller	c6fb95912b	Changing the way we mattermost handles URLs. team.domain.com becomes domain.com/team. ... Renaming team.Name to team.DisplayName and team.Domain to team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for users	2015-07-20 17:45:23 -04:00
hmhealey	1dba330146	Use a user's full name as their display name if a nickname hasn't been specified	2015-07-17 15:22:57 -04:00
hmhealey	098cbcdc21	Unify all locations where we determine a user's display named based off of their nickname/username into a helper function	2015-07-17 15:22:57 -04:00
hmhealey	abcb44089c	Add tests to check if a User's first/last name are valid	2015-07-17 15:22:57 -04:00
hmhealey	31415c8ddc	Sanitize FirstName and LastName fields of an object instead of the nickname when ShowFullName is set to false	2015-07-17 15:22:56 -04:00
hmhealey	9d8073328a	Added FirstName and LastName fields to User object and attempt to populate them from the FullName/Nickname field	2015-07-17 15:13:31 -04:00
hmhealey	c09f1b9e4e	Renamed FullName column in database to Nickname. Renamed all serverside references from FullName to Nickname.	2015-07-17 15:13:24 -04:00
nickago	139f6611d6	Added last updated for pictures	2015-07-16 08:55:37 -07:00
=Corey Hulen	af63080c0d	minor tweaks to make sure mysql still runs	2015-07-12 19:28:58 -08:00
nickago	3371f146f8	Minor formatting change	2015-07-09 12:18:43 -07:00
nickago	44000b58d9	Server now notifies users they have been added to a new channel	2015-07-09 12:05:04 -07:00
Joram Wilander	11dde6c44b	Merge pull request #150 from mattermost/mm-895 ... MM-895 Reorganization of browser storage.	2015-07-08 14:47:49 -04:00
Christopher Speller	ce5639a629	Adding comments to change versions in sync	2015-07-08 12:43:23 -04:00
Joram Wilander	3012a7f532	Merge pull request #136 from mattermost/code-review ... team code review	2015-07-08 09:07:47 -04:00
hmhealey	23e527978e	Add a post type for user joined/left messages and don't flag a channel as unread when one of those is automatically posted	2015-07-07 11:00:29 -04:00
=Corey Hulen	e3ab0a4e3d	team code review	2015-07-06 11:20:40 -08:00
nickago	233502eea8	Changed offline timeout to 1 mintue	2015-07-01 12:52:13 -07:00
nickago	bcc31b714b	Added the ability to have hashtags with dashes in them	2015-06-30 11:57:57 -07:00
JoramWilander	8be4df00b4	added mentioned username to default mention keys	2015-06-30 09:11:06 -04:00
JoramWilander	7b7e73fb92	added team-wide and channel-wide mentions	2015-06-29 14:37:59 -04:00
JoramWilander	d090f5698a	update etag version	2015-06-29 07:45:13 -04:00