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
2,344 Commits 845 Branches 1,202 Tags
e989b839d53471dec7c71146af88cd3197d14ffc
Commit Graph

1178 Commits

Author SHA1 Message Date
=Corey Hulen
cdf813f07b merging 2015-09-18 09:25:47 -07:00
Joram Wilander
5a436fd447 Merge pull request #699 from mattermost/PLT-92 
PLT-92 Adding server side versioning to the binary
 2015-09-18 12:22:57 -04:00
hmhealey
bc8e69d99f Fixed incorrect check if a url starts with an explicit protocol 2015-09-18 11:56:23 -04:00
=Corey Hulen
60af1fad1f Moving logout item 2015-09-17 22:25:37 -07:00
=Corey Hulen
804b696bdc PLT-11 adding config for logs to UI 2015-09-17 22:00:33 -07:00
=Corey Hulen
44714dfcb1 PLT-11 Adding ability to save config file 2015-09-17 21:00:59 -07:00
Corey Hulen
82127341ca Merge pull request #705 from esethna/patch-1 
Grammar change to New Channel ui text
 2015-09-17 13:25:21 -07:00
=Corey Hulen
c63da24964 moving to security tab 2015-09-17 13:24:55 -07:00
=Corey Hulen
af4deb2369 Making changes to versioning 2015-09-17 13:01:40 -07:00
=Corey Hulen
9b5198c69c Merge branch 'master' into PLT-92 2015-09-17 09:21:56 -07:00
Joram Wilander
7901126b63 Merge pull request #701 from mattermost/PLT-40 
PLT-40 adding experimental support for emojis
 2015-09-17 11:56:59 -04:00
esethna
aa79a12a31 Grammar change to New Channel ui text 2015-09-17 09:56:42 -06:00
Joram Wilander
fd3a7afb3e Merge pull request #702 from mattermost/oauth-switch-fix 
Properly check if OAuth providing is enabled on the client.
 2015-09-17 07:53:02 -04:00
JoramWilander
ce19b3c211 Properly check if OAuth providing is enabled on the client. 2015-09-17 07:46:38 -04:00
=Corey Hulen
99d0db136c Fixing css 2015-09-16 23:27:25 -07:00
=Corey Hulen
8e848f38d5 PLT-40 adding experimental support for emojis 2015-09-16 23:22:15 -07:00
=Corey Hulen
4352118700 Adding version to UI 2015-09-16 20:16:42 -07:00
=Corey Hulen
cef7a1aae4 PLT-92 Adding server side versioning to the binary 2015-09-16 17:37:11 -07:00
Christopher Speller
acf2fb64b4 Cleaned up logic for the unread indicators 2015-09-16 17:08:05 -04:00
hmhealey
7e66a3d5be Moved unread channel indicators into their own React component and file 2015-09-16 16:51:16 -04:00
hmhealey
8d0c69aec6 Properly hide unread channel indicators when there are no unread channels 2015-09-16 16:51:16 -04:00
Christopher Speller
b1f26540ce Merge pull request #693 from mattermost/mm-1419 
Implement OAuth2 service provider functionality.
 2015-09-16 16:26:56 -04:00
JoramWilander
47e6a33a45 Implement OAuth2 service provider functionality. 2015-09-16 15:49:12 -04:00
Corey Hulen
4e11fa23d7 Merge pull request #695 from hmhealey/startswith 
Replaced instances of startsWith with lastIndexOf in TextFormatting
 2015-09-16 11:17:25 -07:00
hmhealey
60d2cff723 Replaced instances of startsWith with lastIndexOf in TextFormatting 2015-09-16 14:08:10 -04:00
Christopher Speller
7e418714bc Merge pull request #687 from mattermost/PLT-93 
PLT-93 Cleaning up client side configs
 2015-09-16 12:52:50 -04:00
Corey Hulen
9828d84f01 Merge pull request #691 from asaadmahmoodspin/ui-changes 
UI Updates for multiple tickets
 2015-09-16 09:44:52 -07:00
=Corey Hulen
84c0b96e0b Merge branch 'master' into PLT-93 2015-09-16 09:29:50 -07:00
hmhealey
5567651119 PLT-149 Removed the file list from (message deleted) placeholder posts 2015-09-16 12:02:29 -04:00
Asaad Mahmood
28b61e6437 UI Updates for multiple tickets 2015-09-16 20:32:10 +05:00
Christopher Speller
395e5cd854 Removing js map from react bootstrap to make safari happy. 
Adding babel runtime to build process because Safari hasen't gotten with
the program yet.
 2015-09-16 10:20:17 -04:00
Joram Wilander
9f2cd77dc8 Merge pull request #686 from hmhealey/plt172 
PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar
 2015-09-16 07:44:45 -04:00
=Corey Hulen
2fc01df828 Fixing eslint problems 2015-09-15 19:34:02 -07:00
=Corey Hulen
d625e62d96 Finished removing some of the last bits of client side config 2015-09-15 19:29:00 -07:00
=Corey Hulen
5e2f701e6c Removing old config stuff 2015-09-15 19:09:50 -07:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00
=Corey Hulen
788fc4373b removing loggly 2015-09-15 14:20:25 -07:00
Christopher Speller
1bbb5265be Merge pull request #681 from mattermost/PLT-12-log 
PLT-12 Adding server logs viewer to admin console
 2015-09-15 15:59:29 -04:00
hmhealey
ac052fb91c PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly stops clicks through the scrollbar 2015-09-15 12:53:05 -04:00
hmhealey
49df7c0314 PLT-172 Updated perfect-scrollbar to 0.6.5 2015-09-15 12:52:52 -04:00
=Corey Hulen
23a1311ef5 Moving style into css 2015-09-15 09:19:29 -07:00
Corey Hulen
26852d0796 Merge pull request #684 from mattermost/fix-text-overflow 
Fixing long channel name overflow by changing text to Edit
 2015-09-15 08:17:24 -07:00
Joram Wilander
125094b21b Merge pull request #682 from mattermost/nc-patch 
Fixing cutoff team name in new channel modal.
 2015-09-15 11:16:31 -04:00
Christopher Speller
56dfdb8bd8 Fixing long channel name overflow by changing text to Edit 2015-09-15 10:49:46 -04:00
Joram Wilander
4a9984d166 Merge pull request #676 from hmhealey/mm1900b 
MM-1900 Removed textToJsx
 2015-09-15 08:20:01 -04:00
Christopher Speller
edecf835ed Fixing cutoff team name in new channel modal 2015-09-15 08:11:00 -04:00
=Corey Hulen
9a3f67a9c9 Fixing eslint issues 2015-09-14 17:18:47 -07:00
=Corey Hulen
3bd350dcaf Merge branch 'master' into PLT-12-log 2015-09-14 16:59:24 -07:00
Corey Hulen
bfebb41bc0 Merge pull request #678 from mattermost/mm-1589 
PLT-171 MM-1589 New add channel modal using react-bootstrap.
 2015-09-14 16:57:54 -07:00
Harrison Healey
c447db6e78 Merge pull request #679 from mattermost/fix-file-content-type 
Blank Content-Type for file GETs.
 2015-09-14 16:17:22 -04:00