IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,344 Commits 845 Branches 1,202 Tags
e989b839d53471dec7c71146af88cd3197d14ffc
Commit Graph

272 Commits

Author SHA1 Message Date
it33
4a13d37367 Renaming "Handle" to "Channel URL" or "URL" 2015-09-20 21:17:20 -07: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
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
3edd8dbdf6 Merge pull request #704 from hmhealey/freetype 
Updated godep workspace and freetype library so that godep save and restore work again
 2015-09-17 12:17:27 -04:00
Corey Hulen
de64bd19d5 Merge pull request #703 from mattermost/add-gofmt 
Adding gofmt to travis build
 2015-09-17 08:44:50 -07:00
hmhealey
4005d8bfd0 Updated godep workspace and freetype library so that godep save and restore work again 2015-09-17 11:10:06 -04:00
Christopher Speller
eb4b80a484 Adding gofmt to travis build 2015-09-17 09:07:37 -04:00
=Corey Hulen
1d37723307 Fixes GIT-698 allow ability to disable team creation for SSO 2015-09-16 21:31:45 -07:00
=Corey Hulen
cef7a1aae4 PLT-92 Adding server side versioning to the binary 2015-09-16 17:37:11 -07:00
Christopher Speller
e644b53b72 Merge pull request #697 from mattermost/PLT-93 
PLT-93 Fixing broken email templates
 2015-09-16 16:32:27 -04:00
Christopher Speller
720f1082d3 Merge pull request #696 from mattermost/PLT-23 
PLT-23 error.html pulls files from static
 2015-09-16 16:31:26 -04:00
JoramWilander
47e6a33a45 Implement OAuth2 service provider functionality. 2015-09-16 15:49:12 -04:00
=Corey Hulen
609e5c6652 Fixing broken email templates 2015-09-16 12:38:09 -07:00
=Corey Hulen
c7bb4ab7f8 Fixing broken email templates 2015-09-16 12:37:54 -07:00
=Corey Hulen
ac38aadc12 Fixing broken email templates 2015-09-16 12:36:35 -07:00
=Corey Hulen
c2829b24e4 PLT-23 error.html pulls files from static 2015-09-16 12:08:26 -07:00
=Corey Hulen
986aeae7ce PLT-23 error.html pulls files from static 2015-09-16 12:06:49 -07:00
=Corey Hulen
4e3896d7b1 Adding config file timestamp to X-Version header 2015-09-16 09:37:20 -07:00
=Corey Hulen
5e2f701e6c Removing old config stuff 2015-09-15 19:09:50 -07:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00
=Corey Hulen
3bd350dcaf Merge branch 'master' into PLT-12-log 2015-09-14 16:59:24 -07:00
Harrison Healey
c447db6e78 Merge pull request #679 from mattermost/fix-file-content-type 
Blank Content-Type for file GETs.
 2015-09-14 16:17:22 -04:00
Joram Wilander
125b7dc71b Merge pull request #677 from mattermost/plt-50 
PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
 2015-09-14 14:32:15 -04:00
JoramWilander
0654b0c06b Blank Content-Type for file GETs. 2015-09-14 14:18:01 -04:00
Christopher Speller
7b3c2d6d85 Allowing underscores in channel names. Added conversion of some slack channel names into valid mattermost names. 2015-09-14 12:18:38 -04:00
Christopher Speller
c3742aef71 Merge pull request #648 from mattermost/PLT-12 
PLT-12: Work in progress for Admin Console UI
 2015-09-14 08:58:53 -04:00
JoramWilander
27e59c32f9 Set default Content-Type to application/json for all API requests 2015-09-12 10:26:24 -04:00
=Corey Hulen
e5e88d1604 Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN 2015-09-11 09:39:28 -07:00
=Corey Hulen
e06e292be7 PLT-12 adding log viewer 2015-09-10 18:32:22 -07:00
=Corey Hulen
83b04181da merging 2015-09-10 15:15:04 -07:00
=Corey Hulen
1108ac5306 Fixing unit test 2015-09-10 15:10:57 -07:00
=Corey Hulen
8bf35081c8 PLT-12 UI framework for admin console 2015-09-10 14:56:37 -07:00
hmhealey
7a9e709bd2 Removed pointless attempt to verify a new user's username 2015-09-09 18:42:28 -04:00
=Corey Hulen
e54d0da392 Adding unit tests for cmd line 2015-09-04 16:56:18 -07:00
=Corey Hulen
58d0d9afd2 Adding cmd line options 2015-09-04 11:59:10 -07:00
Christopher Speller
f0fd9a9e8b Adding ability to export data from mattermost 2015-09-04 11:11:38 -04:00
mishimi
0fc7457994 Updating help text to fix typo 2015-09-02 17:06:22 -07:00
Christopher Speller
72575ac7bd Merging release branch 'release-0.7.0' 2015-09-01 08:49:54 -04:00
=Corey Hulen
7de7de6ad0 MM-2056 fixes problem with creating team 2015-08-31 13:33:22 -07:00
Joram Wilander
0b3db018d3 Merge pull request #520 from zackify/master 
Fix TLS warning due to insecure content
 2015-08-31 15:46:26 -04:00
Christopher Speller
461f9f0546 Merge pull request #523 from mattermost/it33-patch-6-1 
Updating text on "Find Teams" email
 2015-08-31 09:04:51 -04:00
Christopher Speller
3a43966b95 Merge pull request #522 from mattermost/it33-patch-1 
Updated marketing text on email sign-up
 2015-08-31 09:04:45 -04:00
Christopher Speller
2384fe0c7b Merge pull request #468 from nickago/MM-1848 
Mm 1848 Add /echo command
 2015-08-31 09:03:04 -04:00
it33
de4a9bdb59 Updating text on "Find Teams" email 
Making it clear that user requested email.
 2015-08-30 12:37:56 -07:00
it33
a2497ba4c4 Updated marketing text on email sign-up 2015-08-30 12:31:41 -07:00