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,236 Commits 845 Branches 1,202 Tags
9390d97321188834a56bd592a3a0a41e9b8ba28a
Commit Graph

660 Commits

Author SHA1 Message Date
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
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
70c3715b96 Changed how posts are marked ephemeral 2016-02-04 11:38:58 -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
=Corey Hulen
dffc5323ec PLT-1429 Fixing code review comments 2016-02-04 08:03:42 -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
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
JoramWilander
ca65d20fdb Fix katex sanitization 2016-02-03 11:27:49 -05:00
Elias Nahum
cdfa9b585a Messages for SocketStore and small fixes 2016-02-03 12:17:13 -03: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
3b5196567a Merge pull request #2054 from khoa-le/PLT-1433 
PLT-1433 OGG files render as audio files with preview
 2016-02-03 08:54:31 -05: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
Joram Wilander
5be7d00230 Merge pull request #2048 from rgarmsen2295/plt-1317 
PLT-1317 Replaces the clock icon for same user posts with a simple timestamp
 2016-02-03 07:36:04 -05:00
Khoa, Le Ngoc
1f06b60e44 OGG files render as audio files with preview 2016-02-03 08:50:59 +07: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
Reed Garmsen
92816619cc Changed clock icon in repeat posts to simple timestamp 2016-02-02 11:54:01 -08:00
=Corey Hulen
b4ec690051 Fixing merge 2016-02-01 14:44:17 -08:00
Asaad Mahmood
0e69a871bb Adding reply functionality 2016-01-28 23:24:31 +05:00
=Corey Hulen
ea71731f83 merging 2016-01-25 11:23:55 -05:00
Corey Hulen
1a0b12313b Merge pull request #1956 from mattermost/plt-1779 
PLT-1779 Add system-wide statistics page
 2016-01-22 17:00:09 -06:00
=Corey Hulen
c2d98c2c1f merging 2016-01-22 16:31:58 -06:00
=Corey Hulen
058d6b2467 PLT-7 adding loc feature to preview 2016-01-22 09:27:27 -06:00
=Corey Hulen
da1d52d546 PLT-7 adding lang selector 2016-01-22 09:10:08 -06:00
Christopher Speller
9937e1ead2 Merge pull request #1948 from hmhealey/plt1652 
PLT-1652 Added download param to getFile api call
 2016-01-22 08:14:18 -05:00
=Corey Hulen
dea84b1892 PLT-7 Adding react-intl libs 2016-01-21 13:54:21 -06:00
hmhealey
261b38be45 Added download param to getFile api call 2016-01-21 13:55:47 -05:00
JoramWilander
cefdad6d8c Add system analytics page 2016-01-21 12:59:32 -05:00
JoramWilander
2a26d85757 Generalize analytics server functions and begin componentizing client analytics controls 2016-01-21 12:14:23 -05:00
Christopher Speller
c7faefbedc Merge pull request #1924 from loafoe/master 
[#1923] Make Websocket ports configurable
 2016-01-21 10:01:15 -05:00
Christopher Speller
868eece987 Merge pull request #1927 from rgarmsen2295/plt-1668 
PLT-1668 Removes duplicate short username error message
 2016-01-21 09:59:38 -05:00
Joram Wilander
202e00d8df Merge pull request #1885 from rgarmsen2295/plt-406 
PLT-406 Fixes issues with drag and drop overlay in IE11
 2016-01-21 07:08:17 -05:00
Reed Garmsen
76f0000565 Removed extraneous error when providing a short username 2016-01-20 08:43:14 -08:00
Andy Lo-A-Foe
b870c0117f Fix indentation 2016-01-20 01:03:17 +01:00
Andy Lo-A-Foe
6faabe34e8 Optionally specify ws:// and wss:// port in config 2016-01-19 19:41:39 +01:00
=Corey Hulen
586967b757 finishing up commands UI 2016-01-14 10:52:14 -06:00
=Corey Hulen
6d6cada097 Merge branch 'master' into PLT-1429 2016-01-14 09:08:13 -06:00
JoramWilander
9110dd54a1 Added license validation and settings 2016-01-14 08:24:09 -05:00
Corey Hulen
53b0cd8f2a Merge pull request #1855 from rgarmsen2295/plt-1006 
PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
 2016-01-13 09:03:42 -06:00
Corey Hulen
1e1864d78f Merge pull request #1853 from asaadmahmoodspin/ui-improvements 
Adding away icon and changing online and offline icons
 2016-01-13 09:03:01 -06:00
Reed Garmsen
c39ba354d5 Fix issue with drag n drop overlay in ie11 2016-01-12 12:05:41 -08:00
Reed Garmsen
fff7143a31 Changed statistics to show usernames with an email tooltip 2016-01-11 09:43:45 -08:00
Corey Hulen
cffb5215b0 Merge pull request #1849 from hmhealey/plt1578 
PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs
 2016-01-11 10:08:13 -06:00
hmhealey
5de20f0133 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs 2016-01-11 10:42:18 -05:00
Asaad Mahmood
e9c2fd7cbb Adding away icon and changing online and offline icons 2016-01-11 20:32:31 +05:00
Joram Wilander
7aa7f83524 Merge pull request #1824 from hmhealey/plt1525 
PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
 2016-01-11 06:54:55 -05:00
=Corey Hulen
3edcf960a0 Fixing unit tests 2016-01-09 09:22:14 -06:00
=Corey Hulen
3fba8e42b1 partial fix for UI 2016-01-08 12:41:26 -06:00