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

5231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b25e7e227a Update en.json 2016-02-04 15:41:03 -08:00
it33
a69648984c Update es.json 2016-02-04 15:39:34 -08:00
it33
ef427dacf3 Update en.json 2016-02-04 15:38:54 -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
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
0e43f7f7d7 revert config.json 2016-02-04 17:34:36 -03: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
it33
87c9413e37 Update es.json 2016-02-04 11:06:51 -08:00
it33
d1b7c1582f Update en.json 2016-02-04 11:06:18 -08: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
Corey Hulen
44c19ee443 Merge pull request #2072 from ZBoxApp/command-loc 
Add spanish translations for commands
 2016-02-04 09:38:00 -08:00
Elias Nahum
8c5c5e5851 Add spanish translations for commands 2016-02-04 14:17:01 -03:00
hmhealey
21318b7505 Changed sendNotificationsAndForget to be synchronous and called as a go func 2016-02-04 11:45:19 -05: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
994358c31a Reworked the code for sending notifications and checking for out of channel mentions to share some data 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
f8005744a2 Changed out of channel mention tests to use proper email addresses 2016-02-04 11:38:57 -05:00
hmhealey
0e44860d9b Removed untranslated phrases from es.json 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
hmhealey
b7d045844c Added serverside check for a post that @mentions someone who isn't in the channel 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
852acf1bb2 Merge pull request #2070 from asaadmahmoodspin/ui-improvements 
Fixing center channel icon position in IE
 2016-02-04 08:22:33 -08:00
Asaad Mahmood
51d9400be8 Fixing center channel icon position in IE 2016-02-04 21:05:09 +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
Corey Hulen
b8f49ed9d4 Merge pull request #2069 from hmhealey/localization 
Fixed localization issues in file_upload.jsx
 2016-02-04 07:54:39 -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
Harrison Healey
5e83be02ba Merge pull request #2059 from mattermost/plt-1732 
PLT-1732 Update user email when switching to SSO
 2016-02-04 09:24:41 -05:00
Joram Wilander
87e6357265 Merge pull request #2062 from asaadmahmoodspin/ui-improvements 
Multiple UI Improvements
 2016-02-04 07:26:05 -05:00