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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
=Corey Hulen
|
e4b66c3ff4
|
Fixing audit log to wait for confirm
|
2015-08-20 15:04:37 -07:00 |
|
=Corey Hulen
|
09b0f61194
|
Removing my enviroment
|
2015-08-20 14:48:51 -07:00 |
|
=Corey Hulen
|
42822df5b3
|
Fixing race condition
|
2015-08-20 14:48:04 -07:00 |
|
=Corey Hulen
|
1b4135ab0d
|
Fixing bug
|
2015-08-20 14:40:25 -07:00 |
|
nickago
|
8e8cc302e6
|
Added updating of username based mentions on username change
|
2015-08-20 14:29:40 -07:00 |
|
=Corey Hulen
|
3f0ec24dc1
|
Fixing build
|
2015-08-20 14:20:39 -07:00 |
|
=Corey Hulen
|
8b3bbc5fb9
|
Merge branch 'enviro' into fixing-build
|
2015-08-20 14:12:27 -07:00 |
|
Corey Hulen
|
7d0f1e7fef
|
Merge pull request #423 from nickago/MM-1888
MM-1888 Added blank href to make tab recognize and jump to it
|
2015-08-20 13:46:40 -07:00 |
|
Corey Hulen
|
690b1bee25
|
Merge pull request #410 from rgarmsen2295/mm-1821b
MM-1821 Replaces the on/off buttons with simple radio buttons
|
2015-08-20 13:46:04 -07:00 |
|
Corey Hulen
|
6d80c25ae5
|
Merge pull request #413 from mattermost/mm-1940
MM-1940 Adding updates section to README
|
2015-08-20 13:45:43 -07:00 |
|
=Corey Hulen
|
60be2a5636
|
Documenting email setup
|
2015-08-20 13:44:01 -07:00 |
|
=Corey Hulen
|
779f7195c2
|
Documenting email setup
|
2015-08-20 13:41:35 -07:00 |
|
Asaad Mahmood
|
796a3001cc
|
MM-1696 - Improvements for Slack Import
|
2015-08-21 00:54:35 +05:00 |
|
Asaad Mahmood
|
fd7efdb768
|
Updating intro text for channels
|
2015-08-21 00:34:49 +05:00 |
|
Joram Wilander
|
19123e5523
|
Merge pull request #424 from mattermost/mm-1987
MM-1987 Fixing posts not being able to upload
|
2015-08-20 15:26:49 -04:00 |
|
Joram Wilander
|
626c7d525c
|
Merge pull request #422 from mattermost/ampm-fix
Fixing AM-PM issue
|
2015-08-20 15:26:30 -04:00 |
|