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

2075 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
6bc1e3c5ca Added license audit parsing to audit table 2016-02-16 09:16:40 -08:00
Asaad Mahmood
44fa72066b Other minor improvements 2016-02-15 23:23:07 +05:00
Asaad Mahmood
22aa2c8c07 Fixing custom theme header click event 2016-02-15 20:25:28 +05:00
Asaad Mahmood
522ff67c63 Multiple UI Improvements 2016-02-15 19:37:06 +05:00
Corey Hulen
2ec3762fb2 Merge pull request #2146 from ttyniwa/feature/PLT-1908
PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu
2016-02-14 07:55:45 -08:00
Joram Wilander
89f7e8cf2f Merge pull request #2123 from hmhealey/plt1711
PLT-1711 Prevent the admin console from switching to a team that is being remo…
2016-02-14 08:24:09 -05:00
Joram Wilander
54cba38f3b Merge pull request #2138 from rgarmsen2295/plt-1672
PLT-1672 Added permalink feature to posts in the RHS
2016-02-14 08:22:47 -05:00
Christopher Speller
958b588448 Merge branch 'release-2.0' 2016-02-13 11:03:10 -05:00
Reed Garmsen
081d5c22c7 Added permalink feature to posts in the RHS 2016-02-12 13:06:45 -08:00
JoramWilander
c861a24d48 Fix badge and tab */(1) not disappearing until switching away from channel 2016-02-12 14:23:12 -05:00
Asaad Mahmood
37a999ebaf Adding import instead of require for fastclick 2016-02-12 23:06:51 +05:00
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
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
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
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
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
Asaad Mahmood
6bf1203581 Multiple UI Improvements 2016-02-11 23:41:13 +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
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
Tatsuya Niwa
ec34b85c43 Add a warning when demoting yourself from System Administrator from the team Manage Members menu 2016-02-11 20:02:49 +09:00
=Corey Hulen
55a97b215d PLT-1956 2016-02-10 14:53:45 -08: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
7410dfb931 Merge pull request #2130 from hmhealey/extrainfo
RC2 - Stopped returning inactive members with getExtraInfo calls
2016-02-10 11:10:14 -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
hmhealey
a31f7c9a75 Prevent the admin console from switching to a team that is being removed from the sidebar 2016-02-09 15:51:36 -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
JoramWilander
d927a8c59f Reset theme on close of settings modal 2016-02-09 13:47:58 -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
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