Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 3 | -6/+12 |
|\ | |||||
| * | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 2 | -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 Speller | 2015-09-14 | 2 | -4/+10 |
| | | | | | | | | | | | | channel names into valid mattermost names. | ||||
| * | | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN | =Corey Hulen | 2015-09-11 | 1 | -2/+2 |
| | | | |||||
* | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 1 | -0/+9 |
|/ / | |||||
* | | merging | =Corey Hulen | 2015-09-10 | 4 | -5/+19 |
|\| | |||||
| * | Removed pointless attempt to verify a new user's username | hmhealey | 2015-09-09 | 1 | -5/+0 |
| | | |||||
| * | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 4 | -0/+19 |
| | | |||||
* | | Adding back admin unit test | =Corey Hulen | 2015-09-10 | 2 | -3/+3 |
| | | |||||
* | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 1 | -0/+4 |
| | | |||||
* | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 3 | -4/+13 |
| | | |||||
* | | Adding cmd line options | =Corey Hulen | 2015-09-04 | 2 | -1/+56 |
|/ | |||||
* | Merging release branch 'release-0.7.0' | Christopher Speller | 2015-09-01 | 1 | -1/+0 |
|\ | |||||
| * | MM-2056 fixes problem with creating team | =Corey Hulen | 2015-08-31 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #468 from nickago/MM-1848 | Christopher Speller | 2015-08-31 | 1 | -1/+1 |
|\ \ | |/ |/| | Mm 1848 Add /echo command | ||||
| * | Created a /echo command that will post on the user's behalf after | nickago | 2015-08-25 | 1 | -1/+1 |
| | | | | | | | | a specified amount of time | ||||
* | | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 1 | -56/+0 |
| | | |||||
* | | Merge pull request #496 from mattermost/mm-2015 | Christopher Speller | 2015-08-28 | 8 | -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 ↵ | JoramWilander | 2015-08-28 | 8 | -88/+209 |
| | | | | | | | | | | | | to turn off email sign up. | ||||
* | | | Force fresh timestamp for CreateAt field of Posts before saving to DB. | JoramWilander | 2015-08-27 | 1 | -3/+1 |
|/ / | |||||
* | | Refactored post handling/updating on both the client and server. | JoramWilander | 2015-08-27 | 1 | -0/+9 |
| | | |||||
* | | Fixes mm-1912 move get file info into its own web service call | =Corey Hulen | 2015-08-24 | 1 | -0/+18 |
|/ | |||||
* | Fixing build | =Corey Hulen | 2015-08-20 | 1 | -0/+2 |
| | |||||
* | Update etag version for the addition of CreatorId field to channels | JoramWilander | 2015-08-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #406 from mattermost/mm-1281 | Christopher Speller | 2015-08-19 | 1 | -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. | JoramWilander | 2015-08-19 | 1 | -0/+5 |
| | | |||||
* | | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 1 | -1/+3 |
|/ | |||||
* | adds predictive posting on the client | JoramWilander | 2015-08-18 | 1 | -15/+16 |
| | |||||
* | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 1 | -5/+11 |
| | |||||
* | initial server implementation for using google as a single-sign-on oauth service | JoramWilander | 2015-08-14 | 3 | -56/+123 |
| | |||||
* | Merge pull request #365 from mattermost/mm-1700 | Christopher Speller | 2015-08-14 | 3 | -0/+124 |
|\ | | | | | MM-1700 don't pull all channel data all the time | ||||
| * | fixed channel counts etag to only update when appropriate | JoramWilander | 2015-08-11 | 1 | -3/+12 |
| | | |||||
| * | added api unit test for GetChannelCounts | JoramWilander | 2015-08-11 | 1 | -0/+9 |
| | | |||||
| * | incorporate channel updateAt into channel counts and pull channel data on ↵ | JoramWilander | 2015-08-11 | 1 | -3/+11 |
| | | | | | | | | channel update | ||||
| * | added getChannelCounts service and refactored the client to more ↵ | JoramWilander | 2015-08-11 | 1 | -0/+46 |
| | | | | | | | | intelligently pull channel data | ||||
| * | added getChannel api service and use that over getChannels where appropriate ↵ | JoramWilander | 2015-08-11 | 2 | -0/+52 |
| | | | | | | | | on client | ||||
* | | Fixed typo | nickago | 2015-08-12 | 1 | -1/+1 |
| | | |||||
* | | Added server side validation of jpegs as images | nickago | 2015-08-11 | 1 | -2/+2 |
|/ | |||||
* | Changed post drafts to maintain a store a unique id for each file upload to ↵ | hmhealey | 2015-08-10 | 1 | -0/+1 |
| | | | | fix issues with duplicate file names | ||||
* | Merge pull request #278 from mattermost/mm-1702 | Corey Hulen | 2015-08-02 | 2 | -3/+13 |
|\ | | | | | MM-1702 Adding etag to channel extra_info api call. | ||||
| * | Adding etag to channel extra_info api call. | Christopher Speller | 2015-07-29 | 2 | -3/+13 |
| | | |||||
* | | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-29 | 3 | -3/+4 |
|\| | |||||
| * | Added non-capturing group to regex used for matching local file urls | hmhealey | 2015-07-28 | 1 | -1/+1 |
| | | |||||
| * | Allow files without extensions to be uploaded as attachments to posts | hmhealey | 2015-07-28 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #239 from nickago/MM-1295 | Christopher Speller | 2015-07-28 | 1 | -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 that | nickago | 2015-07-27 | 1 | -0/+1 |
| | | | | | | | | | | | | channel is removed from their sidebar | ||||
| * | | Fixes mm-1502 changing session age to 30 days | =Corey Hulen | 2015-07-27 | 1 | -2/+2 |
| |/ | |||||
* / | Fixes mm-1355 adds rate limiting apis | =Corey Hulen | 2015-07-29 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-23 | 2 | -12/+114 |
|\ | |||||
| * | add changes from team review | JoramWilander | 2015-07-22 | 1 | -1/+1 |
| | |