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,701 Commits 845 Branches 1,202 Tags
fc82f57102ae4b8f89d8ad65ae3097aba9891272
Commit Graph

331 Commits

Author SHA1 Message Date
Teviot Systems
fc82f57102 Pass-through post creation time when importing posts 2015-10-02 20:16:27 +10:00
Christopher Speller
9ce826863b Merge pull request #866 from mattermost/PLT-345 
PLT-345 adding client side logging
 2015-10-01 07:26:54 -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
Christopher Speller
89b77cc72f Fixing permissions for system admin. Fixes slack import for system admins. 2015-09-30 14:26:37 -04:00
hmhealey
8a5ab6a56f Added slight delay to TestEchoCommand to account for race condition 2015-09-30 09:47:47 -04:00
Christopher Speller
73627000e7 Merge pull request #863 from mattermost/PLT-475 
PLT-475 making sure session is properly removed
 2015-09-30 07:45:42 -04:00
=Corey Hulen
0da42c5559 PLT-345 adding client side logging 2015-09-29 15:55:19 -07:00
Harrison Healey
5e9dccc464 Merge pull request #865 from mattermost/PLT-404 
PLT-404 adding basic error checking to config file.
 2015-09-29 17:33:16 -04:00
Harrison Healey
9aef3836b3 Merge pull request #861 from mattermost/PLT-469 
PLT-469 skip redirect if verified email required.
 2015-09-29 17:25:29 -04:00
=Corey Hulen
8fadea44de PLT-404 adding basic error checking to config file. 2015-09-29 14:17:16 -07:00
=Corey Hulen
3fea6b31af PLT-475 making sure session is properly removed 2015-09-29 13:26:23 -07:00
Christopher Speller
942702ff1a Merge release branch 'release-1.0.0' 2015-09-29 15:34:21 -04:00
=Corey Hulen
19a71ce00d PLT-469 skip redirect if verified email required. 2015-09-29 12:09:18 -07:00
Justyn Shull
5064f9cba2 Update the /join command to use the correct redirect URL, and update the test to match 2015-09-29 11:48:13 -05:00
Christopher Speller
7284d8628a Fixing some SSO errors 2015-09-29 09:46:52 -04:00
JoramWilander
10108bb54c Properly revoke OAuth sessions when revoking all user sessions. 2015-09-28 14:39:36 -04:00
JoramWilander
dffa56d4b4 Fix images in welcome email. 2015-09-28 13:10:14 -04:00
Jack
503501ab3b rebase 2015-09-28 08:14:57 -07:00
Corey Hulen
edd99e243f Merge pull request #812 from hmhealey/plt256 
PLT-256 Add headers to getFile api calls from IE/Edge to trigger file download
 2015-09-25 14:28:13 -07:00
=Corey Hulen
08a343c372 Fixing 1 more case 2015-09-25 09:51:27 -07:00
hmhealey
8b63ca03ea Added headers to getFile requests from Microsoft browsers to trigger a download 2015-09-25 11:46:43 -04:00
Corey Hulen
74ccf42387 Merge pull request #802 from mattermost/plt-291 
PLT-291 Fixing 404 page props
 2015-09-25 08:13:45 -07:00
Joram Wilander
2322a7c74e Merge pull request #793 from hmhealey/plt367 
PLT-367 Added a json response to the uploadProfileImage api call
 2015-09-25 10:22:27 -04:00
Harrison Healey
4a871e9df8 Merge pull request #799 from mattermost/plt-31-2 
PLT-31 Added welcome email back in.
 2015-09-25 09:43:22 -04:00
JoramWilander
84763e9bde Added welcome email back in. 2015-09-25 08:19:05 -04:00
hmhealey
7bb384b92d Added a json response to the uploadProfileImage api call 2015-09-24 16:47:34 -04:00
=Corey Hulen
8ad9a88bda Fixing merge 2015-09-24 12:12:27 -07:00
=Corey Hulen
30a5aa44ff fixing issue 2015-09-24 11:14:44 -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
Christopher Speller
3bb2e67203 Fixing 404 page props 2015-09-24 12:04:45 -04:00
Jack
aa6da728ba set transparent png background to white 2015-09-24 08:33:15 -07:00
Jack
396a535f10 use github.com/disintegration/imaging 2015-09-23 15:57:49 -07:00
=Corey Hulen
00112cae51 Assiging first user system_admin role 2015-09-23 15:52:59 -07:00
=Corey Hulen
985aebf861 Fixing state setting 2015-09-23 15:16:48 -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
Harrison Healey
15f15de8ca Merge pull request #759 from mattermost/plt-242-3 
PLT-242 Implement custom UI theme colors.
 2015-09-23 15:04:22 -04:00
Chengwei Yang
f7a32fa38a PLT-126: Change 'Private Messages' to 'Direct Messages' 
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
 2015-09-23 22:43:14 +08:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
=Corey Hulen
6e60768abe Fixing merge conflict 2015-09-22 13:18:42 -07:00
Joram Wilander
ac7918c554 Merge pull request #715 from mattermost/plt-27 
PLT-27 Implement incoming webhooks.
 2015-09-22 15:47:57 -04:00
=Corey Hulen
fc71869a96 Merge branch 'master' into PLT-11-email 2015-09-22 12:24:39 -07:00
=Corey Hulen
88e5a71e8c Adding service settings to admin console 2015-09-22 12:12:50 -07:00
Jack
602bed85f2 fix conflict 2015-09-22 08:16:51 -07:00
=Corey Hulen
08a3acbb44 Adding team settings to admin console 2015-09-22 01:15:41 -07:00
=Corey Hulen
afcff9b301 Fixing unit tests 2015-09-21 20:38:31 -07:00