Commit Graph

4933 Commits

Author SHA1 Message Date
=Corey Hulen
058d6b2467 PLT-7 adding loc feature to preview 2016-01-22 09:27:27 -06:00
=Corey Hulen
da1d52d546 PLT-7 adding lang selector 2016-01-22 09:10:08 -06:00
Corey Hulen
5d14ab7174 Merge pull request #1954 from mattermost/PLT-7-c2-fix
PLT-7 fixing unit test for chunk 2 server
2016-01-22 08:14:06 -06:00
=Corey Hulen
518efd7d2e PLT-7 fixing unit test for chunk 2 server 2016-01-22 08:04:02 -06:00
Corey Hulen
dd52e3f729 Merge pull request #1952 from ZBoxApp/PLT-7-go
PLT-7: Refactoring api to use translations (chunk 2)
2016-01-22 07:47:41 -06:00
Christopher Speller
9937e1ead2 Merge pull request #1948 from hmhealey/plt1652
PLT-1652 Added download param to getFile api call
2016-01-22 08:14:18 -05:00
Elias Nahum
4ef46db0f6 PLT-7: Change post CreatePost back to model.NewAppError
- It was failing test using model.NewLocAppError
2016-01-22 02:41:23 -03:00
Elias Nahum
6fd328ddaa Refactoring api to use translations (chunk 2)
- Add spanish translations
- Does not include tests
- Add func to get the translations for a user locale
2016-01-22 01:37:11 -03:00
Corey Hulen
43098bc1df Merge pull request #1951 from mattermost/PLT-7-client-infra-fix
PLT-7 switching dist to min
2016-01-21 19:37:46 -06:00
=Corey Hulen
63a30198c1 PLT-7 switching dist to min 2016-01-21 17:12:51 -06:00
Corey Hulen
a9860a0ce8 Merge pull request #1950 from mattermost/PLT-7-client-infra-fix
PLT-7 fixing dist build
2016-01-21 16:56:33 -06:00
=Corey Hulen
ec5b278fca PLT-7 fixing dist build 2016-01-21 16:36:12 -06:00
Corey Hulen
6c86bae5d5 Merge pull request #1949 from mattermost/PLT-7-client-infra
PLT-7 client infra
2016-01-21 14:36:46 -06:00
=Corey Hulen
3ff05780a1 PLT-7 client side infra 2016-01-21 14:25:20 -06:00
=Corey Hulen
2219854359 PLT-7 client side infra 2016-01-21 14:15:44 -06:00
=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
hmhealey
261b38be45 Added download param to getFile api call 2016-01-21 13:55:47 -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