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

1025 Коммитов

Автор SHA1 Сообщение Дата
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
=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
=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