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

2955 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
2663cede2b Merge pull request #1013 from optimistiks/PLT-590
PLT-590: Change "Manage Team" to "Manage Members"
2015-10-13 08:00:15 -04:00
Maxim
9d3248ccec Merge branch 'master' into PLT-590 2015-10-13 10:15:44 +03:00
Corey Hulen
0144b6fd8a Merge pull request #1024 from mattermost/release-1.1.0
Merging docs Release 1.1.0rc
2015-10-12 21:50:52 -07:00
Corey Hulen
9bd9af4f19 Merge pull request #1023 from mattermost/fix-config
Fixing document
2015-10-12 20:55:40 -07:00
=Corey Hulen
a492206e38 Fixing document 2015-10-12 20:42:58 -07:00
it33
9485ab944a Update Configuration-Settings.md
Adjusting format so variables are on their own line
2015-10-12 18:53:38 -07:00
it33
efea7eca38 Update Configuration-Settings.md
Minor corrections
2015-10-12 18:49:11 -07:00
it33
7181e667d1 Update Configuration-Settings.md
Clarifying config.json settings not in System Console and updating formatting.
2015-10-12 18:41:14 -07:00
Corey Hulen
191e248b0f Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
2015-10-12 14:22:05 -07:00
Corey Hulen
a6a3c351a8 Merge pull request #997 from mattermost/PLT-586
PLT-586 fixing issues with security alert
2015-10-12 13:56:21 -07:00
Corey Hulen
246c7414bd Merge pull request #1018 from asaadmahmoodspin/ui-fixes
Other UI Improvements
2015-10-12 13:18:47 -07:00
=Corey Hulen
9f83a72f73 Merge branch 'release-1.1.0' into PLT-586 2015-10-12 13:16:46 -07:00
Corey Hulen
7a469c8fc1 Merge pull request #999 from rgarmsen2295/plt-610
PLT-610 Fix broken image in change email verification email
2015-10-12 13:15:30 -07:00
=Corey Hulen
51f41bffec Merge branch 'release-1.1.0' into PLT-586 2015-10-12 11:58:48 -07:00
Corey Hulen
1ce37c316a Merge pull request #1015 from mattermost/trouble-shooting-tip
Adding troubleshooting tip
2015-10-12 11:52:42 -07:00
Corey Hulen
535164b5b6 Merge pull request #1009 from mattermost/update-help-text
Updating help text
2015-10-12 11:50:42 -07:00
Corey Hulen
9e002f3566 Merge pull request #994 from mattermost/mkdocs-strict
Turning on strict mode for mkdocs
2015-10-12 11:49:29 -07:00
Corey Hulen
8d193da296 Merge pull request #992 from mattermost/fast-obvious-forgiving
Adding link to "Fast, Obvious, Forgiving"
2015-10-12 11:49:09 -07:00
Corey Hulen
5ec92975ca Merge pull request #989 from mattermost/typos
Fixed typos
2015-10-12 11:48:52 -07:00
Corey Hulen
025ca3c1a6 Merge pull request #988 from mattermost/golang-version
Updating Golang versions tested
2015-10-12 11:48:34 -07:00
Asaad Mahmood
893a72141b Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes 2015-10-12 23:36:24 +05:00
=Corey Hulen
dbb1018f20 Fixing break 2015-10-12 11:35:38 -07:00
Corey Hulen
246d934e5e Merge pull request #1016 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2015-10-12 11:29:46 -07:00
Corey Hulen
2d4d25051e Merge pull request #1000 from hmhealey/plt604
PLT-604 Fixed download links in Safari
2015-10-12 11:29:05 -07:00
Corey Hulen
95f9ee179c Merge pull request #1020 from mattermost/config-fix
Adding new config documentation
2015-10-12 11:27:02 -07:00
=Corey Hulen
ac1367a286 Removing offical build check 2015-10-12 10:57:39 -07:00
=Corey Hulen
3c42ae312d Merge branch 'release-1.1.0' into PLT-586 2015-10-12 10:55:43 -07:00
=Corey Hulen
15c64767de Adding new config documentation 2015-10-12 10:53:51 -07:00
Joram Wilander
c2b349bb8c Merge branch 'master' into update-help-text 2015-10-12 12:09:46 -04:00
Joram Wilander
ec2d027455 Merge branch 'master' into trouble-shooting-tip 2015-10-12 12:09:07 -04:00
Joram Wilander
4949b6837f Merge branch 'master' into typos 2015-10-12 12:06:55 -04:00
Asaad Mahmood
7bb8f5d1ef Removing padding from post comment cell in RHS 2015-10-12 20:59:03 +05:00
Asaad Mahmood
72b3a1d695 Other UI Improvements 2015-10-12 20:55:40 +05:00
asaadmahmoodspin
0c5835e350 Merge branch 'master' into ui-improvements 2015-10-12 19:41:04 +05:00
it33
f55416d9f4 Update Code-Contribution-Guidelines.md 2015-10-12 07:37:40 -07:00
Asaad Mahmood
fd4bfee6ea Multiple UI Improvements 2015-10-12 19:22:05 +05:00
it33
3048f67126 Adding troubleshooting tip 2015-10-12 06:30:49 -07:00
Potapov Max
53d58fc337 PLT-590: Change "Manage Team" to "Manage Members" 2015-10-12 12:20:59 +03:00
it33
2bfd6d9ac2 Update get_link_modal.jsx
Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options
2015-10-11 21:30:02 -07:00
it33
f7e624d582 Merge pull request #1008 from mattermost/release-1.1.0
Fixing help text in webhooks
2015-10-11 20:52:22 -07:00
it33
1da8ae36fa Merge pull request #1001 from mattermost/missed-pr
Missed PR - Help text update to webhooks
2015-10-11 15:56:15 -07:00
it33
808238f7c6 Update CHANGELOG.md 2015-10-11 15:50:19 -07:00
it33
7cd26c82ea Merge pull request #998 from mattermost/lfbrock-patch-1
Fixing incorrect markdown
2015-10-11 15:48:36 -07:00
it33
c33f9edf11 Merge pull request #1002 from mattermost/beta-label
Adding beta label to Slack Import
2015-10-10 16:32:34 -07:00
it33
ffa0900d53 Merge pull request #1003 from mattermost/heading-alignment
Aligning heading with text
2015-10-10 16:32:21 -07:00
it33
30c4795be5 Merge pull request #1004 from mattermost/bug-fix
bugfix should be two words
2015-10-10 16:22:25 -07:00
it33
ed8b1aa00c bugfix should be two words 2015-10-10 16:11:47 -07:00
it33
85716be6d6 Aligning heading with text 2015-10-10 16:10:14 -07:00
it33
ce55eb06bd Adding beta label to Slack Import 2015-10-10 15:55:12 -07:00
it33
ea3713561b Update manage_incoming_hooks.jsx 2015-10-09 18:39:34 -07:00