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 |
|
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
|
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 |
|
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 |
|
Reed Garmsen
|
7fa8f7febc
|
Fixed issue with channel name in url and added loading icon to replace 'Join' button for slow connections
|
2015-08-20 12:13:36 -07:00 |
|
Christopher Speller
|
a1859fb341
|
Fixing posts not being able to upload
|
2015-08-20 14:44:30 -04:00 |
|
Reed Garmsen
|
173326941d
|
Cosmetic reformatting of more_channels.jsx
|
2015-08-20 11:40:53 -07:00 |
|
nickago
|
b1e144881d
|
Added blank href to make tab recognize and jump to it
|
2015-08-20 11:20:28 -07:00 |
|
Corey Hulen
|
2398d768d5
|
Merge pull request #418 from mattermost/mm-1811
MM-1811 Skipping invite members step when email is disabled.
|
2015-08-20 10:57:14 -07:00 |
|
Corey Hulen
|
521f8a6533
|
Merge pull request #421 from nickago/hotfix
HOTFIX: Fixed this/self typo
|
2015-08-20 10:56:11 -07:00 |
|
nickago
|
e0a525ebe7
|
Fixed this/self typo
|
2015-08-20 10:44:22 -07:00 |
|
Christopher Speller
|
24c13730ef
|
Fixing AM-PM issue
|
2015-08-20 12:59:07 -04:00 |
|
Reed Garmsen
|
d1955b982c
|
Users are now placed in the channel after joining it from the 'More...' channel menu
|
2015-08-20 09:46:51 -07:00 |
|
Joram Wilander
|
7d5d6ae5b0
|
Merge pull request #404 from nickago/MM-1886
Mm 1886 Add loading screen to channel invite modal
|
2015-08-20 12:35:13 -04:00 |
|
Reed Garmsen
|
c4fccd2f23
|
Reformats the user_settings_notifications.jsx file
|
2015-08-20 09:04:25 -07:00 |
|
Reed Garmsen
|
5fb0492a34
|
Cosmetic reformatting of the channel_notifications.jsx file
|
2015-08-20 09:04:25 -07:00 |
|
Joram Wilander
|
343ff54a32
|
Revert "Multiple UI Improvements"
|
2015-08-20 11:58:50 -04:00 |
|
Harrison Healey
|
4fafac5225
|
Merge pull request #416 from asaadmahmoodspin/ui-changes
Multiple UI Improvements
|
2015-08-20 11:33:29 -04:00 |
|
nickago
|
6bab566b85
|
Made state getter member function and fixed scu edge case
|
2015-08-20 08:16:17 -07:00 |
|
Christopher Speller
|
5e5f4d3999
|
Skipping invite members step when email is disabled. Cosmetic refactoring included.
|
2015-08-20 11:04:31 -04:00 |
|
nickago
|
44648e77e3
|
Fixed mixed case typo
|
2015-08-20 07:45:29 -07:00 |
|
Asaad Mahmood
|
1fd26d25f2
|
Multiple UI Improvements
|
2015-08-20 19:22:56 +05:00 |
|
Christopher Speller
|
2915b09d0f
|
Merge pull request #414 from mattermost/update-etag-version
Update etag version for the addition of CreatorId field to channels
|
2015-08-20 10:13:00 -04:00 |
|
JoramWilander
|
b5d87fea99
|
Update etag version for the addition of CreatorId field to channels
|
2015-08-20 09:55:14 -04:00 |
|
Harrison Healey
|
a4681123f9
|
Merge pull request #401 from rgarmsen2295/mm-1875
MM-1875 Url parameters are now removed after logging in
|
2015-08-20 09:37:23 -04:00 |
|
Joram Wilander
|
852555d375
|
Merge pull request #412 from mattermost/sidebar-patch
Fixing a few refactoring errors.
|
2015-08-20 09:36:13 -04:00 |
|
Christopher Speller
|
450494548d
|
Fixing a few refactoring errors.
|
2015-08-20 08:41:45 -04:00 |
|
nickago
|
89c39b55db
|
Re-added state update on show
|
2015-08-19 15:29:58 -07:00 |
|
nickago
|
30330ea3e8
|
Cosmetic refactoring
|
2015-08-19 15:16:13 -07:00 |
|
nickago
|
01b5166e59
|
Added loading screen to add more members modal
|
2015-08-19 13:49:26 -07:00 |
|
Reed Garmsen
|
c7185ffb68
|
Additional cosmetic reformatting to meet new es6 requirements
|
2015-08-19 12:22:37 -07:00 |
|
Christopher Speller
|
65f1d0297e
|
Merge pull request #406 from mattermost/mm-1281
MM-1281 Track channel creator in DB and show in channel intro message
|
2015-08-19 14:15:01 -04:00 |
|
Christopher Speller
|
fbc2283220
|
Merge pull request #400 from nickago/MM-1829
Mm 1829 Fixed edge case of stale data not being cleared from user settings display
|
2015-08-19 14:12:09 -04:00 |
|
Joram Wilander
|
5f43945805
|
Merge pull request #394 from mattermost/mm-1410
MM-1410 Initial implementaiton of import from Slack
|
2015-08-19 12:19:02 -04:00 |
|
Reed Garmsen
|
d0e3d9aef8
|
Url parameters are now removed after logging in
|
2015-08-19 08:32:03 -07:00 |
|