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
1,928 Commits 845 Branches 1,202 Tags
0b3db018d33601a44c86d08771441c5dacd18969
Commit Graph

228 Commits

Author SHA1 Message Date
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
Zach Silveira
daf6815120 fixed ssl warning on signup page 2015-08-29 20:50:41 -07:00
Christopher Speller
75af5d4536 Merge pull request #496 from mattermost/mm-2015 
MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
 2015-08-28 09:14:37 -04:00
JoramWilander
f5fec3a157 Added the ability to create a team with SSO services and added the ability to turn off email sign up. 2015-08-28 08:37:55 -04:00
Christopher Speller
d107b392a6 Merge pull request #511 from mattermost/MM-1698 
MM-1698 Fixes upgrade db from 0.6 for postgres
 2015-08-28 08:26:33 -04:00
Joram Wilander
2bc6451e39 Merge pull request #486 from asubset/master 
Fix getParentsPosts() query
 2015-08-28 07:51:17 -04:00
=Corey Hulen
f96513809f Fixing bug where the err msg gets gobbled up 2015-08-27 16:58:58 -07:00
Jason Rossman
879fa084c9 fix GetParentPosts() query 2015-08-27 12:45:47 -06:00
=Corey Hulen
30f22ec9c7 MM-2033 fixes img showing infinity progress 2015-08-27 11:05:18 -07:00
Christopher Speller
305a74c78d Merge pull request #474 from mattermost/PL-4 
Fixes PL-1 and PL-3 Restricting team creation
 2015-08-27 12:09:35 -04:00
Corey Hulen
d3093028cf Merge pull request #484 from mattermost/mm-1994 
MM-1994 Improvements to import UI
 2015-08-27 08:32:09 -07:00
Christopher Speller
e1c09605dc Merge pull request #469 from mattermost/mm-1699 
MM-1699 Refactored post handling/updating on both the client and server
 2015-08-27 11:22:19 -04:00
Christopher Speller
ea4beb7c45 Merge pull request #487 from rgarmsen2295/mm-2000 
MM-2000 Added links to the teams listed in the 'Find your teams' email
 2015-08-27 10:02:19 -04:00
JoramWilander
041d89b85a Refactored post handling/updating on both the client and server. 2015-08-27 08:21:26 -04:00
Joram Wilander
232fd59ef4 Merge pull request #470 from nickago/MM-1945 
MM-1945 Added a link to error page that returns users to the root page
 2015-08-27 08:18:59 -04:00
Reed Garmsen
841aef34f5 Added links to the teams listed in the 'Find your teams' email 2015-08-26 15:02:34 -07:00
Christopher Speller
1ed6718dd9 Improvements to import UI 2015-08-26 15:24:17 -04:00
nickago
7578204352 Added unit tests 2015-08-26 07:21:37 -07:00
=Corey Hulen
67bc12e4b7 Fixes PL-3 Restrict team creation to specific domains 2015-08-25 14:40:16 -07:00
=Corey Hulen
d132de4400 Fixes PL-1 added ability to disable team creation 2015-08-25 14:28:02 -07:00
nickago
6ac39ef687 Added a link to error page that returns users to the root page 2015-08-25 11:06:11 -07:00
nickago
4a0eeba237 Added semaphore for resource allocation to echo command 2015-08-25 09:19:07 -07:00
nickago
19a48acfc6 Created a /echo command that will post on the user's behalf after 
a specified amount of time
 2015-08-25 07:17:10 -07:00
=Corey Hulen
64b179ab0e Fixes mm-1912 move get file info into its own web service call 2015-08-24 15:03:52 -07:00
=Corey Hulen
e4b66c3ff4 Fixing audit log to wait for confirm 2015-08-20 15:04:37 -07:00
=Corey Hulen
3f0ec24dc1 Fixing build 2015-08-20 14:20:39 -07:00
Christopher Speller
65f1d0297e Merge pull request #406 from mattermost/mm-1281 
MM-1281 Track channel creator in DB and show in channel intro message
 2015-08-19 14:15:01 -04:00
Joram Wilander
5f43945805 Merge pull request #394 from mattermost/mm-1410 
MM-1410 Initial implementaiton of import from Slack
 2015-08-19 12:19:02 -04:00
JoramWilander
cc40ca1ac0 Added a message deleted indicator when a post is deleted to let the user know what's happening. 2015-08-19 09:52:03 -04:00
Christopher Speller
9222e191aa Requiring team admin to import and fixing a few style issues 2015-08-19 08:53:52 -04:00
Christopher Speller
d78ebab108 Implemention of slack import feature. 2015-08-19 08:52:49 -04:00
JoramWilander
11247061b5 Track channel creator in DB and show in channel intro message. 2015-08-19 08:31:20 -04:00
Christopher Speller
390cb47ec3 Merge pull request #385 from mattermost/mm-1623 
MM-1623 when user roles are updated, the relevant session roles are updated as well
 2015-08-18 08:51:57 -04:00
JoramWilander
b068cc1058 when user roles are updated, the relevant session roles are updated as well 2015-08-17 09:28:20 -04:00
JoramWilander
b704e9489b added google sign-in functionality to the client, with minor model modifications 2015-08-14 12:38:16 -04:00
JoramWilander
e27db2ed63 initial server implementation for using google as a single-sign-on oauth service 2015-08-14 12:37:08 -04:00
Christopher Speller
92c4df5b10 Merge pull request #370 from hmhealey/mm1812 
MM-1812 Provide warnings on team invite screens when email is disabled
 2015-08-14 08:48:24 -04:00
hmhealey
8fc4456213 Removed isEmailEnabledSynchronous and switched the email disabled warnings to use ConfigStore 2015-08-13 13:23:56 -04:00
hmhealey
ca919538cc Added ConfigStore that is populated from the server 2015-08-13 13:01:21 -04:00
hmhealey
3f5993eedf Added initial api to allow clientside code to query serverside configuration 2015-08-11 16:53:15 -04:00
JoramWilander
3f38c21796 fixed channel counts etag to only update when appropriate 2015-08-11 12:11:35 -04:00
JoramWilander
963ca03727 change getChannel api service to not register as user activity 2015-08-11 12:11:35 -04:00
JoramWilander
ca4d0c68af add etag cache testing to api GetChannelCounts unit test 2015-08-11 12:11:35 -04:00
JoramWilander
3d0133b5e8 added api unit test for GetChannelCounts 2015-08-11 12:11:35 -04:00
JoramWilander
6c0fefad15 added getChannelCounts service and refactored the client to more intelligently pull channel data 2015-08-11 12:11:35 -04:00