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,498 Commits 845 Branches 1,202 Tags
25d599747e6a6286a5943d63d12eb8e1b9eaa99d
Commit Graph

665 Commits

Author SHA1 Message Date
Elias Nahum
25d599747e Fix typo 2016-02-25 14:10:24 -03:00
Elias Nahum
6a8df70e73 Set Context Error if ExtraUpdateByUser fails 2016-02-25 13:46:17 -03:00
Elias Nahum
f0084229a5 Member show on Activate and Hide on deactivate from channel member list and at_mention 2016-02-25 04:24:03 -03:00
=Corey Hulen
5c2100c053 Fixing download of apk file 2016-02-23 07:54:51 -08:00
=Corey Hulen
a0959acf87 Merge branch 'ui-improvements' of https://github.com/asaadmahmoodspin/platform into asaadmahmoodspin-ui-improvements 2016-02-22 07:22:52 -08:00
Reed Garmsen
b10f6877a0 Fixed content security policy header 2016-02-18 12:52:47 -08:00
Christopher Speller
a7fae6e62f Moving tests to /tests and removing /doc folder. Docs are now in seperate repository 2016-02-18 09:25:10 -05:00
=Corey Hulen
35e3b8c40f Fixing IE expire issue 2016-02-11 13:17:27 -08:00
Asaad Mahmood
efd2ed908d Adding back button for login pages 2016-02-11 23:31:40 +05:00
Christopher Speller
590022064a Fixing cacheing issue on IE for admin console 2016-02-11 09:31:39 -05:00
Elias Nahum
85d0eece3d Need to set as template.HTML 2016-02-10 16:43:03 -03:00
Elias Nahum
d5c666ec12 Change body info from String to HTML 2016-02-10 16:26:32 -03:00
Elias Nahum
7476bc9883 Fix change email subject 2016-02-10 15:20:51 -03:00
=Corey Hulen
fbe932ece6 Fixing attaching device id 2016-02-08 14:30:58 -08:00
=Corey Hulen
3f0443b552 PLT-1900 removing lang from preview and making spanish beta 2016-02-08 11:12:59 -08:00
Corey Hulen
cbee3e0a18 Merge pull request #2102 from mattermost/plt-1697 
PLT-1697 Add ExpiresAt to session cookie so that IE/Edge store the cookie
 2016-02-08 11:00:11 -08:00
Joram Wilander
b6300b1656 Merge pull request #2097 from mattermost/plt-1781 
PLT-1781 Fixing slack import.
 2016-02-08 11:57:58 -05:00
JoramWilander
53ee703e7c Add ExpiresAt to session cookie so that IE/Edge store the cookie 2016-02-08 11:29:11 -05:00
Christopher Speller
476822ca8d Fixing slack import. 2016-02-08 09:41:56 -05:00
Christopher Speller
be70bbc2f0 Merge pull request #2083 from mattermost/plt-1879 
PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete…
 2016-02-08 07:34:39 -05:00
=Corey Hulen
2b32bad993 Fixing slash commands 2016-02-05 14:10:57 -08:00
JoramWilander
9f5f18a93a Make insecure TLS connections configurable 2016-02-05 12:40:32 -05:00
=Corey Hulen
0f1f3d24e5 Fixing slash commands 2016-02-05 09:00:57 -08:00
JoramWilander
8c505e7b5c Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bug 2016-02-05 08:21:15 -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
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
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
f8005744a2 Changed out of channel mention tests to use proper email addresses 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
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
dffc5323ec PLT-1429 Fixing code review comments 2016-02-04 08:03:42 -08: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
=Corey Hulen
950e25df5a Fixing build 2016-02-03 16:11:54 -08: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
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
JoramWilander
3425aa3e5d Update user email when switching to SSO 2016-02-03 10:32:37 -05:00
Elias Nahum
6a3806fe9d PLT-7: Refactoring frontend (chunk 11) 
- channel view
- Added translations for previous commits
- Fix bug on signup_team email body
 2016-02-03 12:17:13 -03:00
Christopher Speller
75f412c4be Merge pull request #2049 from mattermost/plt-1856 
PLT-1856 Add basic server audit tab to system console for EE
 2016-02-03 08:52:18 -05:00
Christopher Speller
d479b08c99 Merge pull request #2045 from mattermost/plt-1849 
PLT-1849 Added extra system-wide statistics for EE
 2016-02-03 08:50:25 -05:00
JoramWilander
d153d661db Add basic server audit tab to system console for EE 2016-02-02 16:49:27 -05:00
Reed Garmsen
b013f02209 Added ability to sign in via username; separated email sign in and sign up config settings 2016-02-02 12:07:42 -08:00
=Corey Hulen
4c6c94d47c Fixing unit test 2016-02-02 08:46:43 -08:00
=Corey Hulen
ff54da2e4a Adding loc to front-end 2016-02-02 08:42:36 -08:00
JoramWilander
3d03bdf2f1 Added extra system-wide statistics for EE 2016-02-02 08:41:02 -05:00