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
3,589 Commits 845 Branches 1,202 Tags
98ed40442d92c439d622338a965ffda460ceb4a5
Commit Graph

77 Commits

Author SHA1 Message Date
Christopher Speller
31eee1ef6e Merge pull request #1268 from mattermost/plt-514 
PLT-514 Validate callback urls on the server and add help text to outgoing webhooks
 2015-11-02 14:13:34 -05:00
JoramWilander
1f3423796e Validate callback urls on the server and add help text to outgoing webhooks 2015-11-02 10:38:13 -05:00
Stas Vovk
b84af10455 display full name, nickname or username in direct messages 2015-11-01 01:08:18 +02:00
Christopher Speller
e7f29ea214 Fixing eslint not recursing 2015-10-30 16:43:50 -04:00
Florian Orben
d630567c91 allow code theme to be shareable 2015-10-29 17:26:34 +01:00
Florian Orben
3e7ffafa97 code style theme chooser 2015-10-29 17:26:34 +01:00
Asaad Mahmood
2935e7c1bf Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-29 00:02:01 +05:00
Joram Wilander
ccf9e0cabd Merge pull request #1196 from florianorben/send-on-ctrl 
allow messages to be send on ctrl+enter
 2015-10-28 14:09:01 -04:00
Christopher Speller
c86df0f0c6 Revert "PLT-395: Add syntax highlighting to Markdown code blocks" 2015-10-28 13:09:39 -04:00
Florian Orben
f7808d1172 add new user-setting section 'advanced' and remove ctrl-send setting from general tab 2015-10-28 01:26:10 +01:00
Florian Orben
0e5612a7db allow messages to be send on ctrl+enter 2015-10-28 01:26:10 +01:00
Asaad Mahmood
179c4ea684 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-27 20:15:33 +05:00
hmhealey
ff6e91f51d Fixed file upload and profile picture upload error display to work for serverside errors 2015-10-26 14:45:13 -04:00
Florian Orben
0f62befef0 code style theme chooser 2015-10-24 21:55:44 +02:00
Asaad Mahmood
68b02ffb9e Oauth UI Improvements and settings improvement 2015-10-23 22:33:27 +05:00
Asaad Mahmood
db4273d357 Multiple UI Improvements 2015-10-23 19:59:32 +05:00
Christopher Speller
c8edad29c1 Merge pull request #1149 from mattermost/plt-808 
PLT-808 Fix deleting channels breaking the webhook UI
 2015-10-23 08:34:57 -04:00
JoramWilander
46f448899b In webhooks UI handle error if channel can't be found, also use display name over url name, plus warning fixes 2015-10-22 14:16:51 -04:00
=Corey Hulen
1fc12dd8ba Multi-session login 2015-10-20 14:49:42 -07:00
=Corey Hulen
36658c13a4 Fixing merge conflicts 2015-10-19 11:42:40 -07:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
JoramWilander
182e59f2c0 Show/hide integrations properly based off config settings. 2015-10-19 09:00:30 -04:00
JoramWilander
5574151c85 Fix postgres query and minor UI updates for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
=Corey Hulen
8b2d7f391a Fixing merge 2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3 Inital support for multi-tab loging 2015-10-16 09:10:54 -07:00
Christopher Speller
495673d80d Fixing some client warnings 2015-10-16 10:50:10 -04:00
Stas Vovk
79fcb98084 Merge remote-tracking branch 'upstream/master' into PLT-637 
Conflicts:
	web/react/utils/constants.jsx
 2015-10-16 14:21:51 +03:00
Christopher Speller
1571a9a2df Fixing most deprication warnings 2015-10-15 15:00:28 -04:00
Stas Vovk
29a0c182ef added file with display settings 2015-10-14 21:39:33 +03:00
Stas Vovk
76e278a13d added display tab under account settings. added 24h time option 2015-10-14 20:36:12 +03:00
Christopher Speller
cdbe6342bb Merge release branch 'release-1.1.0' 2015-10-14 08:27:34 -04:00
JoramWilander
ac0f8f6bcf Fix webhook name not overriding in LHS and update webhook help text. 2015-10-13 18:01:11 -04:00
Asaad Mahmood
4cfe8ce699 Multiple Ui Improvements 2015-10-13 23:28:00 +05:00
Christopher Speller
e60fb1dfd7 Fixing user settings dialog so it desn't ask you to check your email unless you changed it 2015-10-13 11:31:57 -04:00
Corey Hulen
246c7414bd Merge pull request #1018 from asaadmahmoodspin/ui-fixes 
Other UI Improvements
 2015-10-12 13:18:47 -07:00
Joram Wilander
4949b6837f Merge branch 'master' into typos 2015-10-12 12:06:55 -04:00
Asaad Mahmood
72b3a1d695 Other UI Improvements 2015-10-12 20:55:40 +05:00
it33
ea3713561b Update manage_incoming_hooks.jsx 2015-10-09 18:39:34 -07:00
it33
b0d5b6a2e2 Update user_settings_integrations.jsx 2015-10-09 18:28:57 -07:00
it33
acde3ebf98 Update manage_incoming_hooks.jsx 2015-10-09 18:27:55 -07:00
it33
6aff5900f7 Fixed typos 
There was no space after "user name." before the next sentence. Also, "user name" should be "username"
 2015-10-08 22:39:16 -07:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
Christopher Speller
7571d21f32 Merge pull request #931 from rgarmsen2295/plt-112 
PLT-112 Improves email change verification process
 2015-10-08 09:56:00 -04:00
Harrison Healey
51bf2dc185 Merge pull request #952 from tomitm/PLT-445 
PLT-445 Create About dialog
 2015-10-08 09:33:56 -04:00
Christopher Speller
4263c08c55 Merge pull request #953 from asaadmahmoodspin/plt-522 
PLT-522 - Adding option for mentionHighlightLink for themes
 2015-10-07 08:43:24 -04:00
Asaad Mahmood
698ca63d99 PLT-522 - Adding option for mentionHighlightLink for themes 2015-10-07 14:41:24 +05:00
Tomi M
5a28562354 PLT-445 Create About dialog 2015-10-06 20:31:23 -07:00
Asaad Mahmood
d99aea1502 Removing sidebar text hover color 2015-10-06 22:33:30 +05:00
Reed Garmsen
c84fe62ca1 Added new email to email change notification 2015-10-06 09:15:56 -07:00