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

1352 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
1ec597df59 Merge pull request #291 from mattermost/mm-1758
MM-1758 partially fixed postgres search so that multiple search terms work
2015-08-02 08:59:27 -08:00
Corey Hulen
1f417368ad Merge pull request #276 from mattermost/mm-1688
MM-1688 reset number of posts to fetch on channel switch and fresh page load
2015-08-02 08:59:07 -08:00
Corey Hulen
41f96636d6 Merge pull request #274 from mattermost/mm-1497
MM-1497 image thumbnails now scale appropriately so there is no whitespace
2015-08-02 08:58:33 -08:00
Joram Wilander
810c527fcb Merge pull request #313 from mattermost/it33-patch-3
Update to give credit to MongoDB on licensing
2015-08-01 18:12:09 -04:00
it33
d39e10c16b Update to give credit to MongoDB on licensing 2015-07-31 21:49:10 -07:00
Joram Wilander
7f1dd85255 Merge pull request #298 from mattermost/mm-1789
MM-1789 update readme with basic config settings setup information
2015-07-31 13:23:49 -04:00
JoramWilander
70669c5110 replaced 'fiddle' with 'adjust' to be more clear 2015-07-31 13:22:32 -04:00
Christopher Speller
b1cc1ef0bc Merge pull request #299 from nickago/MM-1734
MM-1734 Changed language in error message and did cosmetic refactoring
2015-07-31 12:08:42 -04:00
Christopher Speller
ec6d408e29 Merge pull request #303 from nickago/MM-1642
MM-1642 Updated the password error
2015-07-31 11:39:00 -04:00
Christopher Speller
6819f85a22 Merge pull request #306 from nickago/MM-1660
MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring
2015-07-31 11:38:30 -04:00
nickago
f7e5ac1db0 Added singlequotes around 'Edit' and did cosmetic refactoring 2015-07-31 08:09:36 -07:00
nickago
4f235669e7 Updated actual text of error message 2015-07-31 08:07:11 -07:00
Joram Wilander
144caab578 Merge pull request #307 from mattermost/revert-304-mm1706
Revert "MM-1706 Changed mention highlighting code to split words on a…
2015-07-31 10:04:24 -04:00
Joram Wilander
56724980f8 Revert "MM-1706 Changed mention highlighting code to split words on all non-word characters" 2015-07-31 10:02:21 -04:00
JoramWilander
dad7851423 center small thumbnails and top left larger thumbnails 2015-07-31 09:52:18 -04:00
JoramWilander
8542fbd1ac removed uneccessary utils loadThumbnails function 2015-07-31 09:39:53 -04:00
JoramWilander
36748f523a updated docker config thumbnail width/height 2015-07-31 09:37:36 -04:00
JoramWilander
a541f09380 image thumbnails now scale appropriately so there is no whitespace, also generalized some thumbnail loading code 2015-07-31 09:36:45 -04:00
Joram Wilander
d0865b78b7 Merge pull request #271 from hmhealey/mm1656
MM-1656 Updated file UI
2015-07-31 09:16:07 -04:00
Joram Wilander
c85a852146 Merge pull request #304 from hmhealey/mm1706
MM-1706 Changed mention highlighting code to split words on all non-word characters
2015-07-31 09:06:23 -04:00
Christopher Speller
7b968a7572 Merge pull request #293 from rgarmsen2295/mm-1725
MM-1725 Added text to inform the user a session id is not available for a login attempt
2015-07-31 08:57:51 -04:00
Christopher Speller
b7869cdb3c Merge pull request #283 from mattermost/mm-1787
MM-1787 Fixing links for signup from team invite link.
2015-07-31 08:56:24 -04:00
Joram Wilander
0ecc1dba81 Merge pull request #294 from asaadmahmoodspin/master
Improving smoothness of RHS search
2015-07-31 08:50:05 -04:00
Asaad Mahmood
eae619e170 MM-1473 - Updating text for close buttons 2015-07-31 15:59:37 +05:00
Asaad Mahmood
ad0231f275 Merge branch 'master' of https://github.com/mattermost/platform 2015-07-31 15:59:11 +05:00
Reed Garmsen
aaad5add26 Added text to inform the user a session id is not available for a login attempt (no session created yet) 2015-07-30 15:03:28 -07:00
hmhealey
2e6c41f7d7 Changed mention highlighting code to split words on all non-word characters 2015-07-30 17:01:07 -04:00
nickago
a41c42c4d4 Updated error message for an incorrect password 2015-07-30 13:54:00 -07:00
Christopher Speller
9cc369b6b6 Removing nickname parameter from FireAndForgetVerifyEmail 2015-07-30 13:42:27 -04:00
Joram Wilander
8265e5ed82 Merge pull request #292 from mattermost/mm-1782
MM-1782 makes the LHS dropdown close when clicking on the LHS header
2015-07-30 13:01:38 -04:00
JoramWilander
b1993dc02c update readme with basic config settings setup information 2015-07-30 12:59:29 -04:00
nickago
cd2e035b25 Changed language in error message to reflect better English and did cosmetic refactoring 2015-07-30 09:57:02 -07:00
JoramWilander
4b531ef8c4 added .off() for dropdown hide event on LHS header 2015-07-30 12:11:01 -04:00
Joram Wilander
c09beaa655 Merge pull request #295 from mattermost/it33-patch-2
Removing unnecessary "the"
2015-07-30 11:41:10 -04:00
it33
3f781fdaf9 Removing unnecessary "the" 2015-07-30 08:36:13 -07:00
Joram Wilander
9105b02cc4 Merge pull request #285 from hmhealey/mm1738
MM-1787 Fixed team API to properly provide team names for the Find My Team email
2015-07-30 11:31:51 -04:00
Asaad Mahmood
b6018c390f Improving smoothness of RHS search 2015-07-30 20:21:09 +05:00
JoramWilander
e5c79cd193 makes the LHS dropdown close when clicking on the LHS header 2015-07-30 10:54:41 -04:00
JoramWilander
bcee238666 partially fixed postgres search so that multiple search terms work 2015-07-30 09:55:03 -04:00
Joram Wilander
e699acb808 Merge pull request #284 from nickago/MM-1768
MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring
2015-07-30 08:58:56 -04:00
Christopher Speller
6222d2cb30 Fixing links for signup from team invite link. Enter now advances signup_user_complete screen. Signin now link now redirects properly. 2015-07-30 08:53:20 -04:00
Christopher Speller
51e244ab5a Merge pull request #282 from nickago/MM-1642
MM-1642 Updated the password error message to not contain extraneous information
2015-07-30 08:51:00 -04:00
Christopher Speller
4646c22ef1 Merge pull request #281 from nickago/MM-1600
MM-1600 Improve quality of error returned upon a duplicate username request
2015-07-30 08:49:36 -04:00
Christopher Speller
b2b6bddadc Merge pull request #272 from rgarmsen2295/mm-1463
MM-1463 Adds back username initials being included in user's default profile picture
2015-07-30 08:34:37 -04:00
JoramWilander
0c627913f7 removed ternary operator to make if statement clearer 2015-07-30 08:33:52 -04:00
Corey Hulen
659bd97b63 Merge pull request #289 from mattermost/it33-patch-4
MM-1816 Make Off-Topic description more clear
2015-07-30 01:17:53 -08:00
Corey Hulen
eaa59d54b3 Merge pull request #288 from mattermost/it33-patch-3
Corrected "lower case" to "lowercase"
2015-07-30 01:17:43 -08:00
Corey Hulen
b97329cd0a Merge pull request #287 from mattermost/it33-patch-2
Correcting proper use of "set up" vs. "setup"
2015-07-30 01:17:34 -08:00
Corey Hulen
a1e53c64f6 Merge pull request #280 from mattermost/mm-1746
MM-1746 channel handle now populates properly on opening of channel rename modal
2015-07-30 01:10:43 -08:00
Corey Hulen
deb4fac1f6 Merge pull request #290 from mattermost/mm-1564
Fixes mm-1564 adds release to travis and git
2015-07-30 00:17:19 -08:00