Граф коммитов

135 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
92404d6452 Merge pull request #906 from teviot/teviot-patch-2
Pass-through post creation time when importing posts
2015-10-02 08:50:23 -04:00
Joram Wilander
08d390953a Merge pull request #881 from hmhealey/plt194
PLT-194 Changes to ChannelMember notification settings
2015-10-02 08:45:38 -04:00
Teviot Systems
fc82f57102 Pass-through post creation time when importing posts 2015-10-02 20:16:27 +10:00
hmhealey
c9a0030551 Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps 2015-10-01 08:31:17 -04:00
hmhealey
c16b9de8dc Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps 2015-10-01 08:31:11 -04:00
Christopher Speller
2d3ddfd467 Merge release branch 'release-1.0.0' 2015-09-30 15:38:15 -04:00
Christopher Speller
7d31f3a271 Fixing some locations to use the IsTeamAdmin function which properly checks for system admin permissions. 2015-09-30 14:26:37 -04:00
hmhealey
284a660a47 Removed deprecated constants related to quiet mode 2015-09-30 09:59:59 -04:00
hmhealey
9995c7ccfc Added additional test cases and fixed existing ones for ChannelMember.MarkUnreadLevel 2015-09-30 09:59:58 -04:00
hmhealey
7c319f0524 Removed UI for quiet mode and added UI to set when a channel will be marked unread in the sidebar 2015-09-30 09:59:58 -04:00
hmhealey
4bc625e8d1 Added 'default' option to channel notification settings that just uses the user's notification level 2015-09-30 09:59:58 -04:00
=Corey Hulen
8fadea44de PLT-404 adding basic error checking to config file. 2015-09-29 14:17:16 -07:00
Christopher Speller
942702ff1a Merge release branch 'release-1.0.0' 2015-09-29 15:34:21 -04:00
Jack
503501ab3b rebase 2015-09-28 08:14:57 -07:00
Christopher Speller
ce74afd9ed Fixing version unit test 2015-09-28 08:05:40 -04:00
Christopher Speller
348e931a20 Updating dockerfiles and version.go 2015-09-28 07:55:59 -04:00
=Corey Hulen
8ad9a88bda Fixing merge 2015-09-24 12:12:27 -07:00
=Corey Hulen
57269dcaf4 Removing default theme no longer in use 2015-09-24 11:08:39 -07:00
=Corey Hulen
a374419ad5 Removing old valet crud 2015-09-24 10:52:32 -07:00
Jack
396a535f10 use github.com/disintegration/imaging 2015-09-23 15:57:49 -07:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
=Corey Hulen
ccf2e6e4e7 Changing image settings to file settings 2015-09-23 13:47:10 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
=Corey Hulen
554f017327 Fixing merge conflict 2015-09-22 13:20:24 -07:00
=Corey Hulen
6e60768abe Fixing merge conflict 2015-09-22 13:18:42 -07:00
=Corey Hulen
88e5a71e8c Adding service settings to admin console 2015-09-22 12:12:50 -07:00
=Corey Hulen
08a3acbb44 Adding team settings to admin console 2015-09-22 01:15:41 -07:00
=Corey Hulen
f05a2c03d5 Adding SQL settings to admin console 2015-09-22 00:00:19 -07:00
=Corey Hulen
afcff9b301 Fixing unit tests 2015-09-21 20:38:31 -07:00
=Corey Hulen
e78c79b832 Adding rate limiter settings to the admin console 2015-09-21 19:01:52 -07:00
=Corey Hulen
cae5dbd245 Adding privacy to admin console 2015-09-21 18:23:10 -07:00
=Corey Hulen
0529a494ae Adding image properties 2015-09-21 17:34:13 -07:00
=Corey Hulen
ed9a2da83b Adding email to admin console 2015-09-21 15:11:56 -07:00
JoramWilander
98186e5018 Implement incoming webhooks. 2015-09-21 14:22:23 -04:00
Harrison Healey
679e20aa4b Merge pull request #709 from mattermost/PLT-11
PLT-11 adding config for logs to UI
2015-09-18 18:11:01 -04:00
Corey Hulen
0ddabaf8de Merge pull request #717 from mattermost/fix-loadtest
Fix authentication for server load tests.
2015-09-18 09:49:49 -07:00
=Corey Hulen
cdf813f07b merging 2015-09-18 09:25:47 -07:00
JoramWilander
c42a547b4f Fix authentication for loadtests. 2015-09-18 12:16:53 -04:00
=Corey Hulen
44714dfcb1 PLT-11 Adding ability to save config file 2015-09-17 21:00:59 -07:00
=Corey Hulen
522e4934c9 fixing versioning 2015-09-17 13:06:25 -07:00
=Corey Hulen
af4deb2369 Making changes to versioning 2015-09-17 13:01:40 -07:00
=Corey Hulen
9b5198c69c Merge branch 'master' into PLT-92 2015-09-17 09:21:56 -07:00
Christopher Speller
eb4b80a484 Adding gofmt to travis build 2015-09-17 09:07:37 -04:00
=Corey Hulen
51c3445e69 Fixing postgres issue and bumping version number 2015-09-16 21:16:07 -07:00
=Corey Hulen
abda39b652 Adding database schema version 2015-09-16 19:59:57 -07:00
=Corey Hulen
cef7a1aae4 PLT-92 Adding server side versioning to the binary 2015-09-16 17:37:11 -07:00
JoramWilander
47e6a33a45 Implement OAuth2 service provider functionality. 2015-09-16 15:49:12 -04:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00