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,844 Commits 845 Branches 1,202 Tags
1f30ed3a4d384cbe1260e24ee4cb1695ca1eae9a
Commit Graph

727 Commits

Author SHA1 Message Date
it33
1f30ed3a4d Updating help text for Slack Import screen 2015-08-27 10:46:42 -07:00
Corey Hulen
d3093028cf Merge pull request #484 from mattermost/mm-1994 
MM-1994 Improvements to import UI
 2015-08-27 08:32:09 -07:00
Christopher Speller
e1c09605dc Merge pull request #469 from mattermost/mm-1699 
MM-1699 Refactored post handling/updating on both the client and server
 2015-08-27 11:22:19 -04:00
Christopher Speller
d5e202a4d9 Merge pull request #472 from rgarmsen2295/mm-1853 
MM-1853 Prevents users from typing more than 4000 characters into any any post/comment
 2015-08-27 10:01:54 -04:00
JoramWilander
041d89b85a Refactored post handling/updating on both the client and server. 2015-08-27 08:21:26 -04:00
Christopher Speller
8356e25f80 Merge pull request #471 from nickago/MM-1803 
MM-1803 Added clearing of search bar on close of comment section of RHS
 2015-08-27 08:19:40 -04:00
Reed Garmsen
a56603d666 Moved duplicate code into functions and added better handling of large paste text dumps 2015-08-26 16:53:19 -07:00
Christopher Speller
1ed6718dd9 Improvements to import UI 2015-08-26 15:24:17 -04:00
Reed Garmsen
68ba3174fe Clears the 'new channel' dialogue box of errors and previous input on exit 2015-08-25 17:38:16 -07:00
Reed Garmsen
146b349183 Added white background to non-image files (was previously transparent 2015-08-25 16:17:25 -07:00
nickago
70634ecdf2 Added clearing of search bar on close of comment section of RHS 2015-08-25 13:26:36 -07:00
Corey Hulen
eb5af31c17 Merge pull request #466 from mattermost/mm-1912 
Fixes mm-1912 move get file info into its own web service call
 2015-08-25 13:17:21 -07:00
Reed Garmsen
656a88efdd Fixed issue with carriage returns being counted improperly in non-ie browsers and updated error messages to be appropriate to what is being typed (message vs. post vs. edit) 2015-08-25 13:16:44 -07:00
Reed Garmsen
5766bbfc65 Prevents users from typing more than 4000 characters into any 'textbox' (posts, comments, and post/comment edits). Also adds new error message for when users hit exactly 4000 characters so they know the limit. 2015-08-25 09:40:08 -07:00
Joram Wilander
e8731133d2 Merge pull request #464 from rgarmsen2295/mm-1895 
MM-1895 Adds email help text
 2015-08-25 08:52:37 -04:00
Joram Wilander
b40de482a3 Merge pull request #445 from rgarmsen2295/mm-1995 
MM-1995 Moved the ability to rename a team into the team settings modal and fixed valet regression
 2015-08-25 08:51:54 -04:00
Joram Wilander
fccb967aff Merge pull request #460 from nickago/MM-1996 
MM-1996 exapnded form tag to include submission button
 2015-08-25 08:50:12 -04:00
Corey Hulen
415ea0b502 Merge pull request #459 from nickago/MM-1966 
MM-1966 Re-enabled enter key submission for send invites page
 2015-08-24 15:14:36 -07:00
=Corey Hulen
64b179ab0e Fixes mm-1912 move get file info into its own web service call 2015-08-24 15:03:52 -07:00
Corey Hulen
930488f002 Merge pull request #465 from rgarmsen2295/prof-img-fix 
Fixes issue with site trying to load profile pictures without having profile information
 2015-08-24 13:09:25 -07:00
Reed Garmsen
b2c16401c8 Fixed issue with site tryinng to load profile pictures without having profile information 2015-08-24 12:58:04 -07:00
Joram Wilander
29c7f61c3a Merge pull request #441 from nickago/MM-1893 
MM-1893 Upon exiting edit post modal, focus is placed on the respective text input field
 2015-08-24 15:57:56 -04:00
Joram Wilander
c486508431 Merge pull request #446 from rgarmsen2295/mm-1999 
MM-1999 Removes 'for' from the edit channel description title when the channel has no title
 2015-08-24 15:56:39 -04:00
Reed Garmsen
a7f932ef90 Added email help text and added licensing info 2015-08-24 12:28:46 -07:00
nickago
203a3e468f exapnded form tag to include submission button 2015-08-24 11:52:29 -07:00
Corey Hulen
192e18cdd0 Merge pull request #449 from rgarmsen2295/mm-1933 
Multiple fixes for IE10 & Edge browsers primarily due to aggressive ajax call caching on the browser
 2015-08-24 11:27:49 -07:00
nickago
1464f4e412 Re-enabled enter key submission for send invites page 2015-08-24 11:27:04 -07:00
Corey Hulen
354d1302c0 Merge pull request #457 from rgarmsen2295/mm-1833 
MM-1833 Changes the max number of characters for a channel title/handle to 22
 2015-08-24 11:26:42 -07:00
Reed Garmsen
47168a70a1 Removes 'for' from the edit channel description modal title when editing the description of a private message channel 2015-08-24 10:33:35 -07:00
Reed Garmsen
d34d52a924 Changes the max number of characters for a channel title/handle to 22 2015-08-24 10:18:56 -07:00
Reed Garmsen
bf82facd5a Moved the ability to rename a team into the team settings modal; fixed issues with valet settings 2015-08-24 08:36:55 -07:00
Asaad Mahmood
f785d1371c MM-1831 - Fixing channel name and having channel name in bold for edit channel modal 2015-08-24 18:43:47 +05:00
Joram Wilander
7d8a9bf0e8 Merge pull request #439 from nickago/MM-1822 
MM-1822 Added help text to profile picture screen
 2015-08-24 07:11:59 -04:00
Corey Hulen
9843bcc0bf Merge pull request #440 from nickago/MM-1803 
MM-1803 Remove search term after the RHS is closed
 2015-08-23 20:38:43 -07:00
Corey Hulen
b73f43d994 Merge pull request #448 from mattermost/it33-patch-4 
Changing "Features"->"Advanced" in Team Settings
 2015-08-23 20:35:08 -07:00
Reed Garmsen
86428fff99 Fixes issue with profile pictures not updating w/o refresh and prevents more ie10 ajax caching issues 2015-08-22 11:59:42 -07:00
it33
4920ca387f Changing "Features"->"Advanced" in Team Settings 
Also changing order of menu items, so Advanced (least used) is at the bottom)
 2015-08-21 22:19:48 -07:00
