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

510 Коммитов

Автор SHA1 Сообщение Дата
Asaad Mahmood
331ab2acfc Adding tooltip to email in user popover 2015-08-05 22:29:44 +05:00
Asaad Mahmood
140faa6bb6 Fixing style guide stuff in post_list 2015-08-05 21:32:41 +05:00
Asaad Mahmood
9699401d5b Removing console.log 2015-08-05 16:02:53 +05:00
Asaad Mahmood
d151d43017 Fixing mentions scroll again due to merge conflict 2015-08-05 15:56:08 +05:00
Asaad Mahmood
022317823e Merge branch 'master' of https://github.com/mattermost/platform
Conflicts:
	web/react/components/mention_list.jsx
2015-08-05 15:50:54 +05:00
Christopher Speller
ea51edf0c4 Merge pull request #326 from nickago/MM-1754
MM-1754 Modals now close upon pressing ESC
2015-08-04 16:01:22 -04:00
Christopher Speller
99db02a81a Merge pull request #321 from rgarmsen2295/mm-1611
MM-1611 Removes ability to cycle through the mention list by jumping top to bottom or vice versa
2015-08-04 15:37:35 -04:00
Christopher Speller
085a083a79 Merge pull request #310 from nickago/MM-1671
MM-1671 Added support for enter key triggering submission and changed Close to Cancel
2015-08-04 15:22:13 -04:00
nickago
ee91b766be Added closing on ESC key press 2015-08-04 12:02:35 -07:00
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
nickago
3e63428da3 Cosmetic Refactoring 2015-08-04 11:47:33 -07:00
Asaad Mahmood
2d5a181c7d Updating channel header tooltip placement 2015-08-04 23:05:34 +05:00
Asaad Mahmood
25a584ab2c Merge branch 'master' of https://github.com/mattermost/platform
Conflicts:
	web/react/components/channel_header.jsx
2015-08-04 23:03:55 +05:00
nickago
0a9706e3cb Changed 'Close' to 'Cancel' 2015-08-04 10:58:44 -07:00
nickago
83b632a3c2 Placed button inside of form to allow for submission on strike of enter key 2015-08-04 10:57:54 -07:00
Asaad Mahmood
ca7eb5d53c Fixing scrolling of mention box in RHS 2015-08-04 22:11:11 +05: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
Asaad Mahmood
fe75f1c61c Adding bootstrap tooltip for channel members 2015-08-04 19:15:55 +05:00
Asaad Mahmood
77f52da255 UI Improvements 2015-08-04 19:12:20 +05: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
Reed Garmsen
affbf6f01b Cosmetic changes to better follow style guide 2015-08-03 12:45:08 -07:00
nickago
3db7d315f9 Fixed variable naming conflict with msg and added cosmetic refactors 2015-08-03 12:41:39 -07:00
Reed Garmsen
1ac883a408 Removes ability for the mention list to cycle from top to bottom and vice-versa 2015-08-03 12:24:24 -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