Граф коммитов

491 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
6546bb9fb1 Merge pull request #325 from rgarmsen2295/mm-1618
MM-1618 Adds help text to the Get Link modal that informs user when link has been copied to clipboard
2015-08-04 15:01:00 -04:00
Christopher Speller
eb0e69a543 Merge pull request #323 from rgarmsen2295/mm-1554
MM-1554 Removes the delete icon for the first entry in the 'Invite New Members' form
2015-08-04 14:59:40 -04:00
Reed Garmsen
a9b9e03a5b Cosmetic refactoring to better fit style guide 2015-08-04 09:56:27 -07:00
Reed Garmsen
dfc6e80437 Fixed help text rendering on mobile 2015-08-04 08:47:18 -07:00
Christopher Speller
cef628c1d1 Merge pull request #318 from rgarmsen2295/mm-1592
MM-1592 Searching for recent mentions no longer includes all or channel if the all/channel options were toggled on
2015-08-04 11:20:52 -04:00
Christopher Speller
f57efcf4bc Merge pull request #322 from nickago/MM-1679
MM-1679 PM channels in sidebar now display username instead of nickname, plus semi-cosmetic refactoring
2015-08-04 11:11:38 -04:00
Christopher Speller
2c46ee8420 Merge pull request #309 from nickago/MM-1691
MM-1691/1692 Reset User settings tab on close
2015-08-04 09:00:45 -04:00
Reed Garmsen
dbf104686a Added help text informing the user that the team invite link has been copied when they press the 'Copy Link' button 2015-08-03 14:00:47 -07:00
Reed Garmsen
d3580a983d The first field of the 'Invite New Member' field can no longer be cleared or deleted 2015-08-03 12:50:43 -07:00
nickago
3db7d315f9 Fixed variable naming conflict with msg and added cosmetic refactors 2015-08-03 12:41:39 -07:00
nickago
dfcaabe222 Changed private channel list to use username and did semi-cosmetic refactoring 2015-08-03 12:09:27 -07:00
Reed Garmsen
77964dbfac Cosmetic refactoring to be inline with the style guide 2015-08-02 16:36:20 -07:00
Reed Garmsen
568496e3a2 Searching for recent mentions no longer includes all or channel if those options were toggled in the users mention settings 2015-08-02 15:46:57 -07:00
Corey Hulen
adc8def9e0 Merge pull request #312 from mattermost/mm-1784
MM-1784 switching to a new PM channel now works in the more modal
2015-08-02 09:01:06 -08:00
Corey Hulen
2aba63df8e Merge pull request #302 from hmhealey/mm1788
MM-1788 Removed ^replying in preparation for 0.6.0
2015-08-02 09:00:13 -08:00
Corey Hulen
0b6c6b94cb Merge pull request #301 from lfbrock/patch-1
MM-1841 Corrected help text
2015-08-02 09:00:01 -08:00
Corey Hulen
1f417368ad Merge pull request #276 from mattermost/mm-1688
MM-1688 reset number of posts to fetch on channel switch and fresh page load
2015-08-02 08:59:07 -08:00
Corey Hulen
41f96636d6 Merge pull request #274 from mattermost/mm-1497
MM-1497 image thumbnails now scale appropriately so there is no whitespace
2015-08-02 08:58:33 -08:00
JoramWilander
633c39499b switching to a new PM channel now works in the more modal 2015-07-31 16:09:29 -04:00
nickago
ac53536385 User Settings modal resets to General tab with nothing open on close 2015-07-31 09:55:28 -07:00
Christopher Speller
b1cc1ef0bc Merge pull request #299 from nickago/MM-1734
MM-1734 Changed language in error message and did cosmetic refactoring
2015-07-31 12:08:42 -04:00
Christopher Speller
6819f85a22 Merge pull request #306 from nickago/MM-1660
MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring
2015-07-31 11:38:30 -04:00
nickago
f7e5ac1db0 Added singlequotes around 'Edit' and did cosmetic refactoring 2015-07-31 08:09:36 -07:00
nickago
4f235669e7 Updated actual text of error message 2015-07-31 08:07:11 -07:00
Joram Wilander
56724980f8 Revert "MM-1706 Changed mention highlighting code to split words on all non-word characters" 2015-07-31 10:02:21 -04:00
JoramWilander
dad7851423 center small thumbnails and top left larger thumbnails 2015-07-31 09:52:18 -04:00
JoramWilander
8542fbd1ac removed uneccessary utils loadThumbnails function 2015-07-31 09:39:53 -04:00
JoramWilander
a541f09380 image thumbnails now scale appropriately so there is no whitespace, also generalized some thumbnail loading code 2015-07-31 09:36:45 -04:00
Joram Wilander
d0865b78b7 Merge pull request #271 from hmhealey/mm1656
MM-1656 Updated file UI
2015-07-31 09:16:07 -04:00
Joram Wilander
c85a852146 Merge pull request #304 from hmhealey/mm1706
MM-1706 Changed mention highlighting code to split words on all non-word characters
2015-07-31 09:06:23 -04:00
Christopher Speller
7b968a7572 Merge pull request #293 from rgarmsen2295/mm-1725
MM-1725 Added text to inform the user a session id is not available for a login attempt
2015-07-31 08:57:51 -04:00
Christopher Speller
b7869cdb3c Merge pull request #283 from mattermost/mm-1787
MM-1787 Fixing links for signup from team invite link.
2015-07-31 08:56:24 -04:00
Asaad Mahmood
eae619e170 MM-1473 - Updating text for close buttons 2015-07-31 15:59:37 +05:00
Reed Garmsen
aaad5add26 Added text to inform the user a session id is not available for a login attempt (no session created yet) 2015-07-30 15:03:28 -07:00
hmhealey
2e6c41f7d7 Changed mention highlighting code to split words on all non-word characters 2015-07-30 17:01:07 -04:00
hmhealey
e2d77c28f1 Removed ^replying in preparation for 0.6.0 2015-07-30 15:21:35 -04:00
lfbrock
ba06300402 MM-1841 Corrected help text 2015-07-30 14:13:34 -04:00
Joram Wilander
8265e5ed82 Merge pull request #292 from mattermost/mm-1782
MM-1782 makes the LHS dropdown close when clicking on the LHS header
2015-07-30 13:01:38 -04:00
nickago
cd2e035b25 Changed language in error message to reflect better English and did cosmetic refactoring 2015-07-30 09:57:02 -07:00
JoramWilander
4b531ef8c4 added .off() for dropdown hide event on LHS header 2015-07-30 12:11:01 -04:00
JoramWilander
e5c79cd193 makes the LHS dropdown close when clicking on the LHS header 2015-07-30 10:54:41 -04:00
Joram Wilander
e699acb808 Merge pull request #284 from nickago/MM-1768
MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring
2015-07-30 08:58:56 -04:00
Christopher Speller
6222d2cb30 Fixing links for signup from team invite link. Enter now advances signup_user_complete screen. Signin now link now redirects properly. 2015-07-30 08:53:20 -04:00
Christopher Speller
51e244ab5a Merge pull request #282 from nickago/MM-1642
MM-1642 Updated the password error message to not contain extraneous information
2015-07-30 08:51:00 -04:00
Christopher Speller
4646c22ef1 Merge pull request #281 from nickago/MM-1600
MM-1600 Improve quality of error returned upon a duplicate username request
2015-07-30 08:49:36 -04:00
JoramWilander
0c627913f7 removed ternary operator to make if statement clearer 2015-07-30 08:33:52 -04:00
Corey Hulen
659bd97b63 Merge pull request #289 from mattermost/it33-patch-4
MM-1816 Make Off-Topic description more clear
2015-07-30 01:17:53 -08:00
Corey Hulen
eaa59d54b3 Merge pull request #288 from mattermost/it33-patch-3
Corrected "lower case" to "lowercase"
2015-07-30 01:17:43 -08:00
Corey Hulen
b97329cd0a Merge pull request #287 from mattermost/it33-patch-2
Correcting proper use of "set up" vs. "setup"
2015-07-30 01:17:34 -08:00
Corey Hulen
a1e53c64f6 Merge pull request #280 from mattermost/mm-1746
MM-1746 channel handle now populates properly on opening of channel rename modal
2015-07-30 01:10:43 -08:00