=Corey Hulen
|
e0bad6c037
|
Fixing merge
|
2015-07-21 12:52:38 -08:00 |
|
Corey Hulen
|
1de50f0e4f
|
Merge pull request #221 from mattermost/files-patch
Patch for issue with old uploaded files.
|
2015-07-21 12:31:32 -08:00 |
|
Reed Garmsen
|
21520f00f3
|
Fixed typo in the 'Sign up Complete' page: you email -> your email
|
2015-07-21 13:28:13 -07: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
|
0967a131a1
|
Prevent users from sending empty ^ reply messages
|
2015-07-21 16:01:30 -04:00 |
|
hmhealey
|
d4fd000ccf
|
Added handling for when the user is ^ responding to a post that gets deleted
|
2015-07-21 15:58:11 -04:00 |
|
hmhealey
|
7b28880294
|
Track caretCount as part of createPost's state so that we don't unnecessarily search for a thread to reply to when the user is typing
|
2015-07-21 15:54:47 -04:00 |
|
Corey Hulen
|
bee26e3f26
|
Merge pull request #200 from mattermost/mm-1356
MM-1356 Changing team URLs from team.domain.com to domain.com/team
|
2015-07-21 10:47:46 -08:00 |
|
Corey Hulen
|
dc250d7731
|
Merge pull request #210 from hmhealey/makefile
Changed Makefile to restart existing mysql/redis containers if they've been stopped
|
2015-07-21 10:29:29 -08:00 |
|
nickago
|
fafce8cb72
|
Upon changing to a new comment thread, fixes the the bug of the RHS scrolling to whitespace below the pane
|
2015-07-21 11:00:54 -07:00 |
|
hmhealey
|
141d928d3c
|
Changed the placeholder highlight for active thread to be more subtle
|
2015-07-21 11:56:28 -04:00 |
|
hmhealey
|
5b917dd4a6
|
Trim the carets from the beginning of reply messages when they're posted
|
2015-07-21 11:56:27 -04:00 |
|
hmhealey
|
644c78755c
|
Change the create_post component to track the active thread using the event dispatcher so that it stays in sync with the post_list
|
2015-07-21 11:56:27 -04:00 |
|
hmhealey
|
25b2e75dc6
|
Added function to reply to earlier messages by prefixing a message with carets
|
2015-07-21 11:56:19 -04:00 |
|
hmhealey
|
e32aee8977
|
Added events for when the active thread (ie the message thread that a user is responding to) changes
|
2015-07-21 11:17:18 -04:00 |
|
Joram Wilander
|
7a8ed5cf05
|
Merge pull request #217 from mattermost/quick-manage-fix
quick fix to get manage team modal working again
|
2015-07-21 10:50:00 -04:00 |
|
JoramWilander
|
cf3bfd24fd
|
quick fix to get manage team modal working again
|
2015-07-21 10:49:37 -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 |
|
Joram Wilander
|
c4b92424d5
|
Merge pull request #216 from asaadmahmoodspin/mm-1631
mm-1631 - Fixing image previewer bug
|
2015-07-21 07:50:49 -04:00 |
|
Asaad Mahmood
|
4b7fda14ba
|
mm-1631 - Fixing image previewer bug
|
2015-07-21 16:47:08 +05:00 |
|
Christopher Speller
|
a820b67468
|
Merge pull request #211 from rgarmsen2295/mm-1186
MM-1186 Adds channel name to RHS comment threads
|
2015-07-20 18:06:01 -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 |
|
Joram Wilander
|
4eb061d29c
|
Merge pull request #207 from hmhealey/mm825
MM-825 Fixed the labels on the mention list for users without their first/last name configured
|
2015-07-20 12:18:40 -04:00 |
|
Joram Wilander
|
6a229964c7
|
Merge pull request #204 from nickago/MM-1519
MM-1519 Even on error, submission stops, updated to relect that
|
2015-07-20 12:17:48 -04:00 |
|
Joram Wilander
|
1c06c3fa09
|
Merge pull request #209 from mattermost/mm-831
fixes mm-831 post timestamps now update
|
2015-07-20 11:53:30 -04:00 |
|
hmhealey
|
74ff46bb98
|
Changed Makefile to restart existing mysql/redis containers if they've been stopped
|
2015-07-20 09:52:25 -04:00 |
|
JoramWilander
|
5e27bb3e61
|
fixes mm-831 post timestamps now update
|
2015-07-20 08:58:18 -04:00 |
|
Joram Wilander
|
a1876cf6cc
|
Merge pull request #208 from nickago/MM-1079
MM-1079 Removed remenant of non-hover system
|
2015-07-20 07:51:36 -04:00 |
|
Reed Garmsen
|
12c19e3390
|
Added channel name to RHS comment threads; minor css changes to compensate for addition
|
2015-07-19 20:31:37 -07:00 |
|
nickago
|
196ae3227e
|
Removed remenant of non-hover system
|
2015-07-18 16:51:24 -07:00 |
|
hmhealey
|
d0e4d71ac3
|
Fixed the labels on the mention list for users without their first/last name configured
|
2015-07-18 16:32:22 -04:00 |
|
=Corey Hulen
|
876ad10f6f
|
Fixes javascript console errors
|
2015-07-17 15:41:55 -08: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 |
|
Corey Hulen
|
f132978735
|
Merge pull request #192 from nickago/MM-1079
MM-1079 Changed hover effect for menu
|
2015-07-17 14:09:59 -08:00 |
|
Corey Hulen
|
b306ec8437
|
Merge pull request #177 from hmhealey/mm825
MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname
|
2015-07-17 14:01:01 -08:00 |
|
it33
|
66c22d342f
|
Merge pull request #202 from mattermost/readme-update-mm-1356
Modifications to readme for mm-1356
|
2015-07-17 13:28:52 -07:00 |
|
hmhealey
|
1dba330146
|
Use a user's full name as their display name if a nickname hasn't been specified
|
2015-07-17 15:22:57 -04: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
|
abcb44089c
|
Add tests to check if a User's first/last name are valid
|
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
|
079538d9e7
|
Use User.FirstName for notifications instead of trying to determine it from User.Nickname
|
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
|
31415c8ddc
|
Sanitize FirstName and LastName fields of an object instead of the nickname when ShowFullName is set to false
|
2015-07-17 15:22:56 -04:00 |
|
hmhealey
|
b620960cde
|
Fix migration code so that LastName is populated correctly for users who only have one word in their FullName
|
2015-07-17 15:13:31 -04:00 |
|
hmhealey
|
8dbf03bd10
|
Add interface to edit a user's nickname directly
|
2015-07-17 15:13:31 -04:00 |
|
hmhealey
|
9d8073328a
|
Added FirstName and LastName fields to User object and attempt to populate them from the FullName/Nickname field
|
2015-07-17 15:13:31 -04:00 |
|
hmhealey
|
1c7f0be268
|
Renamed all clientside references from full_name to nickname
|
2015-07-17 15:13:31 -04:00 |
|