summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Expand)AuthorAgeFilesLines
* Merging release branch 'release-0.7.0'Christopher Speller2015-09-011-1/+0
|\
| * MM-2056 fixes problem with creating team=Corey Hulen2015-08-311-1/+0
* | Merge pull request #468 from nickago/MM-1848Christopher Speller2015-08-311-1/+1
|\ \ | |/ |/|
| * Created a /echo command that will post on the user's behalf afternickago2015-08-251-1/+1
* | Remove Google as a SSO service.JoramWilander2015-08-281-56/+0
* | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-288-88/+209
|\ \
| * | Added the ability to create a team with SSO services and added the ability to...JoramWilander2015-08-288-88/+209
* | | Force fresh timestamp for CreateAt field of Posts before saving to DB.JoramWilander2015-08-271-3/+1
|/ /
* | Refactored post handling/updating on both the client and server.JoramWilander2015-08-271-0/+9
* | Fixes mm-1912 move get file info into its own web service call=Corey Hulen2015-08-241-0/+18
|/
* Fixing build=Corey Hulen2015-08-201-0/+2
* Update etag version for the addition of CreatorId field to channelsJoramWilander2015-08-201-1/+1
* Merge pull request #406 from mattermost/mm-1281Christopher Speller2015-08-191-0/+5
|\
| * Track channel creator in DB and show in channel intro message.JoramWilander2015-08-191-0/+5
* | Implemention of slack import feature.Christopher Speller2015-08-191-1/+3
|/
* adds predictive posting on the clientJoramWilander2015-08-181-15/+16
* added google sign-in functionality to the client, with minor model modificationsJoramWilander2015-08-141-5/+11
* initial server implementation for using google as a single-sign-on oauth serviceJoramWilander2015-08-143-56/+123
* Merge pull request #365 from mattermost/mm-1700Christopher Speller2015-08-143-0/+124
|\
| * fixed channel counts etag to only update when appropriateJoramWilander2015-08-111-3/+12
| * added api unit test for GetChannelCountsJoramWilander2015-08-111-0/+9
| * incorporate channel updateAt into channel counts and pull channel data on cha...JoramWilander2015-08-111-3/+11
| * added getChannelCounts service and refactored the client to more intelligentl...JoramWilander2015-08-111-0/+46
| * added getChannel api service and use that over getChannels where appropriate ...JoramWilander2015-08-112-0/+52
* | Fixed typonickago2015-08-121-1/+1
* | Added server side validation of jpegs as imagesnickago2015-08-111-2/+2
|/
* Changed post drafts to maintain a store a unique id for each file upload to f...hmhealey2015-08-101-0/+1
* Merge pull request #278 from mattermost/mm-1702Corey Hulen2015-08-022-3/+13
|\
| * Adding etag to channel extra_info api call.Christopher Speller2015-07-292-3/+13
* | Merge branch 'master' into mm-1355=Corey Hulen2015-07-293-3/+4
|\|
| * Added non-capturing group to regex used for matching local file urlshmhealey2015-07-281-1/+1
| * Allow files without extensions to be uploaded as attachments to postshmhealey2015-07-281-1/+1
| * Merge pull request #239 from nickago/MM-1295Christopher Speller2015-07-281-0/+1
| |\
| | * When removed from a channel, user is sent back to town square and thatnickago2015-07-271-0/+1
| * | Fixes mm-1502 changing session age to 30 days=Corey Hulen2015-07-271-2/+2
| |/
* / Fixes mm-1355 adds rate limiting apis=Corey Hulen2015-07-291-0/+1
|/
* Merge branch 'master' into mm-1420=Corey Hulen2015-07-232-12/+114
|\
| * add changes from team reviewJoramWilander2015-07-221-1/+1
| * made oauth architecture more generalizedJoramWilander2015-07-221-0/+4
| * inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-222-12/+110
* | Merge branch 'master' into mm-1420=Corey Hulen2015-07-222-2/+2
|\|
| * fixed unit tests to work with team domain changes and update partial url rege...JoramWilander2015-07-212-2/+2
* | fixing merge conflicts=Corey Hulen2015-07-219-44/+135
|\|
| * Changing the way we mattermost handles URLs. team.domain.com becomes domain.c...Christopher Speller2015-07-206-33/+33
| * Use a user's full name as their display name if a nickname hasn't been specifiedhmhealey2015-07-172-1/+45
| * Unify all locations where we determine a user's display named based off of th...hmhealey2015-07-172-0/+21
| * Add tests to check if a User's first/last name are validhmhealey2015-07-171-0/+17
| * Sanitize FirstName and LastName fields of an object instead of the nickname w...hmhealey2015-07-172-4/+2
| * Added FirstName and LastName fields to User object and attempt to populate th...hmhealey2015-07-171-0/+10
| * Renamed FullName column in database to Nickname. Renamed all serverside refer...hmhealey2015-07-173-9/+9