Commit Graph

4994 Commits

Author SHA1 Message Date
hmhealey
97ede2a428 Updated serverside hashtag regex to ignore more punctuation around words 2016-01-26 10:20:36 -05:00
Corey Hulen
ab5425f9b9 Merge pull request #1986 from mattermost/PLT-7-fix
Fixing safari
2016-01-26 08:47:20 -05:00
=Corey Hulen
d2b7fea361 Fixing safari 2016-01-26 08:46:50 -05:00
Corey Hulen
c44048e5f9 Merge pull request #1985 from mattermost/PLT-7-client-infra5
PLT-7 fixing error bar msg
2016-01-25 20:59:01 -05:00
=Corey Hulen
64247fd18c Cleaning up 2016-01-25 20:33:28 -05:00
=Corey Hulen
4f8e46ddd5 Cleaning up 2016-01-25 20:32:14 -05:00
=Corey Hulen
6bb5d98229 Cleaning up a little 2016-01-25 20:28:18 -05:00
=Corey Hulen
19ad1cf763 Fixing eslint error 2016-01-25 20:20:26 -05:00
=Corey Hulen
d20d6bed06 PLT-7 fixing error bar msg 2016-01-25 20:14:27 -05:00
Corey Hulen
2a29232185 Merge pull request #1980 from ZBoxApp/PLT-7-web
PLT-7: Refactoring entry point and web to use translations (chunk 8)
2016-01-25 19:08:34 -05:00
Elias Nahum
2902df1621 PLT-7: Refactoring entry point and web to use translations (chunk 8)
- Add spanish translations
2016-01-25 17:44:11 -03:00
Joram Wilander
a911fbeca3 Merge pull request #1979 from ZBoxApp/PLT-7-stores
PLT-7: Refactoring stores to use translations (chunk 7)
2016-01-25 15:05:39 -05:00
Elias Nahum
69fbea225e PLT-7: Refactoring stores to use translations (chunk 7)
- Add spanish translations
2016-01-25 16:23:57 -03:00
Corey Hulen
1701a2cbbe Merge pull request #1976 from mattermost/PLT-7-client-infra4
PLT-7 client side infra
2016-01-25 12:05:28 -05:00
Corey Hulen
5478ea34e4 Merge pull request #1977 from hmhealey/plt1685
PLT-1685 Fixed handling of files with no extension
2016-01-25 10:40:39 -05:00
Christopher Speller
d20f9f6ae1 Merge pull request #1972 from mattermost/PLT-1576
PLT-1576 display iOS device in session history
2016-01-25 10:34:19 -05:00
Christopher Speller
2fcba4f3dd Merge pull request #1936 from rgarmsen2295/plt-1654
PLT-1654 Fixed issue with enter key not working in delete post modal
2016-01-25 10:19:22 -05:00
hmhealey
68285cf1a9 Fixed info displayed for files with 0 size or with no extension 2016-01-25 10:17:04 -05:00
hmhealey
1cd25cf380 Fixed serverside errors occurring when getting files with no extension 2016-01-25 09:51:17 -05:00
=Corey Hulen
e67cb399fb PLT-7 client side infra 2016-01-25 09:22:56 -05:00
Corey Hulen
93a4e85c2d Merge pull request #1974 from ZBoxApp/PLT-7-models
PLT-7: Refactoring models to use translations (chunk 6)
2016-01-25 09:07:35 -05:00
Elias Nahum
f33cff21cf PLT-7: Refactoring models to use translations (chunk 6)
- Add spanish translations
2016-01-25 10:22:12 -03:00
Joram Wilander
2a32bf2004 Merge pull request #1964 from hmhealey/plt1596
PLT-1596 Changed GetMemberCount to stop including inactive users
2016-01-25 07:27:50 -05:00
Joram Wilander
4db80803aa Merge pull request #1963 from hmhealey/plt1670
PLT-1670 Added a limit to the number of suggestions when autocompleting at mentions
2016-01-25 07:27:15 -05:00
Joram Wilander
a401b9f942 Merge pull request #1961 from rgarmsen2295/plt-1689
PLT-1689 Fixed duplicate email team sign-up error
2016-01-25 07:25:49 -05:00
Corey Hulen
efb60bab08 Merge pull request #1971 from ZBoxApp/PLT-7-utils
PLT-7: Refactoring manuatesting & utils to use translations (chunk 5)
2016-01-24 23:49:54 -05:00
=Corey Hulen
3ec816cc0e PLT-1576 display iOS device in session history 2016-01-24 23:49:01 -05:00
Corey Hulen
e8faaa9dd1 Merge pull request #1968 from ZBoxApp/PLT-7-templates
PLT-7: Refactoring api to use translations (chunk 4)
2016-01-24 23:07:03 -05:00
Elias Nahum
7b3be6c77e PLT-7: Refactoring manuatesting & utils to use translations (chunk 5)
- Add spanish translations
- Skip tests
2016-01-25 00:57:16 -03:00
Corey Hulen
711594f227 Merge pull request #1970 from mattermost/PLT-7-client-infra3
PLT-7 client infra for loc
2016-01-24 22:21:51 -05:00
=Corey Hulen
6d30f3b14c PLT-7 client infra for loc 2016-01-24 21:13:30 -06:00
Corey Hulen
2cfe665192 Merge pull request #1969 from mattermost/PLT-7-client-infa2
PLT-7 client side infra for loc
2016-01-24 21:03:15 -06:00
=Corey Hulen
056fdec301 PLT-7 client side infra for loc 2016-01-24 20:48:31 -06:00
Elias Nahum
e880835fbb Revert config.json 2016-01-24 23:34:18 -03:00
Elias Nahum
e428269b1a Remove enterprise configs 2016-01-24 17:19:40 -03:00
Elias Nahum
470349d105 PLT-7: Refactoring api to use translations (chunk 4)
- Translation for api templates english and spanish
2016-01-24 17:10:54 -03:00
Corey Hulen
1dfd8c78c9 Merge pull request #1962 from ZBoxApp/PLT-7-go
PLT-7: Refactoring api to use translations (chunk 3)
2016-01-24 06:36:30 -06:00
hmhealey
fc0b422c37 Changed GetMemberCount to stop including inactive users 2016-01-23 13:13:44 -05:00
hmhealey
43c19981cf Added a limit to the number of suggestions when autocompleting at mentions 2016-01-23 12:15:28 -05:00
Elias Nahum
eb58e631e7 PLT-7: Refactoring api to use translations (chunk 3)
- Add spanish translations
- Not included tests and templates
2016-01-23 10:25:10 -03:00
Reed Garmsen
329a2a1294 Fixed duplicate email team signup error 2016-01-22 15:03:16 -08:00
Corey Hulen
1a0b12313b Merge pull request #1956 from mattermost/plt-1779
PLT-1779 Add system-wide statistics page
2016-01-22 17:00:09 -06:00
Corey Hulen
d352c5b64d Merge pull request #1959 from asaadmahmoodspin/ui-improvements
Updating favicon stuff
2016-01-22 16:22:29 -06:00
Corey Hulen
336f0389de Merge pull request #1958 from mattermost/PLT-7-client-cookie
Plt 7 client cookie
2016-01-22 13:01:08 -06:00
Asaad Mahmood
b9fb855c6c Updating favicon stuff 2016-01-22 22:18:25 +05:00
=Corey Hulen
847754b3d7 PLT-7 adding loc header 2016-01-22 10:38:49 -06:00
=Corey Hulen
7e9b6dfcd0 PLT-7 adding loc header 2016-01-22 10:38:14 -06:00
=Corey Hulen
34b461c1b2 PLT-7 adding loc header 2016-01-22 10:33:41 -06:00
Corey Hulen
ea6774b2d9 Merge pull request #1955 from mattermost/PLT-7-client-user-loc
Plt 7 client user loc
2016-01-22 10:14:26 -06:00
Joram Wilander
48f1e8934e Merge pull request #1929 from esethna/patch-54
Update team_general_tab.jsx
2016-01-22 11:07:27 -05:00