=Corey Hulen
8cc45a2e08
Merge branch 'master' into PLT-7-client-infra
2016-01-21 13:54:47 -06:00
=Corey Hulen
dea84b1892
PLT-7 Adding react-intl libs
2016-01-21 13:54:21 -06:00
Christopher Speller
a2fa683c1b
fixing cd error
2016-01-21 14:36:23 -05:00
Christopher Speller
2c7a3d405d
moving mv
2016-01-21 13:45:05 -05:00
Christopher Speller
21af702cd1
Sudo
2016-01-21 13:24:05 -05:00
Christopher Speller
840967f062
Fixing travis
2016-01-21 12:38:28 -05:00
Christopher Speller
1a9c01287c
Fixing travis
2016-01-21 12:05:53 -05:00
Christopher Speller
d9a2f1cf4d
Fixing non travis build
2016-01-21 11:42:26 -05:00
Christopher Speller
d2d75c8602
Merge pull request #1841 from mattermost/auto-spinmint
...
Testing PR for auto spinmint.
2016-01-21 11:26:44 -05:00
Corey Hulen
5b2b582890
Merge pull request #1940 from ZBoxApp/PLT-7-go
...
Refactoring api to use translations (chunk 1)
2016-01-21 09:48:37 -06:00
=Corey Hulen
ff9bcce42d
adding ignore
2016-01-21 09:41:00 -06:00
Elias Nahum
c8d22ed1fb
Fix bug to load the default locale if no system locale is found
2016-01-21 12:30:14 -03:00
Elias Nahum
aa68caa8f0
Remove settings from config.json
2016-01-21 12:09:56 -03:00
Corey Hulen
302f210d66
Merge pull request #1937 from hmhealey/plt1695
...
PLT-1695 Completely disabled broken pasting of images on IE11
2016-01-21 09:02:58 -06:00
Corey Hulen
060e38ef86
Merge pull request #1935 from hmhealey/plt1664
...
PLT-1664 Fix unread channel indicators so that they work on IE11
2016-01-21 09:02:36 -06:00
Corey Hulen
9aa23c1994
Merge pull request #1933 from hmhealey/plt1661
...
PLT-1661/PLT-1745 Scrolling fixes
2016-01-21 09:02:10 -06:00
Christopher Speller
c7faefbedc
Merge pull request #1924 from loafoe/master
...
[#1923 ] Make Websocket ports configurable
2016-01-21 10:01:15 -05:00
Christopher Speller
868eece987
Merge pull request #1927 from rgarmsen2295/plt-1668
...
PLT-1668 Removes duplicate short username error message
2016-01-21 09:59:38 -05:00
Christopher Speller
c320bb4565
Adding curl to upload pr builds
2016-01-21 09:31:05 -05:00
Harrison Healey
2fdfdaeff7
Merge pull request #1922 from cloudron-io/check_auth_service
...
Check auth_service when constructing messages
2016-01-21 09:30:14 -05:00
Harrison Healey
c9c40bcb20
Merge pull request #1882 from trashcan/PLT-1232-more-channel-info
...
PLT-1232: More channel info
2016-01-21 09:25:08 -05:00
Elias Nahum
507fbeb068
Refactoring api to use translations (chunk 1)
...
- Add spanish translations
- Files in order by name from admin to export
- Does not include api templates and tests
- Fix web_test to load translations
- Fix i18n to fallback to DEFAULT_LOCALE if no system locale found
2016-01-21 10:14:02 -03:00
Joram Wilander
da7adcf0db
Merge pull request #1893 from asaadmahmoodspin/ui-improvements
...
Updating logo
2016-01-21 07:09:02 -05:00
Joram Wilander
45e3a133f2
Merge pull request #1891 from trashcan/PLT-1515-password-change-wording
...
Improve wording of password change email to indicate that it might not be user initiated
2016-01-21 07:08:48 -05:00
Joram Wilander
45457a9d59
Merge pull request #1886 from rgarmsen2295/plt-549c
...
PLT-549 Fixed react warning issue with setState in RHS
2016-01-21 07:08:31 -05:00
Joram Wilander
202e00d8df
Merge pull request #1885 from rgarmsen2295/plt-406
...
PLT-406 Fixes issues with drag and drop overlay in IE11
2016-01-21 07:08:17 -05:00
Joram Wilander
9163cd2548
Merge pull request #1884 from hmhealey/plt1403
...
PLT-1403 Removed incorrect test case for autolinking urls with angle brackets
2016-01-21 07:08:03 -05:00
Joram Wilander
7a25672dec
Merge pull request #1883 from rosskusler/master
...
fixed typo in URL to emoji.codes
2016-01-21 07:07:47 -05:00
Joram Wilander
dd0f49e5ff
Merge pull request #1867 from apskim/patch-1
...
Parse Slack links in the attachment pretext and fields (Fix #1868 )
2016-01-21 07:07:28 -05:00
hmhealey
cbfaff44cb
Completely disabled broken pasting of images on IE11
2016-01-20 17:21:12 -05:00
hmhealey
6b26aa9413
Changed UnreadChannelIndicator display style so that it uses a value that IE11 supports
2016-01-20 16:29:06 -05:00
Corey Hulen
9f526555df
Merge pull request #1934 from mattermost/PLT-7-server-db
...
PLT-7-server-db
2016-01-20 15:14:31 -06:00
=Corey Hulen
d74e2f3e11
tweaking
2016-01-20 14:53:12 -06:00
=Corey Hulen
e70428c1bd
tweak
2016-01-20 14:38:17 -06:00
=Corey Hulen
984fa7f1ca
PLT-7-server-db
2016-01-20 14:36:34 -06:00
hmhealey
d72c7fd26b
Removed incorrect test case for autolinking urls with angle brackets
2016-01-20 15:06:47 -05:00
hmhealey
e4cea41cbf
Added a small margin where the PostsView will be considered to be at the bottom even if it's not exactly at the bottom
2016-01-20 14:58:32 -05:00
hmhealey
d8149fb269
Removed some vestigial code from the post textbox
2016-01-20 14:58:32 -05:00
hmhealey
e4e3178e94
Changed the post textbox resizing code to be more reliable and not rely on magic numbers
2016-01-20 14:58:32 -05:00
Corey Hulen
d703d09063
Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-db
...
Revert " PLT-7 adding loc for db calls"
2016-01-20 13:36:27 -06:00
Corey Hulen
aefbb541d0
Revert " PLT-7 adding loc for db calls"
2016-01-20 13:36:16 -06:00
Corey Hulen
0b1aff3b24
Merge pull request #1930 from mattermost/PLT-7-server-db
...
PLT-7 adding loc for db calls
2016-01-20 13:12:19 -06:00
=Corey Hulen
75f8729e2d
PLT-7 adding loc db calls for users table
2016-01-20 12:43:44 -06:00
Reed Garmsen
76f0000565
Removed extraneous error when providing a short username
2016-01-20 08:43:14 -08:00
=Corey Hulen
aac8d121a0
PLT-7 adding loc db calls for posts table
2016-01-20 10:34:31 -06:00
=Corey Hulen
3ac5ecf0e9
PLT-7 adding loc db calls for session table
2016-01-20 10:18:11 -06:00
=Corey Hulen
11c035aef4
PLT-7 adding loc db calls for oauth table
2016-01-20 10:04:17 -06:00
=Corey Hulen
640d3018c9
PLT-7 adding loc db calls for oauth table
2016-01-20 08:56:09 -06:00
=Corey Hulen
ef11df7532
PLT-7 adding loc db calls for webhooks table
2016-01-20 08:44:05 -06:00
=Corey Hulen
5b2ec62347
PLT-7 adding loc db calls for team table
2016-01-20 08:33:26 -06:00
