IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,514 Commits 845 Branches 1,202 Tags
84e3c816d624b938dcfb378a33c87f3407d541db
Commit Graph

1302 Commits

Author SHA1 Message Date
it33
84e3c816d6 Update team_settings.jsx 2015-09-25 21:01:42 -07:00
it33
0c27f8e584 Update service_settings.jsx 2015-09-25 20:56:32 -07:00
it33
4192b9efce Minor wording change 2015-09-25 08:09:50 -07:00
it33
d60c18d8d6 Typo fix 2015-09-25 07:59:36 -07:00
it33
8ec509b9f6 Fix capitalization type 2015-09-25 07:57:51 -07:00
Harrison Healey
1a92a3cc79 Merge pull request #801 from mattermost/plt-376 
PLT-376 Fix account settings being scrolled to bottom when opened.
 2015-09-25 09:42:34 -04:00
JoramWilander
b03d8610de Fix acconut settings being scrolled to bottom when opened. 2015-09-25 08:43:06 -04:00
mishimi
b86833f0c5 PLT 381 In Theme Color settings, change the "Button Color" to "Button Text" 
Also made the following changes
1. Capitalize all words
2. Remove the word "color" if it comes after "text"
Ex. Sidebar text color --> Sidebar Text
 2015-09-25 05:23:04 -07:00
=Corey Hulen
8ad9a88bda Fixing merge 2015-09-24 12:12:27 -07:00
Harrison Healey
caa157a377 Merge pull request #789 from mattermost/PLT-362 
PLT-362 removing themes and hiding OAuth provider option.
 2015-09-24 15:07:48 -04:00
Joram Wilander
9d136beb02 Merge pull request #785 from mattermost/PLT-203 
Partial fix for PLT-203
 2015-09-24 14:52:51 -04:00
Christopher Speller
6d3e836668 Merge pull request #788 from hmhealey/plt379 
PLT-379 Removed smilies that start with a semicolon
 2015-09-24 14:52:08 -04:00
=Corey Hulen
57269dcaf4 Removing default theme no longer in use 2015-09-24 11:08:39 -07:00
=Corey Hulen
e58f15a286 Disabling OAuth provider for 0.8 2015-09-24 11:06:00 -07:00
hmhealey
fe55c77a41 Removed smilies that start with a semicolon 2015-09-24 13:56:14 -04:00
=Corey Hulen
a374419ad5 Removing old valet crud 2015-09-24 10:52:32 -07:00
Joram Wilander
d077655ffc Merge pull request #782 from asaadmahmoodspin/plt-298 
plt-298 - Improving UI for webhooks
 2015-09-24 13:37:35 -04:00
Harrison Healey
75b1b43fd8 Merge pull request #783 from mattermost/plt-287 
PLT-287 Hiding export from UI
 2015-09-24 12:53:41 -04:00
=Corey Hulen
717fab65e0 Partial fix for PLT-203 2015-09-24 09:44:36 -07:00
Christopher Speller
7efacb09bf Fixing arrow keys in preview image modal 2015-09-24 12:39:36 -04:00
Christopher Speller
e6697a447e Hiding export from UI 2015-09-24 12:12:12 -04:00
Asaad Mahmood
1ca84a8f8a plt-298 - Improving UI for webhooks 2015-09-24 21:05:21 +05:00
Joram Wilander
6c0d094d13 Merge pull request #780 from hmhealey/plt258 
PLT-258 Added help text to notification settings to say which browsers support them
 2015-09-24 12:01:50 -04:00
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
hmhealey
a59f8def8c Added help text to notification settings to say which browsers support them 2015-09-24 10:58:49 -04:00
JoramWilander
21a1eaa189 Fixes backspace navigating back a page. 2015-09-24 10:13:14 -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
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
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
a9c4f5efd0 fixing segment bug 2015-09-23 14:35:05 -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
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
=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