Commit Graph

4852 Commits

Author SHA1 Message Date
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
=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
ca33812cb5 PLT-7 adding loc db calls for system table 2016-01-20 08:07:52 -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
1acd38b7b1 Merge pull request #1926 from mattermost/PLT-7-context
PLT-7 Adding translation function to context
2016-01-19 22:14:26 -06:00
=Corey Hulen
96f8394bf4 Fxing version 2016-01-19 22:03:53 -06:00
=Corey Hulen
8e404c1dcf PLT-7 Adding translation function to context 2016-01-19 22:00:01 -06:00
Corey Hulen
36c5c46e24 Merge pull request #1921 from mattermost/PLT-7-server-libs
PLT-7 adding server side libraries
2016-01-19 13:33:57 -06:00
=Corey Hulen
4389571ded PLT-7 adding server side libraries 2016-01-19 10:54:19 -06:00
Corey Hulen
80bfdf71f2 Merge pull request #1915 from pawelad/patch-1
Update Amazon-Elastic-Beanstalk.md
2016-01-19 10:21:10 -06:00
Corey Hulen
19efe23f56 Merge pull request #1920 from pawelad/master
#1916 - Fixed Dockerrun.aws.zip 1.4
2016-01-19 10:20:06 -06:00
Corey Hulen
63b784e8a8 Merge pull request #1907 from cifvts/patch-4
Bump download link to version to 1.4.0
2016-01-19 10:18:02 -06:00
Paweł Adamczak
37d885dd80 #1916 - Fixed Dockerrun.aws.zip 1.4 2016-01-19 16:21:23 +01:00
Paweł Adamczak
1a35dbdd3b Update Amazon-Elastic-Beanstalk.md
Updated 'Dockerrun.aws.zip' link to newer, existing version
2016-01-18 19:31:16 +01:00
Andrea Agosti
3a51dfd588 Bump download link to version to 1.4.0 2016-01-18 09:40:28 +01:00
JoramWilander
c672820ff6 Remove extra config info 2016-01-14 22:58:08 -05:00
Corey Hulen
f1feeb0d72 Merge pull request #1894 from mattermost/release-1.4
Release 1.4
2016-01-14 16:19:44 -06:00
=Corey Hulen
8089487d5c Fixing dockerfile for release v1.4.0 2016-01-14 16:19:13 -06:00
Corey Hulen
f7abbe7533 Merge pull request #1892 from mattermost/sso-email-fix
Encode url query properly for SSO switching
2016-01-14 13:35:05 -06:00
JoramWilander
f04097bbd7 Encode url query properly for SSO switching 2016-01-14 13:25:26 -05:00
Corey Hulen
1ef6fd1b25 Merge pull request #1888 from mattermost/fix-droid
Fixing android push
2016-01-14 09:29:25 -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
2e0067020f Minor fix 2016-01-14 08:27:40 -05:00
Joram Wilander
7d383319df Merge pull request #1887 from mattermost/editions
Editions
2016-01-14 08:24:47 -05:00
JoramWilander
c26edcf678 Final updates 2016-01-14 08:24:09 -05:00
JoramWilander
22c522178c Fix error message 2016-01-14 08:24:09 -05:00
JoramWilander
537a220d07 Minor update to about modal 2016-01-14 08:24:09 -05:00
JoramWilander
33519518d6 Remove bin from gitignore 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
53b0cd8f2a Merge pull request #1855 from rgarmsen2295/plt-1006
PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
2016-01-13 09:03:42 -06:00
Corey Hulen
1e1864d78f Merge pull request #1853 from asaadmahmoodspin/ui-improvements
Adding away icon and changing online and offline icons
2016-01-13 09:03:01 -06:00
Corey Hulen
75ae098dfe Merge pull request #1850 from mattermost/preview-mode
Documenting how Preview Mode is disabled
2016-01-13 09:02:43 -06:00
Corey Hulen
b15b2bc2ae Merge pull request #1878 from mattermost/release-1.4
Fixing docker files for 1.4 RC2
2016-01-12 16:43:05 -06:00
=Corey Hulen
d36af55d57 Fixing config file 2016-01-12 16:42:31 -06:00
=Corey Hulen
837de1e0c8 Fixing docker files for 1.4 RC2 2016-01-12 16:40:18 -06: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
=Corey Hulen
6ce6115100 Update docker to 1.4 RC2 2016-01-12 14:11:18 -06:00
Corey Hulen
55da65f689 Merge pull request #1872 from mattermost/plt-1667
PLT-1667 Support old OAuth routes
2016-01-12 14:08:29 -06:00
Corey Hulen
fe98208146 Merge pull request #1862 from mattermost/lfbrock-patch-1
Update changelog.md
2016-01-12 14:08:18 -06:00
Joram Wilander
cc746dda6a Merge pull request #1830 from rgarmsen2295/plt-1599
PLT-1599 Help text in invite member modal now reflects the default channel name
2016-01-12 11:39:14 -05:00