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

799 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
bca7cb76db Merge pull request #458 from rgarmsen2295/mm-1983
MM-1983 Fixed issue with timestamp incorrectly displaying single digit minutes
2015-08-25 08:48:32 -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
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
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
911836d597 Fixed issue with timestamp incorrectly displaying single digit minutes 2015-08-24 10:52:53 -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
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
Corey Hulen
060cb6c662 Merge pull request #447 from mattermost/it33-patch-2
Renaming "Feature Settings"->"Advanced Features"
2015-08-23 20:34:46 -07:00
Corey Hulen
1d39c13fd9 Merge pull request #444 from nickago/MM-1795
MM-1795 Added fullscreen capability to youtube embed
2015-08-23 20:33:31 -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
Reed Garmsen
d629248151 Fixed issue with logout in active sessions not working in ie10 2015-08-22 11:27:45 -07:00
Reed Garmsen
c1afc988cb Added cache: false to ajax calls that caused problems with ie10 2015-08-22 11:27:45 -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
65349d0259 Added fullscreen capability to youtube embed 2015-08-21 15:21:47 -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
Christopher Speller
e1c2f5ae8e Merge pull request #434 from mattermost/it33-patch-1
Fixing typo "SelectFile" -> "Select File"
2015-08-21 08:24:31 -04:00
Joram Wilander
8c59e3395c Merge pull request #425 from rgarmsen2295/mm-1901
MM-1901 When a user joins a channel that channel is now automatically opened for them
2015-08-21 07:49:33 -04:00
Asaad Mahmood
e7064e6449 Solving conflicts and also fixing css for MM-1752 2015-08-21 15:45:48 +05:00
Asaad Mahmood
da97cecd25 Merge branch 'master' of https://github.com/mattermost/platform into ui-changes
Conflicts:
	web/react/components/channel_notifications.jsx
2015-08-21 15:42:11 +05:00
Asaad Mahmood
3a76e82cdb Updating intro text for channels 2015-08-21 15:41:10 +05:00
Asaad Mahmood
5ab8c7cad0 Removing getDOMNode from view_image 2015-08-21 15:41:10 +05:00
Asaad Mahmood
701cbfa94a Multiple UI Improvements 2015-08-21 15:41:10 +05:00
it33
8bc9dadf79 Adjusting "Find Your Team" instructions 2015-08-21 00:17:21 -07:00
it33
8ea10942a2 Fixing typo "Summery" -> "Summary" 2015-08-20 23:26:55 -07:00
it33
f23f377612 Fixing typo "SelectFile" -> "Select File" 2015-08-20 23:20:42 -07:00
Corey Hulen
08941cf554 Merge pull request #433 from nickago/MM-1840
MM-1840 Changed title of the edit channel modal
2015-08-20 17:09:51 -07:00
nickago
d342c69e47 changed title of edit_channel modal 2015-08-20 15:29:40 -07:00
nickago
925fe78c4f Updated navbar to more accurately mirror desktop preformance 2015-08-20 15:23:12 -07:00
nickago
b000fc7c80 Removed state holding functionality when switching to access history or session view 2015-08-20 15:06:03 -07:00