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

1013 Коммитов

Автор SHA1 Сообщение Дата
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
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
=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
hmhealey
4c9ae22b62 Renamed text formatting tokens so that there should be significantly less chance of having conflicting tokens 2015-09-14 15:08:13 -04:00
Joram Wilander
312f7d7656 Merge pull request #674 from Trozz/PLT-41
PLT-41 Automatically convert uppercase letters to lowercase in username input box.
2015-09-14 14:45:33 -04:00
Joram Wilander
125b7dc71b Merge pull request #677 from mattermost/plt-50
PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
2015-09-14 14:32:15 -04:00
Michael Leer
c961c529af update remaining web files tolowercase 2015-09-14 19:29:56 +01:00
JoramWilander
0654b0c06b Blank Content-Type for file GETs. 2015-09-14 14:18:01 -04:00
Christopher Speller
0ea0233c50 New add channel modal using react-bootstrap. 2015-09-14 13:56:58 -04:00
Corey Hulen
8d021a13f8 Merge pull request #668 from nickago/MM-1958
MM-1958 please read comment, base video player
2015-09-14 10:18:24 -07:00
hmhealey
d8779efc99 Removed textToJsx! 2015-09-14 12:22:02 -04:00
hmhealey
15aa853da5 Removed all calls to textToJsx and replaced them with calls to TextFormatting 2015-09-14 12:22:02 -04:00
hmhealey
3e3b52554a Cleaned up TextFormatting and added a default click handler for hashtags and @mentions 2015-09-14 12:21:58 -04:00
Christopher Speller
7b3c2d6d85 Allowing underscores in channel names. Added conversion of some slack channel names into valid mattermost names. 2015-09-14 12:18:38 -04:00
Michael Leer
90ef55b428 replace lowerName with name 2015-09-14 16:10:31 +01:00
Michael Leer
5fbd1e9860 PLT-41
Removed lowercase from the error wording.
Removed additional toLowerCase within validator.
2015-09-14 15:15:48 +01:00
Michael Leer
ffbe185d82 PLT-41
Automatically convert uppercase letters to lowercase in username input box.

Validator not changed.
2015-09-14 14:54:36 +01:00
hmhealey
214e48835a Added highlighting of search terms to the new text formatting 2015-09-14 09:19:27 -04:00
hmhealey
e1797c7d55 Added autolinking of hashtags to the new text formatting 2015-09-14 09:19:27 -04:00
hmhealey
3ab2814af3 Added autolinking of urls to the new text formatting 2015-09-14 09:19:26 -04:00
hmhealey
5d28ffa444 Added highlighting when the current user is mentioned to the new text formatting 2015-09-14 09:19:26 -04:00
hmhealey
56312f8f53 Changed one instance of textToJsx to use new text formatting for testing purposes 2015-09-14 09:19:26 -04:00
hmhealey
91f258c725 Added handling for @mentions to the new text formatting 2015-09-14 09:19:26 -04:00
hmhealey
2d2939576c Added skeleton for new text formatting code which will replace textToJsx 2015-09-14 09:19:26 -04:00
nickago
543ce8b4be WIP Added base video player 2015-09-12 18:19:17 -07:00
=Corey Hulen
714f47e015 Merge branch 'master' into PLT-12 2015-09-11 09:59:32 -07:00
Corey Hulen
471e783996 Merge pull request #657 from mattermost/fix-npm-package
Change versioning to exact versions in package.json
2015-09-11 09:59:00 -07:00
Christopher Speller
560805321b Change versioning to exact versions in package.json 2015-09-11 12:46:18 -04:00
JoramWilander
83931da9f2 Fix load more posts bug. 2015-09-11 08:38:18 -04:00
=Corey Hulen
e06e292be7 PLT-12 adding log viewer 2015-09-10 18:32:22 -07:00
=Corey Hulen
41439eb801 Cleaning up html 2015-09-10 15:44:14 -07:00
=Corey Hulen
83b04181da merging 2015-09-10 15:15:04 -07:00
=Corey Hulen
8bf35081c8 PLT-12 UI framework for admin console 2015-09-10 14:56:37 -07:00
Christopher Speller
e82070c2ce Merge pull request #635 from hmhealey/plt159
PLT-159/MM-2074 Changed unread posts indicator to not be shown for the current channel
2015-09-10 08:24:50 -04:00
hmhealey
2e5a58a11e PLT-159 Changed unread posts indicator to not be shown for the current channel 2015-09-09 15:22:43 -04:00
Asaad Mahmood
1f5e43b388 Adding minor hover changes for settings 2015-09-09 22:32:21 +05:00
Asaad Mahmood
c5ce2fe933 MM-1825 - Improving UI for settings 2015-09-09 21:26:15 +05:00
Asaad Mahmood
407b6af7a0 Merge branch 'master' of https://github.com/mattermost/platform into mm-1866 2015-09-09 21:07:25 +05:00
JoramWilander
d30426ce17 Fix race condition where switching between two channels that both had new messages sometimes caused improper scrolling. 2015-09-09 11:28:53 -04:00
Christopher Speller
2c67b4db61 Merge pull request #625 from asaadmahmoodspin/ui-changes
UI changes for various tickets
2015-09-09 10:55:53 -04:00
Asaad Mahmood
f74f066a44 MM-1866 - Adding download icon and adding download link for both file title and download icon 2015-09-09 19:42:03 +05:00