Corey Hulen
|
d0be2ef930
|
Merge pull request #451 from CtrlZvi/log_feedback_email_error
Log invalid feedback email before overwriting with default
|
2015-08-24 12:16:46 -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 |
|
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 |
|
Corey Hulen
|
cd3f316697
|
Merge pull request #455 from nickago/MM-1604
MM-1604 Changed 1 hour expire time to 30 days
|
2015-08-24 10:43:45 -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 |
|
Corey Hulen
|
9280dfb935
|
Merge pull request #453 from asaadmahmoodspin/master
MM-1831 - Fixing channel name
|
2015-08-24 10:06:47 -07:00 |
|
nickago
|
ae3f9cdb0a
|
Changed 1 hour expire time to 30 days
|
2015-08-24 09:49:50 -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 |
|
Christopher Speller
|
3e73ff25d3
|
Merge pull request #450 from mattermost/it33-patch-5
Adding info on supported browsers
|
2015-08-24 08:58:35 -04:00 |
|
Christopher Speller
|
1581e88f19
|
Merge remote-tracking branch 'origin/it33-patch-1'
|
2015-08-24 08:38:20 -04: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 |
|
Zvi "Viz" Effron
|
305578a1e2
|
Log invalid feedback email before overwriting with default
|
2015-08-23 22:16:24 -07: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 |
|
Corey Hulen
|
567dac0ec0
|
Merge pull request #442 from asaadmahmoodspin/master
MM-1989 - Hiding Cancel text in LHS that messes up the RHS
|
2015-08-23 20:33:04 -07:00 |
|
it33
|
05a519a0e2
|
Adding info on supported browsers
|
2015-08-23 13:00:40 -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 |
|
Corey Hulen
|
06c5ddcb1d
|
Merge pull request #443 from mattermost/fixing-build
Fixes race condition
|
2015-08-21 14:56:57 -07:00 |
|
=Corey Hulen
|
f96b38b4a7
|
Fixes race condition
|
2015-08-21 14:43:53 -07:00 |
|
Asaad Mahmood
|
d3c5a30ab9
|
MM-1989 - Hiding Cancel text in LHS that messes up the RHS
|
2015-08-21 23:12:26 +05: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 |
|
Corey Hulen
|
c729d9e250
|
Merge pull request #428 from mattermost/mm-1923
Fixes MM-1923 Documenting email setup
|
2015-08-21 09:00:32 -07:00 |
|
Corey Hulen
|
1ba6946261
|
Merge pull request #430 from mattermost/fixing-build
Fixing race condition
|
2015-08-21 09:00:23 -07:00 |
|
=Corey Hulen
|
0ae7180ac5
|
Merging
|
2015-08-21 08:54:48 -07: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 |
|
it33
|
a90e4106c2
|
Clarifying wording on upgrade instructions
Also capitalizing "Docker" when it's in a sentence and not command.
|
2015-08-21 07:44:21 -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
|
e7521e5a4d
|
Merge branch 'mm-1696' of https://github.com/asaadmahmoodspin/platform into mm-1696
Conflicts:
web/react/components/setting_upload.jsx
|
2015-08-21 18:18:41 +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 |
|
Joram Wilander
|
0db01894f9
|
Merge pull request #429 from nickago/MM-1859
MM-1859 Added updating of username based mentions on username change
|
2015-08-21 07:47:46 -04:00 |
|
Asaad Mahmood
|
332a4d1628
|
Merge branch 'ui-changes' of https://github.com/asaadmahmoodspin/platform into ui-changes
Conflicts:
web/sass-files/sass/partials/_modal.scss
|
2015-08-21 15:47:20 +05: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 |
|