summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| | | |
| * | | Ui ImprovementsAsaad Mahmood2016-02-234-16/+12
| | | |
* | | | Merge pull request #2229 from mattermost/plt-1770Harrison Healey2016-02-2320-328/+253
|\ \ \ \ | |_|/ / |/| | | PLT-1770 Refactor store listeners out of highly used components
| * | | Refactor listener out of user profile and fix thread logicJoramWilander2016-02-2318-270/+218
| | | |
| * | | Move post_body profile change listener into posts viewJoramWilander2016-02-224-21/+28
| | | |
| * | | Refactor user store listener out of channel headerJoramWilander2016-02-223-53/+23
| | | |
* | | | Merge pull request #2230 from mattermost/plt-1466Christopher Speller2016-02-231-0/+1
|\ \ \ \ | | | | | | | | | | PLT-1466 Add no-referrer meta tag to head.html
| * | | | Add no-referrer meta tag to head.htmlJoramWilander2016-02-231-0/+1
| | | | |
* | | | | Merge pull request #2227 from mattermost/fix-apkHarrison Healey2016-02-231-3/+4
|\ \ \ \ \ | |/ / / / |/| | | | Fixing download of apk file
| * | | | Fixing download of apk file=Corey Hulen2016-02-231-3/+4
|/ / / /
* | | | Merge pull request #2224 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-02-231-1/+20
|\ \ \ \ | | |/ / | |/| | UI improvements
| * | | UI improvementsAsaad Mahmood2016-02-231-1/+20
| | | |
* | | | Merge pull request #2216 from mattermost/fix-cmdsJoram Wilander2016-02-231-16/+13
|\ \ \ \ | | | | | | | | | | Fixing localization error in commands
| * | | | Fixing localization error in commandsChristopher Speller2016-02-221-16/+13
| | | | |
* | | | | Merge pull request #2217 from mattermost/fix-droidJoram Wilander2016-02-236-18/+179
|\ \ \ \ \ | |_|/ / / |/| | | | Fixing device id column for droid
| * | | | Fixing postgres=Corey Hulen2016-02-222-3/+3
| | | | |
| * | | | Fixing device id column for droid=Corey Hulen2016-02-226-18/+179
| | |/ / | |/| |
* | | | Merge pull request #2223 from ZBoxApp/fix-locsChristopher Speller2016-02-237-905/+904
|\ \ \ \ | | | | | | | | | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067
| * | | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067Elias Nahum2016-02-237-905/+904
| | | | | | | | | | | | | | | | | | | | | | | | | - Missing locs on server - Fix spanish locs
* | | | | Merge pull request #2214 from hmhealey/plt1422Corey Hulen2016-02-221-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | PLT-1422 Fixed Makefile to properly kill watchify on stop-client
| * | | | Fixed Makefile to properly kill watchify on stop-clienthmhealey2016-02-221-1/+6
| | | | |
* | | | | Merge pull request #2213 from hmhealey/psChristopher Speller2016-02-225-141/+91
|\ \ \ \ \ | | |_|_|/ | |/| | | Updated perfect-scrollbar to 0.6.10
| * | | | Updated perfect-scrollbar to 0.6.10hmhealey2016-02-225-141/+91
| | |/ / | |/| |
* | | | Merge pull request #2210 from hmhealey/plt1258Christopher Speller2016-02-224-159/+207
|\ \ \ \ | |_|/ / |/| | | PLT-1258 Ported RenameChannelModal to React-Bootstrap
| * | | Ported RenameChannelModal to React-Bootstraphmhealey2016-02-224-159/+207
|/ / /
* | | Merge pull request #2211 from mattermost/asaadmahmoodspin-ui-improvementsChristopher Speller2016-02-2213-7/+26
|\ \ \ | |/ / |/| | Adding back button for login pages
| * | Localizing back button=Corey Hulen2016-02-2211-9/+14
| | |
| * | Merge branch 'ui-improvements' of ↵=Corey Hulen2016-02-2211-7/+21
| |\ \ | | |/ | |/| | | | https://github.com/asaadmahmoodspin/platform into asaadmahmoodspin-ui-improvements
| | * Fixing link on find_teamAsaad Mahmood2016-02-111-1/+1
| | |
| | * Adding back button for login pagesAsaad Mahmood2016-02-1111-7/+21
| | |
* | | Merge pull request #2208 from mattermost/client-upgradesHarrison Healey2016-02-2290-406/+449
|\ \ \ | |/ / |/| | Updating some client deps + eslint
| * | Updating some client deps + eslintChristopher Speller2016-02-2290-406/+449
| | |
* | | Merge pull request #2204 from kernicPanel/PLT-1880Joram Wilander2016-02-224-9/+9
|\ \ \ | |/ / |/| | PLT-1800 Replace webhooks documentation URL
| * | PLT-1800 Replace webhooks documentation URLNicolas Clerc2016-02-214-9/+9
| | |
* | | Merge pull request #2199 from rgarmsen2295/plt-1688Christopher Speller2016-02-221-1/+1
|\ \ \ | | | | | | | | PLT-1688 Fixed issue with corrupted custom mentions on username change
| * | | Fixed issue with corrupted custom mentions on username changeReed Garmsen2016-02-191-1/+1
| | | |