IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,375 Commits 1,692 Branches 1,583 Tags
66136a557ca3fbef495de6500c09498ce7c8a285
Commit Graph
1375 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
=Corey Hulen 66136a557c incrementing to rc2 2015-08-02 10:43:54 -08:00
Corey Hulen 5fbc912be5 Merge pull request #311 from mattermost/mm-1619 
MM-1619 Updating dockerfiles.
 2015-08-02 09:59:08 -08:00
=Corey Hulen 247708d924 Merge branch 'master' into mm-1619 2015-08-02 09:41:12 -08:00
=Corey Hulen 718d670d69 Fixing upgrade 2015-08-02 09:30:18 -08:00
Corey Hulen 38e44e8f61 Merge pull request #278 from mattermost/mm-1702 
MM-1702 Adding etag to channel extra_info api call.
 2015-08-02 09:17:52 -08:00
Corey Hulen 4d1562c5de Merge pull request #273 from mattermost/mm-1355 
Fixes mm-1355 adds rate limiting apis
 2015-08-02 09:17:37 -08:00
Corey Hulen adc8def9e0 Merge pull request #312 from mattermost/mm-1784 
MM-1784 switching to a new PM channel now works in the more modal
 2015-08-02 09:01:06 -08:00
Corey Hulen faa9bbdf97 Merge pull request #305 from nickago/MM-1681 
MM-1681 Fixed regression of static images not displaying in emails
 2015-08-02 09:00:30 -08:00
Corey Hulen 2aba63df8e Merge pull request #302 from hmhealey/mm1788 
MM-1788 Removed ^replying in preparation for 0.6.0
 2015-08-02 09:00:13 -08:00
Corey Hulen 0b6c6b94cb Merge pull request #301 from lfbrock/patch-1 
MM-1841 Corrected help text
 2015-08-02 09:00:01 -08:00
Corey Hulen f0993ff65f Merge pull request #300 from hmhealey/ubuntudev 
Updated developer setup instructions for Ubuntu
 2015-08-02 08:59:47 -08:00
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
JoramWilander 633c39499b switching to a new PM channel now works in the more modal 2015-07-31 16:09:29 -04:00
Christopher Speller e76fc37b6d Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories. 2015-07-31 15:51:36 -04: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
nickago bc48281f7a Changed all templates to use site url instead of team url for finding the 'static' directory 2015-07-31 07:57:22 -07:00
Harrison Healey 9aebbe058e Updated developer setup instructions to include Ubuntu setup 2015-07-31 10:28:40 -04: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
hmhealey e2d77c28f1 Removed ^replying in preparation for 0.6.0 2015-07-30 15:21:35 -04:00
lfbrock ba06300402 MM-1841 Corrected help text 2015-07-30 14:13:34 -04: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