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

2476 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
ff03c53c46 Merge pull request #781 from hmhealey/plt332
PLT-332 Improved date tooltips
2015-09-24 12:01:22 -04:00
Corey Hulen
819ef528b8 Merge pull request #779 from mattermost/plt-294
PLT-294 Converting preview image modal to use react-bootstrap.
2015-09-24 08:59:00 -07:00
Corey Hulen
a7d75d3bce Merge pull request #778 from mattermost/plt-43
PLT-43 Fixes backspace navigating back a page.
2015-09-24 08:58:32 -07:00
hmhealey
44e00a4f9c Changed format of date tooltips 2015-09-24 11:36:32 -04:00
hmhealey
32feec5b66 Removed timestamp tooltips from posts in the RHS 2015-09-24 11:25:36 -04:00
Christopher Speller
c5d78f828a Converting preview image modal to use react-bootstrap. Fixes issue where modal would appear behind background on iOS 2015-09-24 10:58:56 -04:00
JoramWilander
21a1eaa189 Fixes backspace navigating back a page. 2015-09-24 10:13:14 -04:00
Harrison Healey
d5343f997d Merge pull request #777 from asaadmahmoodspin/plt-363
plt-363 - Adding organisation theme
2015-09-24 10:00:35 -04:00
Asaad Mahmood
5183103e8f plt-363 - Adding organisation theme 2015-09-24 18:55:53 +05:00
Harrison Healey
4f371254c6 Merge pull request #771 from rgarmsen2295/plt-143
PLT-143 Support for text drag and drop
2015-09-24 09:17:59 -04:00
Harrison Healey
90d1f4c6a1 Merge pull request #776 from mishimi/patch-5
PLT-388 Added warning that @mentions from Slack are not imported
2015-09-24 09:09:53 -04:00
Christopher Speller
54c7dba33d Merge pull request #765 from mattermost/PLT-349
PLT-349 adding team mgt to admin console
2015-09-24 08:14:30 -04:00
Joram Wilander
56f76502e3 Merge pull request #769 from hmhealey/plt334
PLT-334 Restricted markdown output to only appear on one line when in singleline mode
2015-09-24 08:14:25 -04:00
mishimi
59afe8bdf8 PLT-388
Warning users that  @mentions from Slack are currently not supported after import
2015-09-24 04:07:49 -07:00
=Corey Hulen
00112cae51 Assiging first user system_admin role 2015-09-23 15:52:59 -07:00
Reed Garmsen
ef8705ab6b Text cursor now focuses on the textbox after performing a drag and drop of some text 2015-09-23 15:41:26 -07:00
Corey Hulen
fba72b849c Merge pull request #766 from mattermost/postpone-oauth-and-webhooks
Removing OAuth and webhooks changes
2015-09-23 15:25:44 -07:00
Corey Hulen
23029204dc Merge pull request #770 from hmhealey/plt339
PLT-339 Changed Markdown links to open in a new tab
2015-09-23 15:21:46 -07:00
=Corey Hulen
985aebf861 Fixing state setting 2015-09-23 15:16:48 -07:00
Reed Garmsen
03eece597d Added support to drag and drop text into the main textbox or RHS textbox 2015-09-23 15:01:02 -07:00
hmhealey
466f470ff1 Changed Markdown links to open in a new tab 2015-09-23 17:53:46 -04:00
hmhealey
511fcce553 Restricted markdown output to only appear on one line when in singleline mode 2015-09-23 17:42:57 -04:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
Corey Hulen
c7c644874e Merge pull request #768 from mattermost/segment-fix
fixing segment bug
2015-09-23 14:35:26 -07:00
=Corey Hulen
a9c4f5efd0 fixing segment bug 2015-09-23 14:35:05 -07:00
Corey Hulen
b7d819bfcd Merge pull request #767 from mattermost/segment-fix
fixing segment bug
2015-09-23 14:33:04 -07:00
=Corey Hulen
2f72d4702b fixing segment bug 2015-09-23 14:32:44 -07:00
Harrison Healey
f9abb5a94a Merge pull request #762 from asaadmahmoodspin/ui-improvements
Markdown UI improvements with small description height fix
2015-09-23 17:21:57 -04:00
Corey Hulen
d792745f54 Merge pull request #752 from mattermost/PLT-11-email
PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
2015-09-23 14:04:08 -07:00
=Corey Hulen
ccf2e6e4e7 Changing image settings to file settings 2015-09-23 13:47:10 -07:00
Reed Garmsen
ea0dcb4421 Small fix for react key warning 2015-09-23 13:36:41 -07:00
it33
1779a71721 Removing OAuth and webhooks changes
While OAuth2 and webhooks are in the codebase, the UI was only partly finished and we foresee enough time for testing before shipping Oct 2 so we're postponing these to the Oct 16 release.
2015-09-23 13:29:50 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07:00
Corey Hulen
0170cfe604 Merge pull request #764 from mattermost/theme-image-fix
Fix theme images 404ing.
2015-09-23 12:44:13 -07:00
JoramWilander
e79e66c0a4 Fix theme images 404ing. 2015-09-23 15:29:39 -04:00
Harrison Healey
bff0956ba5 Merge pull request #761 from mattermost/plt-356
PLT-356 Fix post not rendering properly in some cases.
2015-09-23 15:04:45 -04:00
Harrison Healey
15f15de8ca Merge pull request #759 from mattermost/plt-242-3
PLT-242 Implement custom UI theme colors.
2015-09-23 15:04:22 -04:00
Asaad Mahmood
47aab71e6b Markdown UI improvements with small description height fix 2015-09-23 23:37:36 +05:00
Corey Hulen
301706f255 Merge pull request #753 from hmhealey/plt341
PLT-341 Added CSS classes to markdown headings, links, and tables
2015-09-23 09:57:43 -07:00
JoramWilander
845229d983 Fix post not rendering properly in some cases. 2015-09-23 12:25:01 -04:00
Harrison Healey
fa312f5b47 Merge pull request #760 from chengweiv5/PLT-126
PLT-126: Change 'Private Messages' to 'Direct Messages'
2015-09-23 11:31:10 -04:00
Chengwei Yang
f7a32fa38a PLT-126: Change 'Private Messages' to 'Direct Messages'
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
2015-09-23 22:43:14 +08:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
hmhealey
018b036e5d Added CSS classes to markdown headings, links, and tables 2015-09-23 09:37:48 -04:00
Joram Wilander
7eef5be359 Merge pull request #740 from asaadmahmoodspin/ui-improvements
UI Modifications for multiple tickets
2015-09-23 08:41:17 -04:00
Joram Wilander
f2c0db000c Merge pull request #756 from rgarmsen2295/plt-165
PLT-165 Prevents users from signing up via a public link using a non-valid email address
2015-09-23 08:40:11 -04:00
Joram Wilander
e637927a0b Merge pull request #757 from chengweiv5/PLT-168
PLT-168: check email used to reset password strictly
2015-09-23 08:39:31 -04:00
Christopher Speller
d3c09f209b Merge pull request #755 from rgarmsen2295/plt-164
PLT-164 Post drafts containing only files are now recognized properly
2015-09-23 08:30:42 -04:00
Christopher Speller
bdd0cfd227 Merge pull request #751 from hmhealey/plt344
PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
2015-09-23 08:27:12 -04:00