Commit Graph

135 Commits

Author SHA1 Message Date
nickago
ce2cf5b4e8 Limited the added headers to only non-api calls 2015-07-27 14:39:55 -07:00
nickago
18d160bec5 Centralized header additions and removed duplicate code 2015-07-27 08:29:08 -07:00
=Corey Hulen
8d9449c068 Merge branch 'master' into mm-1420 2015-07-23 09:22:17 -08:00
Corey Hulen
a9d48ff994 Merge pull request #237 from mattermost/mm-1570
fixes mm-1570 adds support for using mattermost as an OAuth client
2015-07-23 09:21:14 -08:00
JoramWilander
d42d0e3467 added store unit test for user.GetByAuth and added password length checking in api.login 2015-07-23 08:19:51 -04:00
=Corey Hulen
c277a98b5d Merge branch 'master' into mm-1420 2015-07-22 18:05:44 -08:00
Asaad Mahmood
14c1f2424d Minor UI Improvements 2015-07-23 00:54:40 +05:00
Joram Wilander
ecdd160ec0 Merge pull request #214 from hmhealey/mm1498
MM-1498 Provide a replacement message for email notifications for posts only containing files
2015-07-22 15:42:09 -04:00
JoramWilander
dd970604d1 add check on server to prevent password updating for users who log in through oauth 2015-07-22 15:36:58 -04:00
JoramWilander
41bbbbf446 add changes from team review 2015-07-22 15:05:20 -04:00
JoramWilander
44cfa364fd added error case for login and removed authdata + authservice unique constraint in users table 2015-07-22 12:42:03 -04:00
JoramWilander
4f0364d876 added signup link verification to oauth signup flow 2015-07-22 12:13:45 -04:00
JoramWilander
a2bd8b8676 add error for trying to sign up with the same oauth account twice 2015-07-22 11:26:55 -04:00
JoramWilander
62c0603c50 merged with new team domain changes and added signup/login links for gitlab 2015-07-22 10:12:28 -04:00
JoramWilander
03528b9619 made oauth architecture more generalized 2015-07-22 08:47:52 -04:00
JoramWilander
c39e95c7cb inital implementation of using GitLab OAuth2 provider for signup/login 2015-07-22 08:41:53 -04:00
Reed Garmsen
aa99a3443a Changed the subject line for emails sent regarding mentions and other team notifications. This is meant to prevent notification emails from different teams from combining into a single email thread 2015-07-21 19:01:07 -07:00
JoramWilander
237920e314 removed unnecessary debug statements 2015-07-21 19:39:59 -04:00
JoramWilander
b821d23ed7 fixed unit tests to work with team domain changes and update partial url regex for files 2015-07-21 19:23:00 -04:00
JoramWilander
39abf24708 added sanitization to filenames to remove the possibility of relative paths 2015-07-21 19:22:04 -04:00
JoramWilander
04408eea37 updated create profile image unit test to clean up images properly 2015-07-21 19:22:04 -04:00
JoramWilander
c63fbd4ccc add proper url encoding for filenames 2015-07-21 19:22:04 -04:00
JoramWilander
a6fc129a01 update file unit tests 2015-07-21 19:22:04 -04:00
JoramWilander
ada84835ee initial implementation of local server storage for files 2015-07-21 19:22:04 -04:00
Christopher Speller
73ee387319 Fixing issues with files trasitioning to relative paths 2015-07-21 18:06:30 -04:00
=Corey Hulen
848eeeeef4 fixing merge conflicts 2015-07-21 12:26:27 -08:00
Christopher Speller
f5837c1b64 Old files are saved with full paths, this changes so that new files are not saved with absolute paths and detects old files saved and fixes them. 2015-07-21 16:25:49 -04:00
hmhealey
156e3a94c4 Use QueryUnescape function to convert to a human readable filename in email notifications 2015-07-21 09:49:05 -04:00
hmhealey
55c148b59a Added additional check when adding a message to an email notification for a blank post and corrected a comment 2015-07-20 17:49:32 -04:00
Christopher Speller
c6fb95912b Changing the way we mattermost handles URLs. team.domain.com becomes domain.com/team.
Renaming team.Name to team.DisplayName and team.Domain to team.Name.
So: team.Name -> url safe name. team.DisplayName -> nice name for users
2015-07-20 17:45:23 -04:00
hmhealey
d502d82016 Provide a replacement message for email notifications for posts only containing files 2015-07-20 17:16:43 -04:00
Corey Hulen
d65f199e12 Merge pull request #185 from mattermost/mm-1348
fixes mm-1348 removing dependency on redis
2015-07-17 14:45:50 -08:00
hmhealey
098cbcdc21 Unify all locations where we determine a user's display named based off of their nickname/username into a helper function 2015-07-17 15:22:57 -04:00
hmhealey
e737ec3eb5 Allow Users to be notified using @all, @channel, and their first name when other notifications are disabled 2015-07-17 15:22:56 -04:00
hmhealey
fb42a74613 Use User.FirstName instead of trying to infer a user's first name from their nickname in multiple places. 2015-07-17 15:22:56 -04:00
hmhealey
c09f1b9e4e Renamed FullName column in database to Nickname. Renamed all serverside references from FullName to Nickname. 2015-07-17 15:13:24 -04:00
Christopher Speller
1d7509493e Merge pull request #203 from nickago/MM-1601
MM-1601 Fixed typo in reset password field
2015-07-17 14:24:32 -04:00
nickago
bb639518a0 Fixed typo 2015-07-17 07:27:37 -07:00
Joram Wilander
dcc2173f1f Merge pull request #184 from nickago/MM-1278
MM-1278 Team admin can now delete any post
2015-07-17 10:21:16 -04:00
nickago
372869354f removed testing material 2015-07-16 14:49:15 -07:00
nickago
8304303703 removed testing material 2015-07-16 14:48:40 -07:00
nickago
f0841af393 Check your credentials from session 2015-07-16 14:47:28 -07:00
nickago
41d2786e3e reworked logic to stem from post 2015-07-16 13:50:20 -07:00
nickago
d31b3e413a Moved admin checking into seperate function 2015-07-16 13:40:18 -07:00
nickago
139f6611d6 Added last updated for pictures 2015-07-16 08:55:37 -07:00
Joram Wilander
288ad55f80 Revert "MM-1494 Change image resizing for preview and thumbnail to use Lanczos interpolation" 2015-07-16 05:05:26 -04:00
=Corey Hulen
e017babc5d fixing merge 2015-07-15 10:22:05 -08:00
=Corey Hulen
246d12aaf2 fixes mm-1348 removing dependency on redis 2015-07-14 15:12:04 -08:00
nickago
cb2bff28ee Team admin can now delete any post 2015-07-14 13:09:14 -07:00
hmhealey
7ff57181b9 Changed image resizing for both the preview and thumbnail to use Lanczos interpolation instead of simple nearest neighbour 2015-07-14 11:48:53 -04:00