IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,384 Commits 845 Branches 1,202 Tags
37a999ebaf30e7ce1ca00f951ed7d25e71bc5615
Commit Graph

2516 Commits

Author SHA1 Message Date
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
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
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
JoramWilander
2747a99aef Fix case where channel has a postlist but no posts 2016-02-11 10:52:12 -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
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
=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
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