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
4,834 Commits 845 Branches 1,202 Tags
6d6cada0970a2b341f36dac9b0fed8262ada1865
Commit Graph

621 Commits

Author SHA1 Message Date
=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
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
hmhealey
357063044b Made ChannelInviteModal pull all channel members before rendering 2016-01-07 10:25:56 -05:00
Reed Garmsen
9d9eaec14f Removed ability to drag n' drop text; drag n' drop ui no longer appears when non-files are dragged 2016-01-06 14:39:43 -08:00
Joram Wilander
5855b5e459 Merge pull request #1819 from hmhealey/plt1401 
PLT-1401 Removed email regex
 2016-01-06 15:52:28 -05:00
hmhealey
ee0366a862 Removed email regex 2016-01-06 15:30:11 -05:00
hmhealey
a6ba1a17fe Removed temporary fix for old filenames that used absolute urls pointing to the get file api 2016-01-06 09:54:05 -05:00
hmhealey
239d147d97 Changed Audio/Video preview to just display a file info when encountering a file that cannot be played 2016-01-06 09:44:12 -05:00
Christopher Speller
0c6483b60a Merge pull request #1801 from hmhealey/plt1602 
PLT-1602 Fix ViewImageModal incorrectly assuming it has a file's info in certain cases
 2016-01-04 15:57:22 -05:00
Christopher Speller
67db3ca8ce Merge pull request #1745 from mattermost/plt-1118 
PLT-1118 Add ability to switch between SSO and email account
 2016-01-04 15:55:51 -05:00
hmhealey
4b76d6a05d Fixed ViewImage modal to clear its loaded state when its file list changes 2016-01-04 12:23:46 -05:00
Christopher Speller
da6aba6e50 Merge pull request #1769 from mattermost/PLT-1488 
PLT-1488 fixing error message from session revoke
 2016-01-04 07:14:46 -05:00
Joram Wilander
2f04ea6dd2 Merge pull request #1740 from hmhealey/plt730 
PLT-730/PLT-731 Added remaining mobile UI V2 components
 2015-12-28 09:02:20 -05:00
Joram Wilander
0b55c5f861 Merge pull request #1755 from hmhealey/plt1108 
PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs
 2015-12-28 08:59:23 -05:00
=Corey Hulen
d2253a2886 PLT-1488 fixing error message from session revoke 2015-12-23 09:58:13 -08:00
Asaad Mahmood
9ab31d0a2b Multiple UI Improvements 2015-12-21 20:57:03 +05:00
Corey Hulen
840335911f Merge pull request #1756 from mattermost/lfbrock-emojis 
PLT-1122 Fixed black_large_square emoticon. Also fixed emoji mapping.
 2015-12-18 20:55:09 -08:00
Lindsay Brock
fff1db5c5d Fixed emoji mapping. 2015-12-18 16:10:06 -05:00
hmhealey
46a59252b6 Refactored ViewImage modal and made it automatically play animated gifs 2015-12-18 12:51:04 -05:00
Asaad Mahmood
3d0249c8bc Multiple UI Improvements 2015-12-18 19:47:33 +05:00
JoramWilander
a6ae90ac2a Add ability to switch between SSO and email account 2015-12-17 12:44:46 -05:00
Christopher Speller
58358ddd7c Some refactoring 2015-12-16 17:30:15 -05:00
hmhealey
cf00525565 Added theme styling to floating timestamp 2015-12-16 15:16:57 -05:00
hmhealey
07638f7e7d Added DelayedAction class to use to handle stopping scrolling 2015-12-16 09:54:58 -05:00
Christopher Speller
34e0ac00e8 Merge pull request #1733 from hmhealey/plt1437 
PLT-1437 PreferenceStore api changes and fixing CreatePost warning
 2015-12-16 09:10:24 -05:00
Christopher Speller
3e418a100a Merge pull request #1710 from mattermost/plt-1498 
PLT-1498 Add hashtag testing and allow special german characters
 2015-12-16 09:09:11 -05:00
hmhealey
e4899fa551 Improved PreferenceStore api when getting values 2015-12-15 11:36:14 -05:00
Asaad Mahmood
fe84def817 Multiple UI Improvements 2015-12-15 21:12:19 +05:00
Joram Wilander
3850469462 Merge pull request #1730 from mattermost/PLT-1404 
PLT-1404 signal login to other tabs
 2015-12-15 08:58:51 -05:00
=Corey Hulen
b94d025da4 PLT-1404 signal login to other tags 2015-12-14 15:21:22 -08:00
Asaad Mahmood
9749519580 Multiple UI Improvements 2015-12-11 23:58:38 +05:00
JoramWilander
b660acf8f8 Add hashtag testing and allow special german characters 2015-12-11 13:03:14 -05:00
Corey Hulen
412b45431a Merge pull request #1652 from hmhealey/plt1319 
PLT-1319 Fixed direct channels not being visible when no actual channel exists
 2015-12-11 06:40:37 -08:00
Joram Wilander
505445d9d9 Merge pull request #1684 from hmhealey/plt1184 
PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made
 2015-12-11 08:37:13 -05:00
hmhealey
88f29d8b6d Fixed EditChannelHeaderModal's contents not always being updated when a change is made 2015-12-10 10:01:01 -05:00
Christopher Speller
e80129a0e9 Revert "add helper method to add ephemeral messages; also switch 'delete mess…" 2015-12-10 08:32:30 -05:00
Florian Orben
99d79eee56 add helper method to add ephemeral messages; also switch 'delete message' to this new method 2015-12-09 22:29:54 +01:00
JoramWilander
699230bb3f Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds 2015-12-09 12:24:34 -05:00
Asaad Mahmood
8cd5b4293a Multiple UI Improvements 2015-12-09 20:23:13 +05:00
hmhealey
c55e7895d9 Changed Sidebar direct channel list to be driven by preferences 2015-12-08 09:45:21 -05:00
Christopher Speller
5e4be8b0d4 Merge pull request #1639 from hmhealey/plt1063 
PLT-1063 Switched marked to forked version
 2015-12-08 08:19:08 -05:00