Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | ||||||
| * | made oauth architecture more generalized | JoramWilander | 2015-07-22 | 1 | -0/+4 | |
| | | ||||||
| * | inital implementation of using GitLab OAuth2 provider for signup/login | JoramWilander | 2015-07-22 | 2 | -12/+110 | |
| | | ||||||
* | | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-22 | 2 | -2/+2 | |
|\| | ||||||
| * | fixed unit tests to work with team domain changes and update partial url ↵ | JoramWilander | 2015-07-21 | 2 | -2/+2 | |
| | | | | | | | | regex for files | |||||
* | | fixing merge conflicts | =Corey Hulen | 2015-07-21 | 9 | -44/+135 | |
|\| | ||||||
| * | Changing the way we mattermost handles URLs. team.domain.com becomes ↵ | Christopher Speller | 2015-07-20 | 6 | -33/+33 | |
| | | | | | | | | | | | | | | 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 | |||||
| * | Use a user's full name as their display name if a nickname hasn't been specified | hmhealey | 2015-07-17 | 2 | -1/+45 | |
| | | ||||||
| * | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 2 | -0/+21 | |
| | | | | | | | | their nickname/username into a helper function | |||||
| * | Add tests to check if a User's first/last name are valid | hmhealey | 2015-07-17 | 1 | -0/+17 | |
| | | ||||||
| * | Sanitize FirstName and LastName fields of an object instead of the nickname ↵ | hmhealey | 2015-07-17 | 2 | -4/+2 | |
| | | | | | | | | when ShowFullName is set to false | |||||
| * | Added FirstName and LastName fields to User object and attempt to populate ↵ | hmhealey | 2015-07-17 | 1 | -0/+10 | |
| | | | | | | | | them from the FullName/Nickname field | |||||
| * | Renamed FullName column in database to Nickname. Renamed all serverside ↵ | hmhealey | 2015-07-17 | 3 | -9/+9 | |
| | | | | | | | | references from FullName to Nickname. | |||||
| * | Added last updated for pictures | nickago | 2015-07-16 | 1 | -0/+1 | |
| | | ||||||
* | | minor tweaks to make sure mysql still runs | =Corey Hulen | 2015-07-12 | 1 | -0/+2 | |
|/ | ||||||
* | Minor formatting change | nickago | 2015-07-09 | 1 | -1/+1 | |
| | ||||||
* | Server now notifies users they have been added to a new channel | nickago | 2015-07-09 | 1 | -0/+1 | |
| | ||||||
* | Merge pull request #150 from mattermost/mm-895 | Joram Wilander | 2015-07-08 | 1 | -0/+1 | |
|\ | | | | | MM-895 Reorganization of browser storage. | |||||
| * | Adding comments to change versions in sync | Christopher Speller | 2015-07-08 | 1 | -0/+1 | |
| | | ||||||
* | | Merge pull request #136 from mattermost/code-review | Joram Wilander | 2015-07-08 | 1 | -1/+1 | |
|\ \ | | | | | | | team code review | |||||
| * | | team code review | =Corey Hulen | 2015-07-06 | 1 | -1/+1 | |
| |/ | ||||||
* / | Add a post type for user joined/left messages and don't flag a channel as ↵ | hmhealey | 2015-07-07 | 1 | -2/+3 | |
|/ | | | | unread when one of those is automatically posted | |||||
* | Changed offline timeout to 1 mintue | nickago | 2015-07-01 | 1 | -1/+1 | |
| | ||||||
* | Added the ability to have hashtags with dashes in them | nickago | 2015-06-30 | 1 | -1/+1 | |
| | ||||||
* | added mentioned username to default mention keys | JoramWilander | 2015-06-30 | 1 | -1/+1 | |
| | ||||||
* | added team-wide and channel-wide mentions | JoramWilander | 2015-06-29 | 1 | -4/+7 | |
| | ||||||
* | update etag version | JoramWilander | 2015-06-29 | 1 | -1/+1 | |
| | ||||||
* | fixes mm-1316 improves channel notifications UI and updates channellist etag | JoramWilander | 2015-06-29 | 2 | -0/+11 | |
| | ||||||
* | Merge pull request #27 from mattermost/mm-1240 | Corey Hulen | 2015-06-25 | 2 | -0/+19 | |
|\ | | | | | fixes mm-1240 adds ability to turn valet feature on | |||||
| * | added unit tests for new team API services | JoramWilander | 2015-06-18 | 1 | -0/+18 | |
| | | ||||||
| * | move valet feature switch to DB from config | JoramWilander | 2015-06-17 | 1 | -0/+1 | |
| | | ||||||
| * | first commit | =Corey Hulen | 2015-06-14 | 32 | -0/+3086 | |
| | ||||||
* | added slashes to split map | JoramWilander | 2015-06-19 | 1 | -1/+1 | |
| | ||||||
* | improved split function | JoramWilander | 2015-06-19 | 1 | -0/+2 | |
| | ||||||
* | fix for dockerhost HELIUM | =Corey Hulen | 2015-06-18 | 1 | -0/+1 | |
| | ||||||
* | first commit | =Corey Hulen | 2015-06-14 | 32 | -0/+3086 | |