Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #2064 from hmhealey/plt882 | Christopher Speller | 2016-02-04 | 12 | -96/+115 | |
|\ \ \ \ | |/ / / |/| | | | PLT-882 Ephemeral Messages and Out-Of-Channel mentions | |||||
| * | | | Added helper methods to send ephemeral messages to specific users | hmhealey | 2016-02-04 | 2 | -2/+19 | |
| | | | | ||||||
| * | | | Changed how posts are marked ephemeral | hmhealey | 2016-02-04 | 4 | -6/+9 | |
| | | | | ||||||
| * | | | Changed PostStore to not clear a deleted post's message | hmhealey | 2016-02-04 | 5 | -22/+27 | |
| | | | | ||||||
| * | | | Added ephemeral messages sent when a user mentions someone not in the channel | hmhealey | 2016-02-04 | 2 | -1/+3 | |
| | | | | ||||||
| * | | | Changed deleted posts to be more general ephemeral posts | hmhealey | 2016-02-04 | 6 | -72/+64 | |
| | | | | ||||||
* | | | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 9 | -26/+928 | |
|\ \ \ \ | | | | | | | | | | | PLT-1429 adding user created slash commands | |||||
| * | | | | PLT-1429 Fixing code review comments | =Corey Hulen | 2016-02-04 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 25 | -268/+788 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 52 | -842/+2399 | |
| |\ \ \ \ | ||||||
| * | | | | | Fixing console | =Corey Hulen | 2016-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 3 | -12/+108 | |
| | | | | | | ||||||
| * | | | | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 3 | -51/+302 | |
| | | | | | | ||||||
| * | | | | | Fixing merge | =Corey Hulen | 2016-02-01 | 153 | -1784/+9627 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | merging | =Corey Hulen | 2016-01-25 | 22 | -338/+1085 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | merging | =Corey Hulen | 2016-01-22 | 1694 | -147/+1541284 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | merging | =Corey Hulen | 2016-01-15 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 2 | -68/+308 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 30 | -118/+643 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Adding UI | =Corey Hulen | 2016-01-11 | 2 | -0/+295 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-09 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-08 | 1 | -0/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 3 | -13/+30 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Fixing center channel icon position in IE | Asaad Mahmood | 2016-02-04 | 1 | -0/+1 | |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2068 from hmhealey/plt1767 | Corey Hulen | 2016-02-04 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | PLT-1767 Fixed editing your last comment in the RHS | |||||
| * | | | | | | | | | | Fixed editing your last comment in the RHS | hmhealey | 2016-02-04 | 1 | -3/+2 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Fixed localization issues in file_upload.jsx | hmhealey | 2016-02-04 | 1 | -3/+3 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-02-04 | 5 | -65/+90 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements | |||||
| * | | | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-03 | 5 | -65/+90 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2065 from ZBoxApp/PLT-7-fix | Corey Hulen | 2016-02-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix claim translations | |||||
| * | | | | | | | | | | Fix claim translations | Elias Nahum | 2016-02-03 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2063 from mattermost/fix-loc | Corey Hulen | 2016-02-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Fixing loc error | |||||
| * | | | | | | | | | Fixing loc error | =Corey Hulen | 2016-02-03 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2060 from ZBoxApp/PLT-7-channel | Harrison Healey | 2016-02-03 | 25 | -268/+788 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | PLT-7: Refactoring frontend (chunk 11) | |||||
| * | | | | | | | | Fix socketError message in spanish | Elias Nahum | 2016-02-03 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add missing translations | Elias Nahum | 2016-02-03 | 2 | -99/+110 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Messages for SocketStore and small fixes | Elias Nahum | 2016-02-03 | 8 | -43/+96 | |
| | | | | | | | | | ||||||
| * | | | | | | | | PLT-7: Refactoring frontend (chunk 11) | Elias Nahum | 2016-02-03 | 19 | -126/+582 | |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body | |||||
* / | | | | | | | Fix katex sanitization | JoramWilander | 2016-02-03 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #2055 from khoa-le/PLT-1693 | Christopher Speller | 2016-02-03 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-1693: Clear the password input boxes when user enter incorrect Retype New P… | |||||
| * | | | | | | | Clear the password input boxes when user enter incorrect Retype New Password. | Khoa, Le Ngoc | 2016-02-03 | 1 | -1/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #2054 from khoa-le/PLT-1433 | Christopher Speller | 2016-02-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PLT-1433 OGG files render as audio files with preview | |||||
| * | | | | | | | | OGG files render as audio files with preview | Khoa, Le Ngoc | 2016-02-03 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2049 from mattermost/plt-1856 | Christopher Speller | 2016-02-03 | 10 | -583/+823 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PLT-1856 Add basic server audit tab to system console for EE | |||||
| * | | | | | | | | Add basic server audit tab to system console for EE | JoramWilander | 2016-02-02 | 10 | -584/+824 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 8 | -89/+354 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE | |||||
| * | | | | | | | | Remove missing ES translations | JoramWilander | 2016-02-02 | 1 | -7/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added extra system-wide statistics for EE | JoramWilander | 2016-02-02 | 8 | -89/+361 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modals | Joram Wilander | 2016-02-03 | 20 | -119/+821 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 10) | |||||
| * | | | | | | | | PLT-7: Refactoring frontend (chunk 10) | Elias Nahum | 2016-02-02 | 20 | -119/+821 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE |