Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #881 from hmhealey/plt194 | Joram Wilander | 2015-10-02 | 3 | -22/+58 |
|\ | | | | | PLT-194 Changes to ChannelMember notification settings | ||||
| * | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -16/+6 |
| | | |||||
| * | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -16/+28 |
| | | |||||
| * | Removed deprecated constants related to quiet mode | hmhealey | 2015-09-30 | 1 | -3/+1 |
| | | |||||
| * | Added additional test cases and fixed existing ones for ↵ | hmhealey | 2015-09-30 | 2 | -0/+20 |
| | | | | | | | | ChannelMember.MarkUnreadLevel | ||||
| * | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 1 | -14/+25 |
| | | | | | | | | unread in the sidebar | ||||
| * | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 1 | -2/+7 |
| | | | | | | | | user's notification level | ||||
* | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-30 | 1 | -0/+4 |
|\ \ | |/ |/| | |||||
| * | Fixing some locations to use the IsTeamAdmin function which properly checks ↵ | Christopher Speller | 2015-09-30 | 1 | -0/+4 |
| | | | | | | | | for system admin permissions. | ||||
* | | PLT-404 adding basic error checking to config file. | =Corey Hulen | 2015-09-29 | 1 | -0/+92 |
| | | |||||
* | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-29 | 2 | -2/+2 |
|\| | |||||
| * | Fixing version unit test | Christopher Speller | 2015-09-28 | 1 | -1/+1 |
| | | |||||
| * | Updating dockerfiles and version.go | Christopher Speller | 2015-09-28 | 1 | -1/+1 |
| | | |||||
* | | rebase | Jack | 2015-09-28 | 4 | -21/+31 |
|\| | |||||
| * | Fixing merge | =Corey Hulen | 2015-09-24 | 1 | -1/+0 |
| |\ | |||||
| | * | Removing default theme no longer in use | =Corey Hulen | 2015-09-24 | 1 | -1/+0 |
| | | | |||||
| * | | Removing old valet crud | =Corey Hulen | 2015-09-24 | 2 | -19/+0 |
| |/ | |||||
| * | Fixing merge | =Corey Hulen | 2015-09-23 | 2 | -2/+7 |
| |\ | |||||
| * | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 2 | -1/+31 |
| | | | |||||
* | | | use github.com/disintegration/imaging | Jack | 2015-09-23 | 1 | -6/+6 |
| |/ |/| | |||||
* | | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 1 | -0/+5 |
|\ \ | |/ |/| | |||||
| * | Implement UI theme colors. | JoramWilander | 2015-09-23 | 1 | -0/+5 |
| | | |||||
* | | Fixing merge conflict | =Corey Hulen | 2015-09-22 | 1 | -1/+1 |
| | | |||||
* | | Fixing merge conflict | =Corey Hulen | 2015-09-22 | 5 | -1/+229 |
|\| | |||||
| * | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 5 | -1/+229 |
| | | |||||
* | | Adding service settings to admin console | =Corey Hulen | 2015-09-22 | 2 | -15/+12 |
| | | |||||
* | | Adding team settings to admin console | =Corey Hulen | 2015-09-22 | 2 | -6/+4 |
| | | |||||
* | | Adding SQL settings to admin console | =Corey Hulen | 2015-09-22 | 1 | -2/+2 |
| | | |||||
* | | Fixing unit tests | =Corey Hulen | 2015-09-21 | 1 | -2/+12 |
| | | |||||
* | | Adding rate limiter settings to the admin console | =Corey Hulen | 2015-09-21 | 1 | -13/+9 |
| | | |||||
* | | Adding privacy to admin console | =Corey Hulen | 2015-09-21 | 1 | -2/+0 |
| | | |||||
* | | Adding image properties | =Corey Hulen | 2015-09-21 | 1 | -17/+22 |
| | | |||||
* | | Adding email to admin console | =Corey Hulen | 2015-09-21 | 2 | -9/+21 |
|/ | |||||
* | Merge pull request #709 from mattermost/PLT-11 | Harrison Healey | 2015-09-18 | 2 | -0/+169 |
|\ | | | | | PLT-11 adding config for logs to UI | ||||
| * | merging | =Corey Hulen | 2015-09-18 | 5 | -6/+218 |
| |\ | |||||
| * | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 2 | -0/+169 |
| | | | |||||
* | | | Merge pull request #717 from mattermost/fix-loadtest | Corey Hulen | 2015-09-18 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Fix authentication for server load tests. | ||||
| * | | Fix authentication for loadtests. | JoramWilander | 2015-09-18 | 1 | -0/+1 |
| |/ | |||||
* | | fixing versioning | =Corey Hulen | 2015-09-17 | 1 | -3/+3 |
| | | |||||
* | | Making changes to versioning | =Corey Hulen | 2015-09-17 | 3 | -40/+54 |
| | | |||||
* | | Merge branch 'master' into PLT-92 | =Corey Hulen | 2015-09-17 | 1 | -1/+1 |
|\| | |||||
| * | Adding gofmt to travis build | Christopher Speller | 2015-09-17 | 1 | -1/+1 |
| | | |||||
* | | Fixing postgres issue and bumping version number | =Corey Hulen | 2015-09-16 | 1 | -1/+1 |
| | | |||||
* | | Adding database schema version | =Corey Hulen | 2015-09-16 | 2 | -0/+53 |
| | | |||||
* | | PLT-92 Adding server side versioning to the binary | =Corey Hulen | 2015-09-16 | 3 | -6/+151 |
|/ | |||||
* | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 9 | -73/+642 |
| | |||||
* | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 1 | -0/+9 |
| | |||||
* | 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. |