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 |
|
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 |
|
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 |
|
Christopher Speller
|
c3742aef71
|
Merge pull request #648 from mattermost/PLT-12
PLT-12: Work in progress for Admin Console UI
|
2015-09-14 08:58:53 -04:00 |
|
Joram Wilander
|
75721b5cb5
|
Merge pull request #672 from asaadmahmoodspin/ui-changes
PLT-217 - Improving horizontal scrollbar in LHS menu
|
2015-09-14 08:54:34 -04:00 |
|
Christopher Speller
|
b2378f433e
|
Merge pull request #663 from mattermost/it33-patch-4
Link Code Contribution Guidelines from TOC
|
2015-09-14 08:21:42 -04:00 |
|
Christopher Speller
|
f765ceb918
|
Merge pull request #660 from mattermost/it33-patch-3
Update CHANGELOG with info on recent commits
|
2015-09-14 08:21:24 -04:00 |
|
Christopher Speller
|
447363262e
|
Merge pull request #655 from mattermost/content-type
Set default Content-Type to application/json for all API requests
|
2015-09-14 08:19:51 -04:00 |
|
Asaad Mahmood
|
45b859ca74
|
PLT-217 - Improving horizontal scrollbar in LHS menu
|
2015-09-14 14:19:31 +05:00 |
|
it33
|
a9a7efbe98
|
Merge pull request #664 from mattermost/it33-patch-1
Removing "Alpha" from Docker Hub README
|
2015-09-12 11:16:18 -07:00 |
|
it33
|
f3798a983d
|
Removing "Alpha" from Docker Hub README
|
2015-09-12 11:09:29 -07:00 |
|
it33
|
e59fb27b86
|
Merge pull request #662 from mattermost/it33-patch-1
Adding "Get Involved" section to README
|
2015-09-12 09:19:29 -07:00 |
|
it33
|
18858f4c79
|
Link Code Contribution Guidelines from TOC
|
2015-09-12 09:14:28 -07:00 |
|
it33
|
465aa13504
|
Adding "Get Involved" section to README
|
2015-09-12 09:09:15 -07:00 |
|
JoramWilander
|
27e59c32f9
|
Set default Content-Type to application/json for all API requests
|
2015-09-12 10:26:24 -04:00 |
|
Joram Wilander
|
7f491bdb17
|
Merge pull request #658 from mattermost/it33-patch-1
Fixed broken links in doc/README.md
|
2015-09-12 10:14:59 -04:00 |
|
it33
|
186bb7d239
|
Update CHANGELOG with info on recent commits
|
2015-09-12 00:57:47 -07:00 |
|
it33
|
7ec3e74f8c
|
Merge pull request #659 from mattermost/it33-patch-1-1
Create code-contribution.md
|
2015-09-12 00:49:32 -07:00 |
|
it33
|
3d597905fb
|
Create code-contribution.md
|
2015-09-12 00:43:03 -07:00 |
|
it33
|
efca6fb463
|
Fixed broken links in doc/README.md
|
2015-09-12 00:14:48 -07:00 |
|
Corey Hulen
|
3b4002bc14
|
Merge pull request #656 from lfbrock/patch-7
Updated developer install instructions
|
2015-09-11 16:48:57 -07:00 |
|
Corey Hulen
|
1ceb6c619a
|
Merge pull request #654 from hmhealey/plt198
PLT-198 Fix unit tests on Go 1.5.1
|
2015-09-11 11:44:54 -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 |
|
=Corey Hulen
|
e5e88d1604
|
Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN
|
2015-09-11 09:39:28 -07:00 |
|
lfbrock
|
ab6196b158
|
Updated developer install instructions
|
2015-09-11 12:38:10 -04:00 |
|
=Corey Hulen
|
9a9f2808d6
|
Fixing help text based on feedback
|
2015-09-11 09:09:05 -07:00 |
|
Harrison Healey
|
d88b745eec
|
Merge pull request #651 from mattermost/plt-207
PLT-207 Fix load more posts bug.
|
2015-09-11 11:47:45 -04:00 |
|
Joram Wilander
|
2709b5f847
|
Merge pull request #653 from lfbrock/patch-6
Updated developer install instructions
|
2015-09-11 11:24:41 -04:00 |
|
hmhealey
|
3edb4247e9
|
PLT-198 Added a small delay to one of the web tests to allow the server to get fully set up
|
2015-09-11 10:44:17 -04:00 |
|
hmhealey
|
9b22cf31f1
|
PLT-198 Removes invalid emails from tests that require valid email addresses
|
2015-09-11 10:44:12 -04:00 |
|
lfbrock
|
bda09c0030
|
Updated developer install instructions
|
2015-09-11 09:35:05 -04:00 |
|
JoramWilander
|
83931da9f2
|
Fix load more posts bug.
|
2015-09-11 08:38:18 -04:00 |
|
Joram Wilander
|
27e8b28672
|
Merge pull request #649 from asaadmahmoodspin/master
Updating UI for modals and notification bar
|
2015-09-11 07:43:10 -04:00 |
|
Asaad Mahmood
|
ae8e9c3dfd
|
Updating UI for modals and notification bar
|
2015-09-11 11:41:16 +05:00 |
|
Joram Wilander
|
d2c82dd191
|
Merge pull request #645 from mattermost/it33-patch-1
Update README.md
|
2015-09-10 19:24:21 -04: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
|
1108ac5306
|
Fixing unit test
|
2015-09-10 15:10:57 -07:00 |
|
=Corey Hulen
|
6c23d67db6
|
re-enabling system_admin
|
2015-09-10 15:06:55 -07:00 |
|
=Corey Hulen
|
616593f434
|
Adding back admin unit test
|
2015-09-10 15:05:19 -07:00 |
|