it33
e0724ceaf6 Renaming "Feature Settings"->"Advanced Features" 2015-08-21 22:17:07 -07:00
nickago
794881ce24 Upon exiting edit post modal, foucs is placed on the respective text input field 2015-08-21 09:45:48 -07:00
Harrison Healey
76813b5a55 Merge pull request #427 from asaadmahmoodspin/mm-1696 
MM-1696 - Improvements for Slack Import
 2015-08-21 12:12:45 -04:00
nickago
8230b49014 remove search term after the RHS is closed 2015-08-21 08:44:44 -07:00
nickago
aaa0bb9d4d Added help text to profile picture screen 2015-08-21 08:09:02 -07:00
Joram Wilander
ddcdcc3e2c Merge pull request #420 from asaadmahmoodspin/ui-changes 
Multiple UI Improvements
 2015-08-21 09:24:42 -04:00
Asaad Mahmood
06b2adbcf4 Updating setting_upload 2015-08-21 18:21:04 +05:00
Asaad Mahmood
299bf056a5 Merge branch 'master' of https://github.com/mattermost/platform into mm-1696 
Conflicts:
	web/react/components/setting_upload.jsx
	web/react/components/team_import_tab.jsx
 2015-08-21 18:17:24 +05:00
Asaad Mahmood
afb09a1b9d MM-1696 - Improvements for Slack Import 2015-08-21 18:15:02 +05:00
Christopher Speller
4a022752fa Merge pull request #431 from nickago/MM-1797 
MM-1797 Removed state holding functionality when switching to access history or session view
 2015-08-21 08:39:57 -04:00
Joram Wilander
2a808a39cf Merge pull request #432 from nickago/MM-1804 
MM-1804 Updated navbar to more accurately mirror desktop preformance
 2015-08-21 08:39:47 -04:00
Christopher Speller
b476b59523 Merge pull request #437 from mattermost/it33-patch-4 
Adjusting "Find Your Team" instructions
 2015-08-21 08:27:40 -04:00
Christopher Speller
77fc2c0967 Merge pull request #435 from mattermost/it33-patch-2 
Fixing typo "Summery" -> "Summary"
 2015-08-21 08:24:55 -04:00