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 |
|
=Corey Hulen
|
42c5d0d366
|
fixing docker file
|
2015-08-02 22:10:21 -08: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
|
66136a557c
|
incrementing to rc2
|
2015-08-02 10:43:54 -08:00 |
|
Corey Hulen
|
5fbc912be5
|
Merge pull request #311 from mattermost/mm-1619
MM-1619 Updating dockerfiles.
|
2015-08-02 09:59:08 -08:00 |
|
=Corey Hulen
|
247708d924
|
Merge branch 'master' into mm-1619
|
2015-08-02 09:41:12 -08:00 |
|
=Corey Hulen
|
718d670d69
|
Fixing upgrade
|
2015-08-02 09:30:18 -08:00 |
|
Corey Hulen
|
38e44e8f61
|
Merge pull request #278 from mattermost/mm-1702
MM-1702 Adding etag to channel extra_info api call.
|
2015-08-02 09:17:52 -08:00 |
|
Corey Hulen
|
4d1562c5de
|
Merge pull request #273 from mattermost/mm-1355
Fixes mm-1355 adds rate limiting apis
|
2015-08-02 09:17:37 -08: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
|
faa9bbdf97
|
Merge pull request #305 from nickago/MM-1681
MM-1681 Fixed regression of static images not displaying in emails
|
2015-08-02 09:00:30 -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
|
f0993ff65f
|
Merge pull request #300 from hmhealey/ubuntudev
Updated developer setup instructions for Ubuntu
|
2015-08-02 08:59:47 -08:00 |
|
Corey Hulen
|
1ec597df59
|
Merge pull request #291 from mattermost/mm-1758
MM-1758 partially fixed postgres search so that multiple search terms work
|
2015-08-02 08:59:27 -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 |
|
Joram Wilander
|
810c527fcb
|
Merge pull request #313 from mattermost/it33-patch-3
Update to give credit to MongoDB on licensing
|
2015-08-01 18:12:09 -04:00 |
|
it33
|
d39e10c16b
|
Update to give credit to MongoDB on licensing
|
2015-07-31 21:49:10 -07:00 |
|
JoramWilander
|
633c39499b
|
switching to a new PM channel now works in the more modal
|
2015-07-31 16:09:29 -04:00 |
|
Christopher Speller
|
e76fc37b6d
|
Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories.
|
2015-07-31 15:51:36 -04:00 |
|
Joram Wilander
|
7f1dd85255
|
Merge pull request #298 from mattermost/mm-1789
MM-1789 update readme with basic config settings setup information
|
2015-07-31 13:23:49 -04:00 |
|
JoramWilander
|
70669c5110
|
replaced 'fiddle' with 'adjust' to be more clear
|
2015-07-31 13:22:32 -04:00 |
|