summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | | | |
* | | | | Adding page to direct users to docs.mattermost.comit332016-02-251-0/+1
|/ / / /
* | | | Merge pull request #2252 from hmhealey/plt2129Corey Hulen2016-02-251-0/+6
|\ \ \ \ | |_|_|/ |/| | | PLT-2129 Ignored posts deleted from channels that we haven't visited
| * | | Ignored posts deleted from channels that we haven't visitedhmhealey2016-02-251-0/+6
|/ / /
* | | Merge pull request #2245 from mattermost/esethna-patch-1Joram Wilander2016-02-253-3/+2
|\ \ \ | |_|/ |/| | Update activity_log_modal.jsx help text to remove hard coded session length
| * | Update es.jsonEric Sethna2016-02-241-1/+0
| | |
| * | Update sessionsDescriptionEric Sethna2016-02-241-1/+1
| | |
| * | Update activity_log_modal.jsxEric Sethna2016-02-241-1/+1
|/ /
* | Merge pull request #2242 from mattermost/profiles-fixJoram Wilander2016-02-242-2/+2
|\ \ | | | | | | Fix RHS usernames and intro message usernames
| * | Fix RHS usernames and intro message usernamesJoramWilander2016-02-242-2/+2
| | |
* | | Merge pull request #2241 from mattermost/GIT-2238Christopher Speller2016-02-241-1/+1
|\ \ \ | |/ / |/| | Fixing github issue 2238 panic because it cannot print localized message
| * | Fixing github issue 2238 panic because it cannot print localized message=Corey Hulen2016-02-241-1/+1
|/ /
* | Merge pull request #2240 from mattermost/plt-1707-fixHarrison Healey2016-02-243-3/+3
|\ \ | | | | | | PLT-1707 Remove duplicate text
| * | Remove duplicate textJoramWilander2016-02-243-3/+3
| | |
* | | Merge pull request #2232 from mattermost/update-golang-depsJoram Wilander2016-02-24153-109304/+715
|\ \ \ | | | | | | | | Updating golang dependancies (godep)
| * | | Running save instead of updateChristopher Speller2016-02-245-510/+42
| | | |
| * | | Updating golang dependancies (godep)Christopher Speller2016-02-23148-108794/+673
| | | |
* | | | Merge pull request #2234 from hmhealey/plt1669Joram Wilander2016-02-241-1/+1
|\ \ \ \ | | | | | | | | | | PLT-1669 Slightly increase requirements for a valid email on the client
| * | | | Requires emails to contain at least 1 character before and after the @ signhmhealey2016-02-231-1/+1
| | | | |
* | | | | Merge pull request #2235 from ZBoxApp/missing-locsJoram Wilander2016-02-242-20/+32
|\ \ \ \ \ | | | | | | | | | | | | Add missing platform locs to spanish
| * | | | | Add missing platform locs to spanishElias Nahum2016-02-232-20/+32
| |/ / / /
* | | | | Merge pull request #2233 from hmhealey/plt2010Christopher Speller2016-02-243-167/+154
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-2010/PLT-2071 Refactored Post Embed Components
| * | | | Removed unnecessary state from PostBodyAdditionalContenthmhealey2016-02-231-23/+3
| | | | |
| * | | | Improved handling when an embedded image cannot be loadedhmhealey2016-02-231-7/+26
| | | | |
| * | | | Refactored embedded image/video code and prevented them from being displayed ↵hmhealey2016-02-233-167/+155
| |/ / / | | | | | | | | | | | | on deleted posts
* | | | Merge pull request #2239 from mattermost/rhs-fixChristopher Speller2016-02-244-6/+19
|\ \ \ \ | |/ / / |/| | | Fix profiles issue with RHS
| * | | Fix profiles issue with RHSJoramWilander2016-02-244-6/+19
|/ / /
* | | Merge pull request #2215 from hmhealey/plt1678Corey Hulen2016-02-232-43/+22
|\ \ \ | | | | | | | | PLT-1678 Refactored how links are extracted to remove code blocks and markdown images
| * | | Refactored how links are extracted to remove code blocks and markdown imageshmhealey2016-02-232-43/+22
| | | |
* | | | Merge pull request #2231 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-02-235-16/+15
|\ \ \ \ | |/ / / |/| | | Ui Improvements
| * | | Also fixing long text issue in account settings modal sidebarAsaad Mahmood2016-02-231-0/+3
| | | |