summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Implement OAuth2 service provider functionality.JoramWilander2015-09-169-73/+642
|
* PLT-93 cleaing up client side configs=Corey Hulen2015-09-151-0/+9
|
* Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-143-6/+12
|\
| * Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-142-4/+10
| |\ | | | | | | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
| | * Allowing underscores in channel names. Added conversion of some slack ↵Christopher Speller2015-09-142-4/+10
| | | | | | | | | | | | channel names into valid mattermost names.
| * | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN=Corey Hulen2015-09-111-2/+2
| | |
* | | PLT-12 adding log viewer=Corey Hulen2015-09-101-0/+9
|/ /
* | merging=Corey Hulen2015-09-104-5/+19
|\|
| * Removed pointless attempt to verify a new user's usernamehmhealey2015-09-091-5/+0
| |
| * Adding ability to export data from mattermostChristopher Speller2015-09-044-0/+19
| |
* | Adding back admin unit test=Corey Hulen2015-09-102-3/+3
| |
* | PLT-12 UI framework for admin console=Corey Hulen2015-09-101-0/+4
| |
* | Adding unit tests for cmd line=Corey Hulen2015-09-043-4/+13
| |
* | Adding cmd line options=Corey Hulen2015-09-042-1/+56
|/
* 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
|\ \ | |/ |/| Mm 1848 Add /echo command
| * Created a /echo command that will post on the user's behalf afternickago2015-08-251-1/+1
| | | | | | | | a specified amount of time
* | Remove Google as a SSO service.JoramWilander2015-08-281-56/+0
| |
* | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-288-88/+209
|\ \ | | | | | | MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
| * | Added the ability to create a team with SSO services and added the ability ↵JoramWilander2015-08-288-88/+209
| | | | | | | | | | | | to turn off email sign up.
* | | 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
|\ | | | | MM-1281 Track channel creator in DB and show in channel intro message
| * 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
|\ | | | | MM-1700 don't pull all channel data all the time
| * 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 ↵JoramWilander2015-08-111-3/+11
| | | | | | | | channel update
| * added getChannelCounts service and refactored the client to more ↵JoramWilander2015-08-111-0/+46
| | | | | | | | intelligently pull channel data
| * added getChannel api service and use that over getChannels where appropriate ↵JoramWilander2015-08-112-0/+52
| | | | | | | | on client
* | 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 ↵hmhealey2015-08-101-0/+1
| | | | fix issues with duplicate file names
* Merge pull request #278 from mattermost/mm-1702Corey Hulen2015-08-022-3/+13
|\ | | | | MM-1702 Adding etag to channel extra_info api call.
| * 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
| |\ | | | | | | MM-1295 Removal from a channel occurs in real time
| | * When removed from a channel, user is sent back to town square and thatnickago2015-07-271-0/+1
| | | | | | | | | | | | channel is removed from their sidebar
| * | 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
|/