Commit Graph

2773 Commits

Author SHA1 Message Date
JoramWilander
d440cc3268 Rename README.md to Overview.md for api docs. 2015-10-06 07:51:19 -04:00
JoramWilander
d1c240abcd Add basic API doc. 2015-10-06 07:50:18 -04:00
Christopher Speller
7505a80bcb Merge pull request #933 from mattermost/readme-fix
Fixing broken links in README.md
2015-10-05 18:33:21 -04:00
Christopher Speller
6fa438a68a Fixing broken links in README.md 2015-10-05 18:31:07 -04:00
Christopher Speller
04f9193206 Merge pull request #927 from mattermost/lfbrock-patch-1
Added when to use https vs http to GitLab SSO instructions
2015-10-05 16:56:46 -04:00
Harrison Healey
da61bb38ff Merge pull request #925 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2015-10-05 16:12:29 -04:00
Harrison Healey
e2e00d9d43 Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
2015-10-05 16:02:09 -04:00
lfbrock
9fe011a86e Added when to use https vs http to GitLab SSO instructions 2015-10-05 14:42:29 -04:00
Christopher Speller
193732ffbf Merge branch 'release-1.0.0' 2015-10-05 13:35:00 -04:00
Asaad Mahmood
e7d7892fd7 Multiple UI Improvements 2015-10-05 22:32:26 +05:00
Corey Hulen
bdf0520022 Merge pull request #923 from mattermost/fix-load-scroll
Fix missed binding for youtube data callback.
2015-10-05 09:54:42 -07:00
Corey Hulen
462def640c Merge pull request #917 from mattermost/plt-420
Adding doc system to build. Updated docs, fixed links.
2015-10-05 09:53:39 -07:00
JoramWilander
afe0d004fe Fix missed binding for youtube data callback. 2015-10-05 11:52:06 -04:00
Joram Wilander
b591c4b32e Merge pull request #914 from mattermost/plt-297
PLT-297 Add ability to override username and icon for posts from incoming webhooks.
2015-10-05 11:48:10 -04:00
it33
5d3649b5a4 Adding note on command line tool 2015-10-05 08:44:41 -07:00
JoramWilander
ef55d7f244 Update help text to mention the BOT tag for webhook posts. 2015-10-05 11:25:12 -04:00
Christopher Speller
33b957ed1a Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. Adding new ESLint rules. Fixing new ESLint errors. 2015-10-05 11:05:06 -04:00
Christopher Speller
515d709c2e Merge pull request #915 from mattermost/plt-300
PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
2015-10-05 10:32:27 -04:00
Christopher Speller
f4afabd679 Merge pull request #903 from mattermost/PLT-44
PLT-44 allow team switching without the need to login
2015-10-05 10:20:14 -04:00
Joram Wilander
8595fd85c7 Merge pull request #887 from asaadmahmoodspin/plt-375
plt-375 - Making modals compatible with themes
2015-10-05 10:17:52 -04:00
Christopher Speller
341d270c2d Adding doc system to build. Updated docs, fixed links. 2015-10-05 10:15:26 -04:00
Harrison Healey
b144ac1036 Merge pull request #900 from mattermost/PLT-462
PLT-462 Adding diagnostic info
2015-10-05 09:27:24 -04:00
JoramWilander
2a23d90ca6 Add config options for overriding username and icon, and add BOT indicator next to webhook posts. 2015-10-05 08:46:23 -04:00
Asaad Mahmood
c2d014b00a Increasing spacing for bottom unread notification 2015-10-05 08:13:15 +05:00
Asaad Mahmood
89d6613b93 Updating theme colours for popovers, drop downs etc 2015-10-05 08:04:32 +05:00
Asaad Mahmood
74fecd1952 Updating search colours 2015-10-05 06:43:08 +05:00
Asaad Mahmood
fef9947757 Updating jpg to png for theme names 2015-10-05 06:34:35 +05:00
Asaad Mahmood
7ba82096eb Merge branch 'master' of https://github.com/mattermost/platform into plt-375 2015-10-05 06:21:52 +05:00
it33
44ceedc2ad Merge pull request #905 from chengkun/patch-1
Fixed typo in single-container-install.md
2015-10-04 07:33:29 -07:00
it33
b69ee1325d Update CHANGELOG.md 2015-10-02 19:32:34 -07:00
Asaad Mahmood
fb290743d7 Changing jpeg images back to png 2015-10-02 22:32:50 +05:00
=Corey Hulen
3b34e73132 Fixing redirect issue 2015-10-02 10:29:56 -07:00
Asaad Mahmood
d8c5c4f746 Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx
2015-10-02 22:26:28 +05:00
JoramWilander
6221927351 Update allow/deny oauth page UI, and add ouath as reserved word. 2015-10-02 12:47:54 -04:00
Corey Hulen
41069d83d2 Merge pull request #904 from teviot/teviot-patch-1
Increase test timeouts to accommodate slow dev environments
2015-10-02 09:21:38 -07:00
Christopher Speller
a049b34dfb Updating Dockerfile for release v1.0.0 v1.0.0 2015-10-02 12:17:35 -04:00
=Corey Hulen
e0743a6a2b Fixing break 2015-10-02 09:16:03 -07:00
=Corey Hulen
4452bb7988 Fixing issues 2015-10-02 09:13:30 -07:00
=Corey Hulen
cee6dc270b Fixing issues 2015-10-02 09:12:09 -07:00
=Corey Hulen
3863c3c15e Adding offical build function 2015-10-02 09:01:50 -07:00
=Corey Hulen
b2052de746 Merge branch 'master' into PLT-462 2015-10-02 08:36:56 -07:00
JoramWilander
11903a3834 Add ability to override username and icon for posts from incoming webhooks. 2015-10-02 11:08:00 -04:00
Christopher Speller
c427e9c9d6 Merge pull request #912 from hmhealey/plt174
PLT-174 Added emailto: to the beginning of email links
2015-10-02 10:24:31 -04:00
Harrison Healey
2f60ab82a8 Merge pull request #909 from mattermost/plt-446
PLT-446 Added help text to incoming webhooks.
2015-10-02 09:50:15 -04:00
Harrison Healey
5a31c950b0 Merge pull request #913 from mattermost/it33-patch-3
Change text to avoid confusion with Slack Import
2015-10-02 09:33:28 -04:00
it33
95fe16e0d9 Change text to avoid confusion with Slack Import 2015-10-02 06:23:26 -07:00
hmhealey
fe8c04c973 Added emailto: to the beginning of email links 2015-10-02 09:18:45 -04:00
JoramWilander
28e84f1d13 Added help text for incoming webhooks. 2015-10-02 09:18:19 -04:00
Christopher Speller
b07fad563d Merge pull request #911 from hmhealey/plt437
PLT-437 Removed $ from time tooltip
2015-10-02 09:15:19 -04:00
hmhealey
c4203d8cd9 Removed $ from time tooltip 2015-10-02 08:54:31 -04:00