Commit Graph

1466 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
nickago
96fc2a4552 further cosmetic refactoring 2015-08-10 09:07:44 -07:00
nickago
1e40abbdea Removed vetigial argument and properly aligned post_store 2015-08-10 08:31:55 -07: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
51174ac92f Merge pull request #349 from mattermost/makefile-redis-remove
Removing redis from makefile
2015-08-07 11:07:10 -04:00
Harrison Healey
bf1537ac13 Merge pull request #347 from mattermost/it33-patch-1
MM-1898 Updates to Mac OSX instructions
2015-08-07 11:06:39 -04: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
it33
9b42ad76e3 Removing note on creating new .bash_profile 2015-08-06 09:19:47 -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
3e57ef93b2 Removing redis from makefile 2015-08-06 11:01:49 -04: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
b48b5e7e47 Merge pull request #340 from nickago/MM-1769
MM-1769 Changed max number of displayed direct message channels to 20
2015-08-06 10:29:38 -04:00
Christopher Speller
6c24435ab0 Merge pull request #335 from mattermost/it33-patch-4
Typo and case correction
2015-08-06 10:29:08 -04:00
Christopher Speller
41adcc8305 Merge pull request #333 from nickago/MM-1181
MM-1181 Drawing all images onto a white background, thus removing transparency
2015-08-06 10:28:53 -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
it33
b0cd2f8888 MM-1898 Updates to Mac OSX instructions 2015-08-05 16:44:27 -04: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
Christopher Speller
a2d26be5df Merge pull request #331 from mattermost/060-readme-updates
Updates to the README for release.
2015-08-05 12:13:25 -04:00
Christopher Speller
110a1e51a4 Merge pull request #328 from asaadmahmoodspin/mm-1874
mm-1874 - Improving team url screen and fixing file attachments in IE 10
2015-08-05 12:09:30 -04:00
Christopher Speller
2e684943b0 Merge pull request #337 from mattermost/docker-config-updates
Updating docker configuration files for release
2015-08-05 12:04:52 -04:00
Asaad Mahmood
45ca0c7f8d Updating css for url input add-on and removing display flex 2015-08-05 21:01:12 +05:00
Reed Garmsen
038b98f686 Cosmetic refactoring of the Security Setting subsection 2015-08-05 08:51:53 -07:00
Christopher Speller
7692e67728 Merge pull request #338 from nickago/MM-1671
MM-1671 Fixed typo causing new channels not to spawn
2015-08-05 11:35:35 -04:00
nickago
8b11293341 Changed max number of displayed direct message channels to 20 2015-08-05 08:11:43 -07:00
nickago
ed473e356e Fixed non-cosmetic refactoring typo 2015-08-05 07:06:10 -07:00
Christopher Speller
49cff876c4 Updating docker configuration files for release 2015-08-05 09:00:26 -04:00
Asaad Mahmood
949acc229d Fixing tooltip word-wrap 2015-08-05 16:16:35 +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
it33
401ea19030 Typo and case correction
Propose for 0.7.0
2015-08-04 21:49:36 -07:00
it33
5e87875a13 Correcting minor typos, formatting, wording 2015-08-04 18:44:22 -07: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
nickago
530d498141 Drawing all images onto a white background, thus removing transparency 2015-08-04 14:35:34 -07:00