5383 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Asaad Mahmood	7bea418a65	Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes	2016-02-12 20:19:07 +05:00
Christopher Speller	6cb4f82ee5	Updating dockerfile for v2.0.0-rc2	2016-02-12 08:16:52 -05:00
Christopher Speller	0807fe5b05	Merge pull request #2157 from mattermost/ie-cache-fix ... Fixing IE expire issue	2016-02-12 08:06:41 -05:00
Christopher Speller	3f50aa4734	Merge pull request #2158 from mattermost/fix-socket-loc ... Fixing so the loc tool can use these	2016-02-11 18:54:33 -05:00
Christopher Speller	d538aa4a5f	Merge pull request #2155 from ZBoxApp/PLT-1948 ... PLT-1948: Fix duplicate am/pm on last password update	2016-02-11 18:51:20 -05:00
=Corey Hulen	4419fe140d	Fixing so the loc tool can use these	2016-02-11 13:24:56 -08:00
=Corey Hulen	35e3b8c40f	Fixing IE expire issue	2016-02-11 13:17:27 -08:00
Elias Nahum	ae8c67365d	eslint no-shadow resolved	2016-02-11 16:46:46 -03:00
Christopher Speller	ab1f5acf4d	Merge pull request #2150 from ZBoxApp/PLT-1963 ... PLT-1963: Fixing intl console error on Outgoing webhook edit	2016-02-11 14:31:23 -05:00
Elias Nahum	b0252c9aa9	Fix duplicate am/pm on last password update	2016-02-11 16:29:52 -03:00
Christopher Speller	7d207ec8a6	Merge pull request #2154 from mattermost/plt-1933 ... RC2 PLT-1933 Emit change after setting preferences in head.html	2016-02-11 14:29:04 -05:00
Christopher Speller	d29abb8f86	Merge pull request #2153 from mattermost/plt-1939 ... RC2 PLT-1939 Fix localization error for team invites	2016-02-11 14:18:20 -05:00
JoramWilander	32cca5c31e	Emit change after setting preferences in head.html	2016-02-11 14:06:11 -05:00
JoramWilander	b35146e9b8	Fix localization error for team invites	2016-02-11 13:47:32 -05:00
Christopher Speller	395d51dda6	Merge pull request #2145 from mattermost/PLT-1956 ... PLT-1956 Infinite "Loading..." Animation for Webhooks/Slash Commands UI	2016-02-11 13:46:15 -05:00
Christopher Speller	50104a1aa8	Merge pull request #2148 from mattermost/missing-posts-2.0 ... RC2 PLT-1774 Fixing the elusive missing post bug	2016-02-11 13:45:52 -05:00
Christopher Speller	8eca7b1417	Merge pull request #2151 from mattermost/fix-socket ... Fixing socket store loc	2016-02-11 13:45:34 -05:00
Asaad Mahmood	6bf1203581	Multiple UI Improvements	2016-02-11 23:41:13 +05:00
JoramWilander	3a1ec7dbd7	Switch to using create_at for latest post	2016-02-11 13:17:59 -05:00
Elias Nahum	28703f29d4	Fixing intl console error on Outgoing webhook edit	2016-02-11 15:02:27 -03:00
=Corey Hulen	8a7535d7fe	Fixing socket store loc	2016-02-11 09:58:04 -08:00
JoramWilander	c5b2e8832c	If we have less than CHUNK_SIZE posts, then get the first page	2016-02-11 12:52:01 -05:00
Christopher Speller	abd5a3e0d7	Merge pull request #2149 from mattermost/plt-1949 ... PLT-1949 Fixing cacheing issue on IE for admin console	2016-02-11 12:26:16 -05:00
JoramWilander	2747a99aef	Fix case where channel has a postlist but no posts	2016-02-11 10:52:12 -05:00
Christopher Speller	590022064a	Fixing cacheing issue on IE for admin console	2016-02-11 09:31:39 -05:00
JoramWilander	cac086ae22	Fixing the elusive missing post bug	2016-02-11 09:22:57 -05:00
Christopher Speller	4ffbd3642e	Merge pull request #2144 from ZBoxApp/PLT-1928 ... PLT-1928: Fix localization on floating timestamp	2016-02-11 08:08:26 -05:00
Christopher Speller	f2a6826890	Merge pull request #2143 from ZBoxApp/PLT-1932 ... PLT-1932: Fix change email subject	2016-02-11 08:07:48 -05:00
Christopher Speller	8291fdd681	Merge pull request #2141 from rgarmsen2295/fix-search-map-error ... RC2 - Fix issue with searching for short strings	2016-02-11 08:07:22 -05:00
Christopher Speller	843d83c872	Merge pull request #2137 from mattermost/esethna-patch-1 ... Add Commands Table to CHANGELOG.md for v2.0	2016-02-11 08:06:34 -05:00
Christopher Speller	f940642008	Merge pull request #2136 from asaadmahmoodspin/release-2.0 ... PLT-1941 - Improving UI for slash commands	2016-02-11 08:06:03 -05:00
=Corey Hulen	55a97b215d	PLT-1956	2016-02-10 14:53:45 -08:00
Elias Nahum	85d0eece3d	Need to set as template.HTML	2016-02-10 16:43:03 -03:00
Elias Nahum	d5c666ec12	Change body info from String to HTML	2016-02-10 16:26:32 -03:00
Elias Nahum	de9581a838	Fix localization on floating timestamp	2016-02-10 15:33:20 -03:00
Elias Nahum	7476bc9883	Fix change email subject	2016-02-10 15:20:51 -03:00
Reed Garmsen	e322774d74	Fix issue with searching for short strings	2016-02-10 09:31:40 -08:00
Eric Sethna	987d0f3240	Add Commands Table to CHANGELOG.md for v2.0	2016-02-10 09:05:27 -08:00
Asaad Mahmood	0d3ec4d330	Improving UI for slash commands	2016-02-10 21:37:38 +05:00
Christopher Speller	a15f8c582d	Merge pull request #2135 from asaadmahmoodspin/release-2.0 ... PLT-1935 - Fixing codespan inline issue	2016-02-10 11:10:28 -05:00
Christopher Speller	7410dfb931	Merge pull request #2130 from hmhealey/extrainfo ... RC2 - Stopped returning inactive members with getExtraInfo calls	2016-02-10 11:10:14 -05:00
Christopher Speller	6bfb90ccc5	Merge pull request #2132 from mattermost/no-theme-fix2 ... RC2 - Fix canceling themes when user has no theme	2016-02-10 11:09:38 -05:00
Asaad Mahmood	c7f030f325	Fixing codespan inline issue	2016-02-10 20:04:03 +05:00
JoramWilander	6bcfe4ecad	Fix canceling themes when user has no theme	2016-02-10 09:21:16 -05:00
Christopher Speller	00795908f6	Merge branch 'release-2.0'	2016-02-10 09:14:27 -05:00
hmhealey	1eab2ef393	Stopped returning inactive members with getExtraInfo calls	2016-02-10 08:29:57 -05:00
Christopher Speller	6225522478	Merge pull request #2126 from ZBoxApp/new-locs ... RC2 - A few cmds strings	2016-02-10 08:09:38 -05:00
Corey Hulen	2e39f808fe	Merge pull request #2125 from ZBoxApp/new-locs ... A few cmds strings	2016-02-09 14:14:36 -08:00
Elias Nahum	06afcf2787	A few cmds strings	2016-02-09 19:08:37 -03:00
Christopher Speller	ab63eca6e8	Fixing version unit test	2016-02-09 16:22:52 -05:00