Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2261 from daizenberg/PLT-867 | Christopher Speller | 2016-03-01 | 1 | -5/+12 |
|\ | | | | | PLT-867: Removed member cnt icon in Direct channels | ||||
| * | minor optimization; following jwilander's recommendation | Dmitri Aizenberg | 2016-02-26 | 1 | -3/+3 |
| | | |||||
| * | fixed | Dmitri Aizenberg | 2016-02-25 | 1 | -5/+12 |
| | | |||||
* | | Merge pull request #2283 from ZBoxApp/fix-es | Corey Hulen | 2016-02-29 | 2 | -6/+9 |
|\ \ | | | | | | | Change Frontend 'es' strings to match 'en' | ||||
| * | | Fix typo | Elias Nahum | 2016-02-29 | 1 | -2/+2 |
| | | | |||||
| * | | Change Frontend 'es' strings to match 'en' | Elias Nahum | 2016-02-29 | 1 | -4/+7 |
|/ / | |||||
* | | Merge pull request #2267 from mattermost/esethna-patch-1 | Joram Wilander | 2016-02-29 | 6 | -13/+7 |
|\ \ | | | | | | | Update user settings integrations help text | ||||
| * | | Removing updated entries in pt.json for integrations help text | Eric Sethna | 2016-02-26 | 1 | -4/+1 |
| | | | |||||
| * | | Removing updated entries in es.json for integrations help text | Eric Sethna | 2016-02-26 | 1 | -3/+0 |
| | | | |||||
| * | | Update integrations help text in en.json | Eric Sethna | 2016-02-26 | 1 | -3/+3 |
| | | | |||||
| * | | Update manage_command_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | Update manage_outgoing_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | Update manage_incoming_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2282 from mattermost/fix-test | Corey Hulen | 2016-02-28 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fixing load test | ||||
| * | | | Fixing load test | =Corey Hulen | 2016-02-28 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #2281 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-28 | 1 | -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 LHS | Asaad Mahmood | 2016-02-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2269 from mattermost/esethna-patch-3 | Corey Hulen | 2016-02-28 | 5 | -22/+19 |
|\ \ \ \ | |/ / / |/| | | | Break up emoticon tests so each post is <4000 characters | ||||
| * | | | Create test-emoticons4.md | Eric Sethna | 2016-02-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Create test-emoticons3.md | Eric Sethna | 2016-02-26 | 1 | -0/+3 |
| | | | | |||||
| * | | | Create test-emoticons2.md | Eric Sethna | 2016-02-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Update and rename test-emoticons.md to test-emoticons1.md | Eric Sethna | 2016-02-26 | 2 | -22/+12 |
|/ / / | |||||
* | | | Separated dev guide and API guide links | it33 | 2016-02-26 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #2266 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-26 | 3 | -31/+29 |
|\ \ \ | |/ / |/| | | PLT-2151 - Fixing tutorial for other language | ||||
| * | | UI improvements | Asaad Mahmood | 2016-02-26 | 3 | -31/+29 |
|/ / | |||||
* | | Merge pull request #2265 from mattermost/preview-loc-fix | Corey Hulen | 2016-02-26 | 1 | -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 ↵ | JoramWilander | 2016-02-26 | 1 | -2/+6 |
| | | | | | | | | | | | | defaut messsage | ||||
* | | | Merge pull request #2257 from mattermost/rhs-profile-fix | Christopher Speller | 2016-02-26 | 9 | -68/+66 |
|\ \ \ | | | | | | | | | Final fixes for user store changes | ||||
| * | | | Update search results profiles properly on refresh and handle scrollHeight error | JoramWilander | 2016-02-25 | 2 | -4/+18 |
| | | | | |||||
| * | | | Remove unused import | JoramWilander | 2016-02-25 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fix replying from search result | JoramWilander | 2016-02-25 | 1 | -1/+8 |
| | | | | |||||
| * | | | Fix dismissing deleted root post that had comments on it | JoramWilander | 2016-02-25 | 1 | -0/+14 |
| | | | | |||||
| * | | | Fix deleting threads | JoramWilander | 2016-02-25 | 2 | -47/+12 |
| | | | | |||||
| * | | | Move post view container user store listener into center panel and pass ↵ | JoramWilander | 2016-02-25 | 3 | -14/+13 |
| | | | | | | | | | | | | | | | | profiles into post focus view | ||||
| * | | | Another fix for RHS thread profiles | JoramWilander | 2016-02-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2264 from ZBoxApp/PLT-1751-es | Corey Hulen | 2016-02-26 | 2 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | embed_toggle in spanish | ||||
| * | | | embed_toggle in spanish | Elias Nahum | 2016-02-26 | 2 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #2263 from rodrigocorsi2/pt-translation | Christopher Speller | 2016-02-26 | 4 | -0/+4861 |
|\ \ \ \ | |/ / / |/| | | | Added files and changes to portuguese(beta) translation | ||||
| * | | | Added files and changes to portuguese(beta) translation | Rodrigo Corsi | 2016-02-26 | 4 | -0/+4861 |
| | | | | |||||
* | | | | Merge pull request #2027 from mozilla/PLT-1751 | Joram Wilander | 2016-02-26 | 4 | -7/+81 |
|\ \ \ \ | |/ / / |/| | | | PLT-1751: Add the ability to collapse a link preview | ||||
| * | | | Add ability to toggle embed visibility | Alan Mooiman | 2016-02-25 | 4 | -7/+81 |
| | |/ | |/| | |||||
* | | | Merge pull request #2260 from ZBoxApp/front-loc | Corey Hulen | 2016-02-25 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Update spanish sessionsDescription | ||||
| * | | Update spanish sessionsDescription | Elias Nahum | 2016-02-25 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2254 from hmhealey/plt2127 | Christopher Speller | 2016-02-25 | 1 | -4/+0 |
|\ \ | | | | | | | PLT-2127 Stopped setting Notification.permission | ||||
| * | | Stopped setting Notification.permission | hmhealey | 2016-02-25 | 1 | -4/+0 |
| | | | |||||
* | | | 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" |