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

5210 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
af6ade3380 Merge pull request #2073 from mattermost/ee-updates
Some general updates to EE
2016-02-04 13:01:14 -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
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
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
Corey Hulen
8d27d2a1f7 Merge pull request #2065 from ZBoxApp/PLT-7-fix
Fix claim translations
2016-02-03 17:08:48 -08: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
950e25df5a Fixing build 2016-02-03 16:11:54 -08:00
Elias Nahum
739e829859 Fix claim translations 2016-02-03 19:49:58 -03:00
=Corey Hulen
4da7b0ccbd Fixing based on feedback 2016-02-03 12:16:37 -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
it33
acac4ab989 Update CONTRIBUTING.md 2016-02-03 11:24:32 -08:00
Asaad Mahmood
f8d3f9d4ec Multiple UI Improvements 2016-02-03 23:54:48 +05:00
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
Corey Hulen
9bba6c7988 Merge pull request #2061 from mattermost/plt-1817
PLT-1817 Fix katex sanitization
2016-02-03 10:43:20 -08:00
JoramWilander
ca65d20fdb Fix katex sanitization 2016-02-03 11:27:49 -05:00
Elias Nahum
ac184720fa Fix socketError message in spanish 2016-02-03 13:21:56 -03:00
Harrison Healey
6769969051 Merge pull request #2057 from khoa-le/PLT-1673
PLT-1673: Make hashtag searching independent of case
2016-02-03 11:10:35 -05:00
JoramWilander
a4e7d02cec Fix auth data unit test 2016-02-03 11:06:24 -05:00
Elias Nahum
cb88077eea fix config.json 2016-02-03 12:59:53 -03:00
Elias Nahum
957d9a111e Add missing translations 2016-02-03 12:48:48 -03:00
JoramWilander
3425aa3e5d Update user email when switching to SSO 2016-02-03 10:32:37 -05:00
Elias Nahum
cdfa9b585a Messages for SocketStore and small fixes 2016-02-03 12:17:13 -03:00