summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typoElias Nahum2016-02-291-2/+2
|
* Change Frontend 'es' strings to match 'en'Elias Nahum2016-02-291-4/+7
|
* Merge pull request #2267 from mattermost/esethna-patch-1Joram Wilander2016-02-296-13/+7
|\ | | | | Update user settings integrations help text
| * Removing updated entries in pt.json for integrations help textEric Sethna2016-02-261-4/+1
| |
| * Removing updated entries in es.json for integrations help textEric Sethna2016-02-261-3/+0
| |
| * Update integrations help text in en.jsonEric Sethna2016-02-261-3/+3
| |
| * Update manage_command_hooks.jsxEric Sethna2016-02-261-1/+1
| |
| * Update manage_outgoing_hooks.jsxEric Sethna2016-02-261-1/+1
| |
| * Update manage_incoming_hooks.jsxEric Sethna2016-02-261-1/+1
| |
* | Merge pull request #2282 from mattermost/fix-testCorey Hulen2016-02-281-2/+2
|\ \ | | | | | | Fixing load test
| * | Fixing load test=Corey Hulen2016-02-281-2/+2
|/ /
* | Merge pull request #2281 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-281-1/+1
|\ \ | | | | | | Fixing not being able to scroll at the bottom in the LHS
| * | Fixing not being able to scroll at the bottom in the LHSAsaad Mahmood2016-02-281-1/+1
| | |
* | | Merge pull request #2269 from mattermost/esethna-patch-3Corey Hulen2016-02-285-22/+19
|\ \ \ | |/ / |/| | Break up emoticon tests so each post is <4000 characters
| * | Create test-emoticons4.mdEric Sethna2016-02-261-0/+2
| | |
| * | Create test-emoticons3.mdEric Sethna2016-02-261-0/+3
| | |
| * | Create test-emoticons2.mdEric Sethna2016-02-261-0/+2
| | |
| * | Update and rename test-emoticons.md to test-emoticons1.mdEric Sethna2016-02-262-22/+12
|/ /
* | Separated dev guide and API guide linksit332016-02-261-1/+2
| |
* | Merge pull request #2266 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-263-31/+29
|\ \ | |/ |/| PLT-2151 - Fixing tutorial for other language
| * UI improvementsAsaad Mahmood2016-02-263-31/+29
|/
* Merge pull request #2265 from mattermost/preview-loc-fixCorey Hulen2016-02-261-2/+6
|\ | | | | Fix missing preview strings for a language showing up as the id not the defaut messsage
| * Fix missing preview strings for a language showing up as the id not the ↵JoramWilander2016-02-261-2/+6
| | | | | | | | defaut messsage
* | Merge pull request #2257 from mattermost/rhs-profile-fixChristopher Speller2016-02-269-68/+66
|\ \ | | | | | | Final fixes for user store changes
| * | Update search results profiles properly on refresh and handle scrollHeight errorJoramWilander2016-02-252-4/+18
| | |
| * | Remove unused importJoramWilander2016-02-251-1/+0
| | |
| * | Fix replying from search resultJoramWilander2016-02-251-1/+8
| | |
| * | Fix dismissing deleted root post that had comments on itJoramWilander2016-02-251-0/+14
| | |
| * | Fix deleting threadsJoramWilander2016-02-252-47/+12
| | |
| * | Move post view container user store listener into center panel and pass ↵JoramWilander2016-02-253-14/+13
| | | | | | | | | | | | profiles into post focus view
| * | Another fix for RHS thread profilesJoramWilander2016-02-251-1/+1
| | |
* | | Merge pull request #2264 from ZBoxApp/PLT-1751-esCorey Hulen2016-02-262-1/+2
|\ \ \ | |_|/ |/| | embed_toggle in spanish
| * | embed_toggle in spanishElias Nahum2016-02-262-1/+2
| | |
* | | Merge pull request #2263 from rodrigocorsi2/pt-translationChristopher Speller2016-02-264-0/+4861
|\ \ \ | |/ / |/| | Added files and changes to portuguese(beta) translation
| * | Added files and changes to portuguese(beta) translationRodrigo Corsi2016-02-264-0/+4861
| | |
* | | Merge pull request #2027 from mozilla/PLT-1751Joram Wilander2016-02-264-7/+81
|\ \ \ | |/ / |/| | PLT-1751: Add the ability to collapse a link preview
| * | Add ability to toggle embed visibilityAlan Mooiman2016-02-254-7/+81
| | |
* | | Merge pull request #2260 from ZBoxApp/front-locCorey Hulen2016-02-251-0/+1
|\ \ \ | |/ / |/| | Update spanish sessionsDescription
| * | Update spanish sessionsDescriptionElias Nahum2016-02-251-0/+1
|/ /
* | Merge pull request #2254 from hmhealey/plt2127Christopher Speller2016-02-251-4/+0
|\ \ | | | | | | PLT-2127 Stopped setting Notification.permission
| * | Stopped setting Notification.permissionhmhealey2016-02-251-4/+0
| | |
* | | Merge pull request #2250 from ZBoxApp/fix-deactivateChristopher Speller2016-02-256-1/+95
|\ \ \ | | | | | | | | PLT-2123 Member show on Activate and Hide on deactivate from channel member li…
| * | | Fix typoElias Nahum2016-02-251-1/+1
| | | |
| * | | Set Context Error if ExtraUpdateByUser failsElias Nahum2016-02-251-1/+3
| | | |
| * | | Member show on Activate and Hide on deactivate from channel member list and ↵Elias Nahum2016-02-256-1/+93
| | | | | | | | | | | | | | | | at_mention
* | | | Merge pull request #2256 from hmhealey/psCorey Hulen2016-02-255-91/+141
|\ \ \ \ | | | | | | | | | | Revert "Updated perfect-scrollbar to 0.6.10"
| * | | | Revert "Updated perfect-scrollbar to 0.6.10"hmhealey2016-02-255-91/+141
| | | | | | | | | | | | | | | | | | | | This reverts commit bc5f82f624fed139bd757298996189eca19ed1b7.
* | | | | Merge pull request #2255 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-255-12/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | Multiple UI Improvements
| * | | | Adding scrollbar back againAsaad Mahmood2016-02-251-3/+0
| | | | |
| * | | | Multiple UI ImprovementsAsaad Mahmood2016-02-255-9/+6
| | | | |