Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2250 from ZBoxApp/fix-deactivate | Christopher Speller | 2016-02-25 | 6 | -1/+95 |
|\ | | | | | PLT-2123 Member show on Activate and Hide on deactivate from channel member li… | ||||
| * | Fix typo | Elias Nahum | 2016-02-25 | 1 | -1/+1 |
| | | |||||
| * | Set Context Error if ExtraUpdateByUser fails | Elias Nahum | 2016-02-25 | 1 | -1/+3 |
| | | |||||
| * | Member show on Activate and Hide on deactivate from channel member list and ↵ | Elias Nahum | 2016-02-25 | 6 | -1/+93 |
| | | | | | | | | at_mention | ||||
* | | Merge pull request #2256 from hmhealey/ps | Corey Hulen | 2016-02-25 | 5 | -91/+141 |
|\ \ | | | | | | | Revert "Updated perfect-scrollbar to 0.6.10" | ||||
| * | | Revert "Updated perfect-scrollbar to 0.6.10" | hmhealey | 2016-02-25 | 5 | -91/+141 |
| | | | | | | | | | | | | This reverts commit bc5f82f624fed139bd757298996189eca19ed1b7. | ||||
* | | | Merge pull request #2255 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-25 | 5 | -12/+6 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Adding scrollbar back again | Asaad Mahmood | 2016-02-25 | 1 | -3/+0 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-25 | 5 | -9/+6 |
| | | | | |||||
* | | | | Adding page to direct users to docs.mattermost.com | it33 | 2016-02-25 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #2252 from hmhealey/plt2129 | Corey Hulen | 2016-02-25 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | PLT-2129 Ignored posts deleted from channels that we haven't visited | ||||
| * | | | Ignored posts deleted from channels that we haven't visited | hmhealey | 2016-02-25 | 1 | -0/+6 |
|/ / / | |||||
* | | | Merge pull request #2245 from mattermost/esethna-patch-1 | Joram Wilander | 2016-02-25 | 3 | -3/+2 |
|\ \ \ | |_|/ |/| | | Update activity_log_modal.jsx help text to remove hard coded session length | ||||
| * | | Update es.json | Eric Sethna | 2016-02-24 | 1 | -1/+0 |
| | | | |||||
| * | | Update sessionsDescription | Eric Sethna | 2016-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | Update activity_log_modal.jsx | Eric Sethna | 2016-02-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2242 from mattermost/profiles-fix | Joram Wilander | 2016-02-24 | 2 | -2/+2 |
|\ \ | | | | | | | Fix RHS usernames and intro message usernames | ||||
| * | | Fix RHS usernames and intro message usernames | JoramWilander | 2016-02-24 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2241 from mattermost/GIT-2238 | Christopher Speller | 2016-02-24 | 1 | -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 Hulen | 2016-02-24 | 1 | -1/+1 |
|/ / | |||||
* | | 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 |
| | | | |