Commit Graph

558 Commits

Author SHA1 Message Date
=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
=Corey Hulen
f5eb3c1bcb PLT-7 adding loc for db calls audits and prefs 2016-01-20 07:59:56 -06:00
=Corey Hulen
8e404c1dcf PLT-7 Adding translation function to context 2016-01-19 22:00:01 -06:00
=Corey Hulen
4389571ded PLT-7 adding server side libraries 2016-01-19 10:54:19 -06:00
=Corey Hulen
96b08d4574 Merge branch 'master' into fix-droid 2016-01-14 09:00:33 -06:00
JoramWilander
a341dbad2b Fix old l4g references 2016-01-14 09:54:15 -05:00
=Corey Hulen
e37db347f9 Fixing android push 2016-01-14 08:32:26 -06:00
JoramWilander
c26edcf678 Final updates 2016-01-14 08:24:09 -05:00
JoramWilander
874d120535 Add some unit tests 2016-01-14 08:24:09 -05:00
JoramWilander
9110dd54a1 Added license validation and settings 2016-01-14 08:24:09 -05:00
Corey Hulen
b8c70b4d04 Merge pull request #1876 from mattermost/release-1.4
Release 1.4 RC2
2016-01-12 14:46:06 -06:00
JoramWilander
1763ff6d72 Support old oauth routes 2016-01-12 08:02:38 -05:00
=Corey Hulen
b1251b9393 Upgrade logging package 2016-01-11 09:12:51 -06:00
Joram Wilander
7aa7f83524 Merge pull request #1824 from hmhealey/plt1525
PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
2016-01-11 06:54:55 -05:00
hmhealey
0e7a149982 Added the ability to get more channel members from getChannelExtraInfo 2016-01-06 18:04:24 -05:00
Harrison Healey
5bcb9f1c50 Merge pull request #1813 from mattermost/PLT-1558
PLT-1558 adding session length to config file
2016-01-06 16:13:10 -05:00
Christopher Speller
0eb145218e Merge pull request #1816 from mattermost/PLT-1607
PLT-1607 adding more debugging info for email and push notifications
2016-01-06 09:18:52 -05:00
Christopher Speller
fcb87ca42f Merge pull request #1814 from mattermost/PLT-1485a
PLT-1485 Adding last view channel sticky
2016-01-06 09:15:44 -05:00
Christopher Speller
cc5e8be733 Merge pull request #1809 from mattermost/PLT-1557
PLT-1557 revoking sessions from same device
2016-01-06 09:14:21 -05:00
=Corey Hulen
7f8cb30bd3 PLT-1607 adding more debugging info for email and push notifications 2016-01-05 20:33:31 -06:00
=Corey Hulen
6a6558e0eb Fixing Import 2016-01-05 14:59:02 -06:00
=Corey Hulen
4e8c59279c Moving to constnt 2016-01-05 14:53:41 -06:00
=Corey Hulen
f0e620a485 PLT-1485 Adding last view channel sticky 2016-01-05 14:48:05 -06:00
=Corey Hulen
bd4314e977 PLT-1558 adding session length to config file 2016-01-05 11:13:25 -06:00
=Corey Hulen
e432b66641 PLT-1557 revoking sessions from same device 2016-01-05 09:58:21 -06:00
=Corey Hulen
9ddf26f6fb Fixing error message 2016-01-05 09:02:07 -06:00
Christopher Speller
67db3ca8ce Merge pull request #1745 from mattermost/plt-1118
PLT-1118 Add ability to switch between SSO and email account
2016-01-04 15:55:51 -05:00
Joram Wilander
d4c4037f84 Merge pull request #1800 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2016-01-04 07:46:11 -05:00
Christopher Speller
c44873c61b Merge pull request #1763 from benburkert/non-s3-region
support unofficial S3 regions
2016-01-04 07:13:38 -05:00
Asaad Mahmood
f095e772b4 Multiple UI Improvements 2016-01-04 15:11:16 +05:00
Hjf288
76b1d260b8 Correct mail templates to show 'You've been invited to [teamname] team' rather than you've been invited when signing up 2015-12-28 16:15:13 +00:00
Ben Burkert
ecef2c8cb5 support unofficial S3 regions
Adds support for S3 clones like Ceph.
2015-12-21 16:51:37 -08:00
hmhealey
cfdc5ab999 Fixed TestGetFile unit test 2015-12-18 19:02:48 -05:00
hmhealey
d4a139c09a Added additional information to getFileInfo api call 2015-12-18 12:24:52 -05:00
JoramWilander
a6ae90ac2a Add ability to switch between SSO and email account 2015-12-17 12:44:46 -05:00
Christopher Speller
58358ddd7c Some refactoring 2015-12-16 17:30:15 -05:00
Joram Wilander
ba149bd971 Merge pull request #1729 from hmhealey/plt886
PLT-886 Add additional max file size checks
2015-12-15 09:54:16 -05:00
hmhealey
76e1f1f613 Added serverside file size check for post attachments 2015-12-15 09:16:58 -05:00
Christopher Speller
f6ca77b5d1 Merge pull request #1726 from mattermost/PLT-1447
PLT-1447 fixing sending name in push notifications
2015-12-15 07:07:35 -05:00
Christopher Speller
74f427fb1a Merge branch 'release-1.3' 2015-12-14 19:01:22 -05:00
=Corey Hulen
253d80c97e PLT-1447 fixing sending name in push notifications 2015-12-14 11:43:56 -08: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
398925014e Merge pull request #1712 from rgarmsen2295/plt-1263
PLT-1263 Fixed broken email unsubscribe instructions
2015-12-14 09:57:29 -05:00
Christopher Speller
a9fa21473a Fixing cacheing issue on IE and Edge 2015-12-14 08:19:02 -05:00
Reed Garmsen
e7eb86c8c3 Updated emails in unit tests to include '+' 2015-12-13 14:21:23 -08:00