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,253 Commits 845 Branches 1,202 Tags
f0a84897b451a0e27eac6d16ef24b642254a0f2c
Commit Graph

2440 Commits

Author SHA1 Message Date
=Corey Hulen
f0a84897b4 GIT-1812 fixing wesocket issue with firefox 2016-02-05 14:17:53 -08:00
Corey Hulen
f4bf476441 Merge pull request #2091 from rgarmsen2295/plt-1797 
PLT-1797 Increased username max length
 2016-02-05 14:12:10 -08:00
Reed Garmsen
255c844afc Increased username max length 2016-02-05 13:09:52 -08:00
Reed Garmsen
d416a04e52 Separated displayTime functions for component/string form 2016-02-05 09:23:40 -08:00
Reed Garmsen
1778eb8115 Fixed issue with on-hover timestamps 2016-02-05 08:35:31 -08:00
Corey Hulen
9b8761df8d Merge pull request #2087 from hmhealey/plt1758 
PLT-1758 Changed CommandProvider to only set the matched pretext if it actuall…
 2016-02-05 07:42:42 -08:00
Christopher Speller
fc6f387076 Merge pull request #2082 from mattermost/plt-1848 
PLT-1848 Stats for recently active and new users now shows date with the time
 2016-02-05 10:31:33 -05:00
hmhealey
e6a7594d70 Changed CommandProvider to only set the matched pretext if it actually matches anything 2016-02-05 10:21:53 -05:00
Asaad Mahmood
67408e9ebd Multiple UI improvements 2016-02-05 19:34:01 +05:00
JoramWilander
9390d97321 Stats for recently active and new users now shows date with the time 2016-02-05 09:30:50 -05:00
Joram Wilander
8e79f12f3c Merge pull request #2077 from hmhealey/plt1819 
PLT-1819 Changed notification permission dialogue to only be shown once per page load
 2016-02-05 07:38:01 -05:00
Corey Hulen
ccfdfdfce2 Merge pull request #2079 from mattermost/help-text-updates 
Changing URL for testing push notifications
 2016-02-04 16:51:53 -08:00
Corey Hulen
bab2be98f7 Merge pull request #2076 from ZBoxApp/loc-fix 
PLT-7: Fix and Add new loc strings
 2016-02-04 16:45:49 -08:00
it33
fc9494b587 Update email_settings.jsx 2016-02-04 15:37:17 -08:00
Corey Hulen
57bfe31376 Merge pull request #2075 from mattermost/PLT-1851 
PLT-1851 reconnect and get missing messages
 2016-02-04 15:36:35 -08:00
Corey Hulen
392b878a10 Merge pull request #2071 from hmhealey/plt1820 
PLT-1820/PLT-1847 Cleaned up textbox focus code
 2016-02-04 15:36:28 -08:00
Elias Nahum
e1bea101f5 fix typos 2016-02-04 19:25:34 -03:00
hmhealey
5cc359a4ea Changed notifications to only request permission once per session if the user clicks 'Not now' on Firefox 2016-02-04 16:51:32 -05:00
Corey Hulen
af6ade3380 Merge pull request #2073 from mattermost/ee-updates 
Some general updates to EE
 2016-02-04 13:01:14 -08:00
Elias Nahum
88118515d0 PLT-7: Fix and Add new loc strings 2016-02-04 17:31:11 -03:00
hmhealey
c4344f8c02 Added focus to the sidebar textbox when it is opened 2016-02-04 15:17:42 -05:00
=Corey Hulen
c3ab4872a4 PLT-1851 fixing websocket reconnect error 2016-02-04 12:07:55 -08:00
Christopher Speller
ec51c31c32 Merge pull request #2064 from hmhealey/plt882 
PLT-882 Ephemeral Messages and Out-Of-Channel mentions
 2016-02-04 14:50:30 -05:00
hmhealey
c11446657f Added code to refocus on the post/comment textbox after a file is drag and dropped 2016-02-04 14:49:10 -05:00
hmhealey
eec9f88110 Updated RHS textbox to refocus after clicking to upload a file 2016-02-04 14:49:10 -05:00
hmhealey
9adc80c3fc Cleaned up textbox focus code 2016-02-04 14:49:10 -05:00
=Corey Hulen
cfd4e4de96 Merge branch 'master' into PLT-1851 2016-02-04 10:55:44 -08:00
JoramWilander
e45282deaa Move license storage to database 2016-02-04 13:35:44 -05:00
JoramWilander
7e8389cd05 Turn failed audit descriptions red 2016-02-04 13:35:44 -05:00
JoramWilander
66a5bdba2e Convert audit_table to a proper table 2016-02-04 13:35:43 -05:00
JoramWilander
a3df1eaa55 Rename audits tab 2016-02-04 13:33:18 -05:00
JoramWilander
da7832ed8a Disable remove license button until LDAP is disabled 2016-02-04 13:32:33 -05:00
JoramWilander
b3b71c292d Fix license info localization 2016-02-04 13:32:33 -05:00
it33
80679faaa7 Update email_settings.jsx 2016-02-04 10:25:46 -08:00
hmhealey
f935be121c Added helper methods to send ephemeral messages to specific users 2016-02-04 11:38:58 -05:00
hmhealey
70c3715b96 Changed how posts are marked ephemeral 2016-02-04 11:38:58 -05:00
hmhealey
fd123a6e4a Changed PostStore to not clear a deleted post's message 2016-02-04 11:38:57 -05:00
hmhealey
fcb92fa1b5 Added ephemeral messages sent when a user mentions someone not in the channel 2016-02-04 11:38:56 -05:00
hmhealey
db13b7a3ca Changed deleted posts to be more general ephemeral posts 2016-02-04 11:38:56 -05:00
Harrison Healey
4f1dbb8ca9 Merge pull request #2052 from mattermost/PLT-1429 
PLT-1429 adding user created slash commands
 2016-02-04 11:38:27 -05:00
=Corey Hulen
dffc5323ec PLT-1429 Fixing code review comments 2016-02-04 08:03:42 -08:00
Corey Hulen
34547186ba Merge pull request #2068 from hmhealey/plt1767 
PLT-1767 Fixed editing your last comment in the RHS
 2016-02-04 07:54:57 -08:00
hmhealey
f9ce99bdcf Fixed localization issues in file_upload.jsx 2016-02-04 10:10:00 -05:00
hmhealey
e4492152c7 Fixed editing your last comment in the RHS 2016-02-04 10:00:19 -05:00
Joram Wilander
87e6357265 Merge pull request #2062 from asaadmahmoodspin/ui-improvements 
Multiple UI Improvements
 2016-02-04 07:26:05 -05:00
Corey Hulen
e036375fe2 Merge pull request #2063 from mattermost/fix-loc 
Fixing loc error
 2016-02-03 17:08:41 -08:00
=Corey Hulen
f1bf706242 PLT-1851 reconnect and get missing messages 2016-02-03 15:07:03 -08:00
=Corey Hulen
d3a965a362 Merge branch 'master' into PLT-1429 2016-02-03 12:11:02 -08:00
Harrison Healey
2b4af8d8c7 Merge pull request #2060 from ZBoxApp/PLT-7-channel 
PLT-7: Refactoring frontend (chunk 11)
 2016-02-03 14:32:01 -05:00
=Corey Hulen
143186b9d9 Fixing loc error 2016-02-03 11:26:06 -08:00