Граф коммитов

2497 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
8a7535d7fe Fixing socket store loc 2016-02-11 09:58:04 -08: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
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
Elias Nahum
de9581a838 Fix localization on floating timestamp 2016-02-10 15:33:20 -03:00
Reed Garmsen
e322774d74 Fix issue with searching for short strings 2016-02-10 09:31:40 -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
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
hmhealey
1eab2ef393 Stopped returning inactive members with getExtraInfo calls 2016-02-10 08:29:57 -05:00
Christopher Speller
e343e36c70 Merge pull request #2122 from hmhealey/plt1544
PLT-1544 Replaced Permalink popover with a Permalink modal
2016-02-09 15:36:56 -05:00
hmhealey
b05c317c65 Replaced Permalink popover with a Permalink modal 2016-02-09 15:22:24 -05:00
Christopher Speller
62481983fe Merge pull request #2121 from ZBoxApp/PLT-1925
PLT-1925: Fix delete_post_modal showing unnecessary $ sign
2016-02-09 15:12:03 -05:00
Christopher Speller
56b82f3937 Merge pull request #2120 from mattermost/slash-help
Fixing slash command help
2016-02-09 15:11:47 -05:00
Elias Nahum
ff625794f8 Fix delete_post_modal showing unnecessary $ sign 2016-02-09 16:44:19 -03:00
=Corey Hulen
c34df4a297 Fixing slash command help 2016-02-09 11:43:25 -08:00
Christopher Speller
c88447b6d4 Merge pull request #2117 from asaadmahmoodspin/ui-improvements
Fixing single line code block on firefox
2016-02-09 14:12:10 -05:00
JoramWilander
d927a8c59f Reset theme on close of settings modal 2016-02-09 13:47:58 -05:00
Asaad Mahmood
24943aba59 Fixing single line code block on firefox 2016-02-09 23:46:29 +05:00
Joram Wilander
8b70a55e40 Merge pull request #2115 from mattermost/plt-1506
PLT-1506 Fixing mentions for inactive browser tabs.
2016-02-09 11:52:20 -05:00
Corey Hulen
7ba50278d3 Merge pull request #2099 from hmhealey/plt1883
PLT-1883 Update search result components when we receive channels
2016-02-09 08:35:25 -08:00
Christopher Speller
a4cce1023c Merge pull request #2113 from mattermost/slash-command-fixes
Multiple minor slash command fixes
2016-02-09 11:24:14 -05:00
Christopher Speller
0d50cdd390 Changing meation behaviour to show meantion when viewing channel but tab is not focused 2016-02-09 11:18:50 -05:00
Asaad Mahmood
fe0aeac6fe Multiple UI Improvements 2016-02-09 20:35:40 +05:00
JoramWilander
8ac0e800f1 Multiple minor slash command fixes 2016-02-09 09:16:08 -05:00
Joram Wilander
8e1c9c371b Merge pull request #2107 from rgarmsen2295/plt-1715
PLT-1715 - Removed the ability to disable file storage from the admin console
2016-02-08 18:23:06 -05:00
Reed Garmsen
b8ae4114d7 Provides error message on user sign-up page when no sign-up methods are enabled 2016-02-08 14:16:04 -08:00
Reed Garmsen
e56454ca11 Removed the ability to disable file storage from the admin console 2016-02-08 13:49:11 -08:00
hmhealey
be716c3b66 Changed SearchResults to update when the channel store receives data 2016-02-08 15:47:18 -05:00
Joram Wilander
137920b479 Merge pull request #2106 from mattermost/PLT-1900
PLT-1900 removing lang from preview and making spanish beta
2016-02-08 14:58:11 -05:00
Christopher Speller
3ca75906e0 Merge pull request #2103 from mattermost/plt-1884
PLT-1884 Fix pending posts not updating to failed
2016-02-08 14:33:15 -05:00
=Corey Hulen
d0ad249bc2 Fixing eslint error 2016-02-08 11:32:46 -08:00
=Corey Hulen
3f0443b552 PLT-1900 removing lang from preview and making spanish beta 2016-02-08 11:12:59 -08:00
Corey Hulen
8f90fd5989 Merge pull request #2104 from mattermost/minor-fix-jw
Fix accidental adding of change listener on unmount
2016-02-08 11:00:46 -08:00
hmhealey
fa069e4e1f Added support for ES6 Maps to Utils.areObjectsEqual 2016-02-08 13:35:38 -05:00
Christopher Speller
0d47dd0a0e Merge pull request #2095 from mattermost/plt-1787
PLT-1787 Fix statuses not rendering until a change in the LHS
2016-02-08 12:59:29 -05:00
Christopher Speller
0fcb4252c8 Merge pull request #2101 from hmhealey/plt1415
PLT-1415 Renamed RECIEVED_* to RECEIVED_*
2016-02-08 12:56:36 -05:00
JoramWilander
2cd72122ef Fix accidental adding of change listener on unmount 2016-02-08 12:41:51 -05:00
JoramWilander
5681ee79c1 Fix pending posts not updating to failed 2016-02-08 12:37:04 -05:00
Joram Wilander
bb5ae99643 Merge pull request #2096 from ZBoxApp/new-locs
Add new localizations in english and spanish
2016-02-08 11:57:32 -05:00
Elias Nahum
4d9a9ab8b9 Fix intro message 2016-02-08 12:56:14 -03:00
hmhealey
2af8614236 Renamed RECIEVED_* to RECEIVED_* 2016-02-08 10:33:59 -05:00
Asaad Mahmood
22656ac1ae Multiple UI Improvements 2016-02-08 20:29:04 +05:00
JoramWilander
a3e83abc14 Fix statuses not rendering until a change in the LHS 2016-02-08 08:29:06 -05:00
Joram Wilander
96cb7345da Merge pull request #2089 from mattermost/plt-1205
PLT-1205 Remove appearance settings tab and move theme management to display s…
2016-02-08 07:57:21 -05:00
Christopher Speller
be70bbc2f0 Merge pull request #2083 from mattermost/plt-1879
PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete…
2016-02-08 07:34:39 -05:00
Christopher Speller
9b35fb5fa5 Merge pull request #2092 from mattermost/fix-slash
Fixing slash commands
2016-02-08 07:31:33 -05:00
Christopher Speller
daa363574a Merge pull request #2094 from mattermost/GIT-1812
GIT-1812 fixing wesocket issue with firefox
2016-02-08 07:30:16 -05:00
JoramWilander
39b35b7b39 Fix cancel bug 2016-02-08 07:28:04 -05:00