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

153 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
f5fec3a157 Added the ability to create a team with SSO services and added the ability to turn off email sign up. 2015-08-28 08:37:55 -04:00
JoramWilander
041d89b85a Refactored post handling/updating on both the client and server. 2015-08-27 08:21:26 -04:00
Reed Garmsen
146b349183 Added white background to non-image files (was previously transparent 2015-08-25 16:17:25 -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
Joram Wilander
ddcdcc3e2c Merge pull request #420 from asaadmahmoodspin/ui-changes
Multiple UI Improvements
2015-08-21 09:24:42 -04: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
Asaad Mahmood
e7064e6449 Solving conflicts and also fixing css for MM-1752 2015-08-21 15:45:48 +05:00
Asaad Mahmood
701cbfa94a Multiple UI Improvements 2015-08-21 15:41:10 +05: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
Joram Wilander
343ff54a32 Revert "Multiple UI Improvements" 2015-08-20 11:58:50 -04:00
Asaad Mahmood
1fd26d25f2 Multiple UI Improvements 2015-08-20 19:22:56 +05:00
Reed Garmsen
f2b06cfc7c Added feature to the 'More...' PM channel list and fixed small cosmetic issues 2015-08-18 08:47:14 -07:00
Reed Garmsen
2b80620cee Private message channels no longer refresh on creation/first use 2015-08-18 08:33:12 -07:00
Asaad Mahmood
7e2da89590 MM-319 - Minor ui changes 2015-08-18 08:59:27 -04:00
JoramWilander
32f7b50bb5 adds predictive posting on the client 2015-08-18 08:58:02 -04:00
Christopher Speller
4805608cc9 Merge pull request #391 from asaadmahmoodspin/master
Multiple UI changes
2015-08-18 08:56:24 -04:00
Christopher Speller
2f1dcf6f52 Merge pull request #381 from mattermost/mm-1705
MM-1705 add google as an oauth single-sign-on service
2015-08-18 08:47:35 -04:00
Christopher Speller
96d1eb1c80 Merge pull request #378 from rgarmsen2295/mm-316c
MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
2015-08-18 08:46:14 -04:00
Asaad Mahmood
f68a8c8de3 Multiple UI changes 2015-08-18 11:58:15 +05:00
Joram Wilander
738e53af95 Merge pull request #369 from nickago/MM-1703
MM 1703 Closing access history or activity log returns user to security menu
2015-08-17 09:37:16 -04:00
Joram Wilander
2fbc92af10 Merge pull request #379 from asaadmahmoodspin/mm-1854
mm-1858 - Truncating and adding tooltips to file names
2015-08-17 09:30:53 -04:00
Christopher Speller
26a8e19a35 Revert "MM-375 Adds text formatting features using a modified version of the marked js library" 2015-08-14 15:03:32 -04:00
Reed Garmsen
2c098d7711 Small changes to css to clean up code 2015-08-14 11:33:33 -07:00
JoramWilander
8feec04929 incorporate asaad's UI updates for google sign-up 2015-08-14 12:38:16 -04:00
nickago
156682e3de Changed user_settings1 to user_settings and removed vestigial css 2015-08-14 09:29:15 -07:00
Asaad Mahmood
67dc6e60f3 mm-1858 - Truncating and adding tooltips to file names in thumbnail details 2015-08-14 19:36:58 +05:00
Asaad Mahmood
6ca6072f47 Updating UI to cover RHS and the centre channel separately 2015-08-13 23:33:18 +05:00
Asaad Mahmood
097257ade8 UI Upgrades to file overlay for uploads 2015-08-13 23:11:01 +05:00
Reed Garmsen
14c121dc0c Implements better markup for css changes to be made, including an overlay of the dropzones and help pic/text 2015-08-12 14:27:44 -07:00
Reed Garmsen
6f091f0f6d Added check to make sure files are not strings 2015-08-12 12:29:57 -07:00
Reed Garmsen
9baafdb372 Changed structure to keep code contained to file_upload.jsx 2015-08-12 12:29:57 -07:00
Reed Garmsen
81d7599f75 Working on adding overlays for file drag and drop 2015-08-12 12:29:57 -07:00
Reed Garmsen
1fa436b4f9 Users can now drop files into the center pane or the rhs respectively to upload images and other files 2015-08-12 12:29:57 -07:00
Reed Garmsen
d293bc0b79 Implemented basic text formatting package using a modfied version of the marked js library. Supports *bold*, _italics_, and code 2015-08-12 11:19:42 -07:00
hmhealey
34f7451c4a Added indicators for when a channel with unread posts is offscreen 2015-08-06 18:57:57 -04:00
Christopher Speller
48df0037a2 Merge pull request #329 from asaadmahmoodspin/ui-changes
UI Improvements
2015-08-06 10:23:04 -04:00
Asaad Mahmood
331ab2acfc Adding tooltip to email in user popover 2015-08-05 22:29:44 +05:00
Christopher Speller
201d165ed9 Merge pull request #342 from mattermost/release-0.6.0
Release 0.6.0
2015-08-05 12:29:28 -04:00
Asaad Mahmood
45ca0c7f8d Updating css for url input add-on and removing display flex 2015-08-05 21:01:12 +05:00
Asaad Mahmood
949acc229d Fixing tooltip word-wrap 2015-08-05 16:16:35 +05:00
Asaad Mahmood
022317823e Merge branch 'master' of https://github.com/mattermost/platform
Conflicts:
	web/react/components/mention_list.jsx
2015-08-05 15:50:54 +05:00
Reed Garmsen
dfc6e80437 Fixed help text rendering on mobile 2015-08-04 08:47:18 -07:00
Asaad Mahmood
77f52da255 UI Improvements 2015-08-04 19:12:20 +05:00
Asaad Mahmood
6ee11f0cbe mm-1874 - Improving team url screen and fixing file attachments in IE 10 2015-08-04 18:58:13 +05:00
Reed Garmsen
dbf104686a Added help text informing the user that the team invite link has been copied when they press the 'Copy Link' button 2015-08-03 14:00:47 -07:00
Corey Hulen
2aba63df8e Merge pull request #302 from hmhealey/mm1788
MM-1788 Removed ^replying in preparation for 0.6.0
2015-08-02 09:00:13 -08:00
JoramWilander
a541f09380 image thumbnails now scale appropriately so there is no whitespace, also generalized some thumbnail loading code 2015-07-31 09:36:45 -04:00
Joram Wilander
d0865b78b7 Merge pull request #271 from hmhealey/mm1656
MM-1656 Updated file UI
2015-07-31 09:16:07 -04:00