Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix RHS usernames and intro message usernames | JoramWilander | 2016-02-24 | 2 | -2/+2 |
| | |||||
* | Merge pull request #2240 from mattermost/plt-1707-fix | Harrison Healey | 2016-02-24 | 3 | -3/+3 |
|\ | | | | | PLT-1707 Remove duplicate text | ||||
| * | Remove duplicate text | JoramWilander | 2016-02-24 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #2232 from mattermost/update-golang-deps | Joram Wilander | 2016-02-24 | 153 | -109304/+715 |
|\ \ | | | | | | | Updating golang dependancies (godep) | ||||
| * | | Running save instead of update | Christopher Speller | 2016-02-24 | 5 | -510/+42 |
| | | | |||||
| * | | Updating golang dependancies (godep) | Christopher Speller | 2016-02-23 | 148 | -108794/+673 |
| | | | |||||
* | | | Merge pull request #2234 from hmhealey/plt1669 | Joram Wilander | 2016-02-24 | 1 | -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 @ sign | hmhealey | 2016-02-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2235 from ZBoxApp/missing-locs | Joram Wilander | 2016-02-24 | 2 | -20/+32 |
|\ \ \ \ | | | | | | | | | | | Add missing platform locs to spanish | ||||
| * | | | | Add missing platform locs to spanish | Elias Nahum | 2016-02-23 | 2 | -20/+32 |
| |/ / / | |||||
* | | | | Merge pull request #2233 from hmhealey/plt2010 | Christopher Speller | 2016-02-24 | 3 | -167/+154 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-2010/PLT-2071 Refactored Post Embed Components | ||||
| * | | | Removed unnecessary state from PostBodyAdditionalContent | hmhealey | 2016-02-23 | 1 | -23/+3 |
| | | | | |||||
| * | | | Improved handling when an embedded image cannot be loaded | hmhealey | 2016-02-23 | 1 | -7/+26 |
| | | | | |||||
| * | | | Refactored embedded image/video code and prevented them from being displayed ↵ | hmhealey | 2016-02-23 | 3 | -167/+155 |
| |/ / | | | | | | | | | | on deleted posts | ||||
* | | | Merge pull request #2239 from mattermost/rhs-fix | Christopher Speller | 2016-02-24 | 4 | -6/+19 |
|\ \ \ | |/ / |/| | | Fix profiles issue with RHS | ||||
| * | | Fix profiles issue with RHS | JoramWilander | 2016-02-24 | 4 | -6/+19 |
|/ / | |||||
* | | Merge pull request #2215 from hmhealey/plt1678 | Corey Hulen | 2016-02-23 | 2 | -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 images | hmhealey | 2016-02-23 | 2 | -43/+22 |
| | | | |||||
* | | | Merge pull request #2231 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-02-23 | 5 | -16/+15 |
|\ \ \ | |/ / |/| | | Ui Improvements | ||||
| * | | Also fixing long text issue in account settings modal sidebar | Asaad Mahmood | 2016-02-23 | 1 | -0/+3 |
| | | | |||||
| * | | Ui Improvements | Asaad Mahmood | 2016-02-23 | 4 | -16/+12 |
| | | | |||||
* | | | Merge pull request #2229 from mattermost/plt-1770 | Harrison Healey | 2016-02-23 | 20 | -328/+253 |
|\ \ \ | |_|/ |/| | | PLT-1770 Refactor store listeners out of highly used components | ||||
| * | | Refactor listener out of user profile and fix thread logic | JoramWilander | 2016-02-23 | 18 | -270/+218 |
| | | | |||||
| * | | Move post_body profile change listener into posts view | JoramWilander | 2016-02-22 | 4 | -21/+28 |
| | | | |||||
| * | | Refactor user store listener out of channel header | JoramWilander | 2016-02-22 | 3 | -53/+23 |
| | | | |||||
* | | | Merge pull request #2230 from mattermost/plt-1466 | Christopher Speller | 2016-02-23 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | PLT-1466 Add no-referrer meta tag to head.html | ||||
| * | | | Add no-referrer meta tag to head.html | JoramWilander | 2016-02-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #2227 from mattermost/fix-apk | Harrison Healey | 2016-02-23 | 1 | -3/+4 |
|\ \ \ \ | |/ / / |/| | | | Fixing download of apk file | ||||
| * | | | Fixing download of apk file | =Corey Hulen | 2016-02-23 | 1 | -3/+4 |
|/ / / | |||||
* | | | Merge pull request #2224 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-02-23 | 1 | -1/+20 |
|\ \ \ | | |/ | |/| | UI improvements | ||||
| * | | UI improvements | Asaad Mahmood | 2016-02-23 | 1 | -1/+20 |
| | | | |||||
* | | | Merge pull request #2216 from mattermost/fix-cmds | Joram Wilander | 2016-02-23 | 1 | -16/+13 |
|\ \ \ | | | | | | | | | Fixing localization error in commands | ||||
| * | | | Fixing localization error in commands | Christopher Speller | 2016-02-22 | 1 | -16/+13 |
| | | | | |||||
* | | | | Merge pull request #2217 from mattermost/fix-droid | Joram Wilander | 2016-02-23 | 6 | -18/+179 |
|\ \ \ \ | |_|/ / |/| | | | Fixing device id column for droid | ||||
| * | | | Fixing postgres | =Corey Hulen | 2016-02-22 | 2 | -3/+3 |
| | | | | |||||
| * | | | Fixing device id column for droid | =Corey Hulen | 2016-02-22 | 6 | -18/+179 |
| | |/ | |/| | |||||
* | | | Merge pull request #2223 from ZBoxApp/fix-locs | Christopher Speller | 2016-02-23 | 7 | -905/+904 |
|\ \ \ | | | | | | | | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067 | ||||
| * | | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067 | Elias Nahum | 2016-02-23 | 7 | -905/+904 |
| | | | | | | | | | | | | | | | | | | | | - Missing locs on server - Fix spanish locs | ||||
* | | | | Merge pull request #2214 from hmhealey/plt1422 | Corey Hulen | 2016-02-22 | 1 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | PLT-1422 Fixed Makefile to properly kill watchify on stop-client | ||||
| * | | | Fixed Makefile to properly kill watchify on stop-client | hmhealey | 2016-02-22 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #2213 from hmhealey/ps | Christopher Speller | 2016-02-22 | 5 | -141/+91 |
|\ \ \ \ | | | | | | | | | | | Updated perfect-scrollbar to 0.6.10 | ||||
| * | | | | Updated perfect-scrollbar to 0.6.10 | hmhealey | 2016-02-22 | 5 | -141/+91 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2210 from hmhealey/plt1258 | Christopher Speller | 2016-02-22 | 4 | -159/+207 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1258 Ported RenameChannelModal to React-Bootstrap | ||||
| * | | | Ported RenameChannelModal to React-Bootstrap | hmhealey | 2016-02-22 | 4 | -159/+207 |
|/ / / | |||||
* | | | Merge pull request #2211 from mattermost/asaadmahmoodspin-ui-improvements | Christopher Speller | 2016-02-22 | 13 | -7/+26 |
|\ \ \ | |/ / |/| | | Adding back button for login pages | ||||
| * | | Localizing back button | =Corey Hulen | 2016-02-22 | 11 | -9/+14 |
| | | | |||||
| * | | Merge branch 'ui-improvements' of ↵ | =Corey Hulen | 2016-02-22 | 11 | -7/+21 |
| |\ \ | | |/ | |/| | | | | https://github.com/asaadmahmoodspin/platform into asaadmahmoodspin-ui-improvements | ||||
| | * | Fixing link on find_team | Asaad Mahmood | 2016-02-11 | 1 | -1/+1 |
| | | | |||||
| | * | Adding back button for login pages | Asaad Mahmood | 2016-02-11 | 11 | -7/+21 |
| | | | |||||
* | | | Merge pull request #2208 from mattermost/client-upgrades | Harrison Healey | 2016-02-22 | 90 | -406/+449 |
|\ \ \ | |/ / |/| | | Updating some client deps + eslint |