Commit Graph

1088 Commits

Author SHA1 Message Date
=Corey Hulen
9e04909c0a Adding new EnableIncomingWebhooks property to service settings in the admin console. 2015-09-22 13:28:03 -07:00
=Corey Hulen
6e60768abe Fixing merge conflict 2015-09-22 13:18:42 -07:00
Joram Wilander
ac7918c554 Merge pull request #715 from mattermost/plt-27
PLT-27 Implement incoming webhooks.
2015-09-22 15:47:57 -04:00
=Corey Hulen
e22e7b8b7b Fixing bug in generating key length 2015-09-22 12:31:01 -07:00
=Corey Hulen
fc71869a96 Merge branch 'master' into PLT-11-email 2015-09-22 12:24:39 -07:00
=Corey Hulen
88e5a71e8c Adding service settings to admin console 2015-09-22 12:12:50 -07:00
Christopher Speller
e7d408585a Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify" 2015-09-22 13:21:58 -04:00
Harrison Healey
f439c82d7c Merge pull request #737 from hmhealey/plt289
PLT-289 Added parsing for named emojis to TextFormatting and removed emojify
2015-09-22 09:32:25 -04:00
hmhealey
251d33ad23 Added parsing for named emojis to TextFormatting and removed dependency on emojify 2015-09-22 09:22:49 -04:00
=Corey Hulen
08a3acbb44 Adding team settings to admin console 2015-09-22 01:15:41 -07:00
Corey Hulen
df2d668d59 Merge pull request #730 from mattermost/shorten-description-help-text
Shorten description help text
2015-09-22 00:42:44 -07:00
=Corey Hulen
f05a2c03d5 Adding SQL settings to admin console 2015-09-22 00:00:19 -07:00
=Corey Hulen
e78c79b832 Adding rate limiter settings to the admin console 2015-09-21 19:01:52 -07:00
=Corey Hulen
cae5dbd245 Adding privacy to admin console 2015-09-21 18:23:10 -07:00
=Corey Hulen
f8e2a43d09 Fixing eslint errors 2015-09-21 17:52:30 -07:00
=Corey Hulen
0529a494ae Adding image properties 2015-09-21 17:34:13 -07:00
=Corey Hulen
e863096358 Fixing broken signup pages 2015-09-21 15:34:09 -07:00
it33
80488dec22 Adjusting sentence 2015-09-21 15:26:44 -07:00
=Corey Hulen
9baef5a6a0 Fixing button 2015-09-21 15:17:02 -07:00
=Corey Hulen
ed9a2da83b Adding email to admin console 2015-09-21 15:11:56 -07:00
JoramWilander
98186e5018 Implement incoming webhooks. 2015-09-21 14:22:23 -04:00
Christopher Speller
ee5a77ec56 Merge pull request #734 from mattermost/plt-206
PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.
2015-09-21 12:19:57 -04:00
Joram Wilander
977ab87d4a Merge pull request #736 from hmhealey/plt312
PLT-312 Added theme class to markdown links
2015-09-21 12:13:44 -04:00
hmhealey
a2e3446e37 Added theme class to markdown links 2015-09-21 11:46:29 -04:00
JoramWilander
3e868a6042 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. 2015-09-21 11:30:08 -04:00
Joram Wilander
a35fa9c974 Merge pull request #732 from mattermost/plt-243
PLT-243 Adding new create channel modal to the more menu
2015-09-21 11:18:24 -04:00
hmhealey
d1101e3c91 Wrapped comment messages in divs like posts in the center pane 2015-09-21 10:03:47 -04:00
Christopher Speller
05b4a14d1e Adding new create channel modal to the more menu 2015-09-21 09:40:45 -04:00
Joram Wilander
7255209b72 Merge pull request #722 from hmhealey/timestamp
Added a tooltip to post timestamps displaying the actual time the post was created
2015-09-21 08:38:27 -04:00
Christopher Speller
4578138d57 Merge pull request #731 from asaadmahmoodspin/new-channel
Updating new channel UI
2015-09-21 08:25:41 -04:00
Asaad Mahmood
5dbdc0ff76 Updating new channel UI 2015-09-21 11:09:23 +05:00
it33
814e467435 Shorten description help text
Currently it word wraps, this prevents word-wrapping
2015-09-20 21:24:27 -07:00
hmhealey
144a277a44 Cleaned up markdown formatting code and removed debug statements 2015-09-19 11:18:37 -04:00
hmhealey
5f18c71d07 Deferred to marked.js's html sanitization when markdown is enabled 2015-09-19 11:18:32 -04:00
hmhealey
2eb320f48a Changed markdown link parsing to automatically add an explicit protocol to urls 2015-09-19 10:39:55 -04:00
hmhealey
efb3462a68 Prevented our url autolinking from breaking markdown links 2015-09-19 10:39:51 -04:00
hmhealey
bb330b662a Added marked library to text_formatting.jsx 2015-09-19 10:08:59 -04:00
hmhealey
ae5a1e3ea8 Removed underscores surrounding formatting tokens since they won't work with markdown 2015-09-19 10:08:59 -04:00
hmhealey
208bf914b8 Removed unnecessary conversion of newlines to html line breaks 2015-09-19 10:08:59 -04:00
hmhealey
cfc919d111 Added a tooltip to post timestamps displaying the actual time the post was created 2015-09-19 09:18:27 -04:00
=Corey Hulen
cdf813f07b merging 2015-09-18 09:25:47 -07:00
Joram Wilander
5a436fd447 Merge pull request #699 from mattermost/PLT-92
PLT-92 Adding server side versioning to the binary
2015-09-18 12:22:57 -04:00
hmhealey
bc8e69d99f Fixed incorrect check if a url starts with an explicit protocol 2015-09-18 11:56:23 -04:00
=Corey Hulen
60af1fad1f Moving logout item 2015-09-17 22:25:37 -07:00
=Corey Hulen
804b696bdc PLT-11 adding config for logs to UI 2015-09-17 22:00:33 -07:00
=Corey Hulen
44714dfcb1 PLT-11 Adding ability to save config file 2015-09-17 21:00:59 -07:00
Corey Hulen
82127341ca Merge pull request #705 from esethna/patch-1
Grammar change to New Channel ui text
2015-09-17 13:25:21 -07:00
=Corey Hulen
c63da24964 moving to security tab 2015-09-17 13:24:55 -07:00
=Corey Hulen
af4deb2369 Making changes to versioning 2015-09-17 13:01:40 -07:00
=Corey Hulen
9b5198c69c Merge branch 'master' into PLT-92 2015-09-17 09:21:56 -07:00