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

2287 Коммитов

Автор SHA1 Сообщение Дата
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
Joram Wilander
936f032ec4 Merge pull request #680 from hmhealey/plt159
PLT-159 Properly hide unread indicators when there are no unread channels
2015-09-17 07:49:29 -04:00
JoramWilander
ce19b3c211 Properly check if OAuth providing is enabled on the client. 2015-09-17 07:46:38 -04: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
e644b53b72 Merge pull request #697 from mattermost/PLT-93
PLT-93 Fixing broken email templates
2015-09-16 16:32:27 -04:00
Christopher Speller
720f1082d3 Merge pull request #696 from mattermost/PLT-23
PLT-23 error.html pulls files from static
2015-09-16 16:31:26 -04:00
Christopher Speller
dc74d57611 Merge pull request #694 from mattermost/GIT-669
Fixing 669 removing -a flag from go cmds
2015-09-16 16:30:05 -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
c60e687c6b Fixing broken email templates 2015-09-16 12:38:51 -07:00
=Corey Hulen
609e5c6652 Fixing broken email templates 2015-09-16 12:38:09 -07:00
=Corey Hulen
c7bb4ab7f8 Fixing broken email templates 2015-09-16 12:37:54 -07:00
=Corey Hulen
ac38aadc12 Fixing broken email templates 2015-09-16 12:36:35 -07:00
=Corey Hulen
c2829b24e4 PLT-23 error.html pulls files from static 2015-09-16 12:08:26 -07:00
=Corey Hulen
986aeae7ce PLT-23 error.html pulls files from static 2015-09-16 12:06:49 -07: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
f16e0a47ce Fixing 669 removing -a flag from go cmds 2015-09-16 09:50:20 -07: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
1220a09858 Merge pull request #692 from hmhealey/plt149
PLT-149 Removed the file list from (message deleted) placeholder posts
2015-09-16 09:44:26 -07:00
=Corey Hulen
4e3896d7b1 Adding config file timestamp to X-Version header 2015-09-16 09:37:20 -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
Harrison Healey
d4887cef03 Merge pull request #690 from mattermost/fix-safari
Fixing issues on safari
2015-09-16 10:40:52 -04: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
Joram Wilander
40f4aadbf7 Merge pull request #688 from mattermost/fixing-typo
Fixing typo
2015-09-16 07:43:47 -04:00
=Corey Hulen
24a8c6c24c Fixing typo 2015-09-15 19:56:21 -07: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
Harrison Healey
bbb0607e1d Merge pull request #685 from mattermost/update-style-guide
Updating style guide
2015-09-15 15:08:11 -04:00
Christopher Speller
5520ffa893 Updating style guide 2015-09-15 12:56:21 -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
4726fb21b2 Merge pull request #673 from apaatsio/clean-go-deps
Clean installed Go dependencies
2015-09-15 08:20:22 -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