Commit Graph

4571 Commits

Author SHA1 Message Date
Christopher Speller
74f427fb1a Merge branch 'release-1.3' 2015-12-14 19:01:22 -05:00
Christopher Speller
f51d45f6cb Updating dockerfile for release v1.3.0 v1.3.0 2015-12-14 18:51:42 -05:00
Christopher Speller
1a004ef1bf Merge pull request #1724 from asaadmahmoodspin/sidebarFix
Fixing IE scrolling issue and also fixing horizontal scrollbar
2015-12-14 18:46:19 -05:00
Corey Hulen
6c7c04f38d Merge pull request #1711 from asaadmahmoodspin/code-themes
Multiple UI Improvements
2015-12-14 15:27:07 -08:00
Corey Hulen
8392e5ecc4 Merge pull request #1728 from mattermost/lfbrock-patch-1
PLT-1457 Update syntax highlighting tests/documentation
2015-12-14 15:26:06 -08:00
lfbrock
cdeddd344f Update CHANGELOG.md 2015-12-14 15:56:19 -05:00
lfbrock
61716d434c Update Markdown.md 2015-12-14 15:55:00 -05:00
lfbrock
faa0074c92 Update syntax-highlighting.md 2015-12-14 15:52:23 -05:00
Asaad Mahmood
4af0cb7767 Fixing pageup issue 2015-12-15 00:05:48 +05:00
Asaad Mahmood
20fceae163 Updating container fluid css 2015-12-14 23:39:31 +05:00
Asaad Mahmood
cada044b9b Adding sidebar animation back 2015-12-14 23:09:51 +05:00
Asaad Mahmood
b5a1d0863c Removing translateX 2015-12-14 23:00:48 +05:00
Asaad Mahmood
95e0fd88fc Fixing IE scrolling issue and also fixing horizontal scrollbar 2015-12-14 22:27:41 +05:00
Joram Wilander
f5ec973cba Merge pull request #1713 from esethna/patch-41
Update Sign-in.md
2015-12-14 11:12:13 -05:00
Christopher Speller
303d0ed975 Merge pull request #1707 from mattermost/plt-1495
PLT-1495 Include SiteURL in props for invite email
2015-12-14 10:47:38 -05:00
Harrison Healey
733f35ef02 Merge pull request #1690 from npcode/trim-outgoing-callback-url
Trim callback urls for outgoing webhooks
2015-12-14 10:08:10 -05:00
Harrison Healey
f93922c14f Merge pull request #1697 from asaadmahmoodspin/master
FIxing scroll for more direct channels
2015-12-14 10:07:36 -05:00
Harrison Healey
398925014e Merge pull request #1712 from rgarmsen2295/plt-1263
PLT-1263 Fixed broken email unsubscribe instructions
2015-12-14 09:57:29 -05:00
Harrison Healey
52bb751356 Merge pull request #1716 from rgarmsen2295/plt-1453
PLT-1453 No longer errors upon saving the same info in Account Settings -> General
2015-12-14 09:56:12 -05:00
Harrison Healey
eaabb3fbe1 Merge pull request #1717 from rgarmsen2295/plt-1026
PLT-1026 Bolds the team name when the team's statistics page is selected in the system console
2015-12-14 09:55:18 -05:00
Asaad Mahmood
1e9f26baac Removing sidebar right fix 2015-12-14 19:54:39 +05:00
Harrison Healey
aec25ceb4b Merge pull request #1720 from rgarmsen2295/plt-860
PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+'
2015-12-14 09:54:11 -05:00
Asaad Mahmood
7a0545d4c5 Fixing sidebar--right 2015-12-14 19:06:27 +05:00
Asaad Mahmood
3d8d152aa0 Merge branch 'master' of https://github.com/mattermost/platform into code-themes 2015-12-14 19:04:08 +05:00
Christopher Speller
ab367f2bc6 Updating dockerfile for release v1.3.0-rc2 2015-12-14 08:30:54 -05:00
Asaad Mahmood
def79636f8 Updating the naming for the docs page 2015-12-14 18:24:59 +05:00
it33
6996521751 Push notifications help text update 2015-12-14 08:23:22 -05:00
it33
0932c3a573 Adding Highlights to Changelog 2015-12-14 08:22:04 -05:00
Christopher Speller
a9fa21473a Fixing cacheing issue on IE and Edge 2015-12-14 08:19:02 -05:00
Christopher Speller
29894a5836 Merge pull request #1714 from hmhealey/plt1454
PLT-1454 Changed positioning of root elements to fix weird IE11 bug
2015-12-14 08:10:23 -05:00
Reed Garmsen
7fb1551254 Fixed issue with emails containing a '+' 2015-12-13 15:47:44 -08:00
Reed Garmsen
b9d93b104c Fixing issues caused by changing test emails 2015-12-13 15:31:27 -08:00
Reed Garmsen
e7eb86c8c3 Updated emails in unit tests to include '+' 2015-12-13 14:21:23 -08:00
Joram Wilander
b9a4966e7d Merge pull request #1588 from rgarmsen2295/plt-881
PLT-881 Adds Legal and Support Settings to the System Console
2015-12-12 15:47:36 -05:00
Reed Garmsen
957586c73f When a team's statistics is selected in the sys console the team name is now also bolded 2015-12-11 16:27:17 -08:00
Reed Garmsen
d6ad130756 No longer errors upon saving the same info in Account Settings -> General 2015-12-11 16:07:49 -08:00
hmhealey
9943af6948 Changed positioning of root elements to fix weird IE11 bug 2015-12-11 17:28:12 -05:00
Eric Sethna
50259d216b Update Sign-in.md
rebase to master
2015-12-11 13:25:27 -08:00
Reed Garmsen
75ce754860 Fixed broken unsubscribe instructions 2015-12-11 11:44:07 -08:00
Asaad Mahmood
9749519580 Multiple UI Improvements 2015-12-11 23:58:38 +05:00
Asaad Mahmood
b0f8414629 ADding utilis mobile instead of width 2015-12-11 23:55:48 +05:00
Yi EungJun
26b6a2aadb Trim callback urls for outgoing webhooks
Adding traling whitespace is common mistake.
2015-12-12 03:35:21 +09:00
JoramWilander
7a82aec1e9 Include SiteURL in props for invite email 2015-12-11 12:01:52 -05:00
it33
ce03fbc6d8 Create accepting-pull-request.md 2015-12-11 07:35:53 -08:00
Asaad Mahmood
8236bde848 Updating direct messages code 2015-12-11 20:10:52 +05:00
Christopher Speller
129a532c50 Merge pull request #1701 from mattermost/PLT-1472
PLT-1472 Adding back button to search click through
2015-12-11 09:57:52 -05:00
=Corey Hulen
1408700f01 Merge branch 'PLT-1472' of https://github.com/mattermost/platform into PLT-1472 2015-12-11 06:50:03 -08:00
=Corey Hulen
5472bafb57 Fixing eslint error 2015-12-11 06:49:41 -08:00
=Corey Hulen
15cc7ccafc PLT-1472 Adding back button to search click through 2015-12-11 06:49:41 -08:00
Corey Hulen
9dc8108e2d Merge pull request #1677 from hmhealey/plt1244
PLT-1244 Changed serverside mention parsing to support usernames containing periods
2015-12-11 06:42:48 -08:00