IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,466 Commits 845 Branches 1,202 Tags
4e8af44370bfb4276e009526045a4983d5ff245a
Commit Graph

477 Commits

Author SHA1 Message Date
hmhealey
4e8af44370 Added the ability to cancel file uploads on posts 2015-08-10 14:04:23 -04:00
hmhealey
20d755f3dd Changed post drafts to maintain a list of the names of uploading files instead of just a count 2015-08-10 14:04:22 -04:00
Christopher Speller
e1009fa7fb Merge pull request #348 from nickago/MM-1550 
Mm 1550 Mentions are no longer removed from auto complete once used
 2015-08-10 12:31:51 -04:00
Christopher Speller
6eb76a7cc3 Merge pull request #356 from nickago/MM-1646 
MM-1646 Fixed typo in channel/group naming
 2015-08-10 09:38:46 -04:00
Christopher Speller
c5944c9648 Merge pull request #351 from rgarmsen2295/mm-1759 
MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10
 2015-08-10 09:12:22 -04:00
nickago
fe674339dc Fixed typo in channel/group naming 2015-08-07 08:38:57 -07:00
Harrison Healey
b71e1ccf45 Merge pull request #341 from rgarmsen2295/mm-1643 
MM-1643 Errors displayed on the "change password" screen are now cleared when the user hits cancel
 2015-08-07 11:05:06 -04:00
Reed Garmsen
dd39a53208 Cosmetic refactoring 2015-08-06 14:14:10 -07:00
Reed Garmsen
8c03c0b930 Correct sign up link now displays on ie10 in the 'Team Invite Link' modal; replaces location.origin with utils function 2015-08-06 08:37:16 -07:00
Christopher Speller
3f987db4a5 Merge pull request #346 from hmhealey/mm1613 
MM-1613 Add option to hide Terms of Service disclaimer during signup
 2015-08-06 10:43:06 -04:00
Christopher Speller
506798f547 Merge pull request #344 from nickago/MM-1646 
MM-1646 Changes the word channel to group for priavte groups
 2015-08-06 10:38:22 -04:00
Christopher Speller
f3c5b67588 Merge pull request #332 from nickago/MM-1720 
MM-1720 Switch teams menu no longer display the team you are currently on
 2015-08-06 10:28:35 -04:00
Christopher Speller
c9864b403c Merge pull request #330 from hmhealey/mm1579 
MM-1579 Added a date separator before the first post displayed in a channel
 2015-08-06 10:26:50 -04:00
Christopher Speller
48df0037a2 Merge pull request #329 from asaadmahmoodspin/ui-changes 
UI Improvements
 2015-08-06 10:23:04 -04:00
Christopher Speller
cc78cc9bac Merge pull request #324 from rgarmsen2295/mm-1617 
MM-1617 Now shows a loading gif while a profile pic is being uploaded
 2015-08-06 10:21:51 -04:00
nickago
f6bc38163e Added cosmetic refactoring 2015-08-05 16:27:22 -07:00
nickago
47cedd68d6 Removed all functionality required for removing used mentions from auto-complete 2015-08-05 14:43:40 -07:00
hmhealey
7d40748d01 Added ShowTermsDuringSignup config option on the client which toggles the Terms of Service disclaimer on signup 2015-08-05 16:07:20 -04:00
hmhealey
e6f8fa0fa7 Reformat signup_user_complete to match style guide 2015-08-05 15:43:36 -04:00
nickago
371b1e04eb Changes the word channel to group for priavte groups 2015-08-05 12:19:46 -07:00
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
Christopher Speller
201d165ed9 Merge pull request #342 from mattermost/release-0.6.0 
Release 0.6.0
 2015-08-05 12:29:28 -04:00
Reed Garmsen
038b98f686 Cosmetic refactoring of the Security Setting subsection 2015-08-05 08:51:53 -07:00
nickago
ed473e356e Fixed non-cosmetic refactoring typo 2015-08-05 07:06:10 -07: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
Reed Garmsen
32498a1a64 Fixed issue with password field not being cleared after canceling out of changing your password 2015-08-04 17:31:44 -07: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
Reed Garmsen
3cd0c3b73b Minor cosmetic refactoring to the General Tab of user settings 2015-08-04 12:59:41 -07: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
nickago
2589142109 Added cosmetic refactoring 2015-08-04 09:40:58 -07:00
nickago
db0fb95468 Added listening to the Team Store and removed current team name from team swap menu 2015-08-04 09:13:19 -07:00
Reed Garmsen
344ab98139 Added spinner animation to replace save button when uploading a new profile picture 2015-08-04 08:54:47 -07:00
Reed Garmsen
dfc6e80437 Fixed help text rendering on mobile 2015-08-04 08:47:18 -07:00
hmhealey
1361540de4 Added a date separator before the first post displayed in a channel 2015-08-04 11:30:24 -04: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