Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed sendNotificationsAndForget to be synchronous and called as a go func | hmhealey | 2016-02-04 | 1 | -228/+225 |
| | |||||
* | Added helper methods to send ephemeral messages to specific users | hmhealey | 2016-02-04 | 3 | -21/+54 |
| | |||||
* | Changed how posts are marked ephemeral | hmhealey | 2016-02-04 | 6 | -15/+17 |
| | |||||
* | Reworked the code for sending notifications and checking for out of channel ↵ | hmhealey | 2016-02-04 | 4 | -280/+278 |
| | | | | mentions to share some data | ||||
* | Changed PostStore to not clear a deleted post's message | hmhealey | 2016-02-04 | 5 | -22/+27 |
| | |||||
* | Changed out of channel mention tests to use proper email addresses | hmhealey | 2016-02-04 | 1 | -6/+7 |
| | |||||
* | Removed untranslated phrases from es.json | hmhealey | 2016-02-04 | 1 | -12/+0 |
| | |||||
* | Added ephemeral messages sent when a user mentions someone not in the channel | hmhealey | 2016-02-04 | 8 | -13/+72 |
| | |||||
* | Changed deleted posts to be more general ephemeral posts | hmhealey | 2016-02-04 | 6 | -72/+64 |
| | |||||
* | Added serverside check for a post that @mentions someone who isn't in the ↵ | hmhealey | 2016-02-04 | 4 | -0/+145 |
| | | | | channel | ||||
* | 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 |
| | | |||||
* | | Merge pull request #2069 from hmhealey/localization | Corey Hulen | 2016-02-04 | 1 | -3/+3 |
|\ \ | |/ |/| | Fixed localization issues in file_upload.jsx | ||||
| * | Fixed localization issues in file_upload.jsx | hmhealey | 2016-02-04 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #2059 from mattermost/plt-1732 | Harrison Healey | 2016-02-04 | 4 | -6/+26 |
|\ | | | | | PLT-1732 Update user email when switching to SSO | ||||
| * | Fix auth data unit test | JoramWilander | 2016-02-03 | 1 | -1/+1 |
| | | |||||
| * | Update user email when switching to SSO | JoramWilander | 2016-02-03 | 3 | -5/+25 |
| | | |||||
* | | 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 | 27 | -269/+797 |
|\ \ \ | | | | | | | | | PLT-7: Refactoring frontend (chunk 11) | ||||
| * | | | Fix socketError message in spanish | Elias Nahum | 2016-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix config.json | Elias Nahum | 2016-02-03 | 1 | -26/+1 |
| | | | | |||||
| * | | | Add missing translations | Elias Nahum | 2016-02-03 | 3 | -99/+118 |
| | | | | |||||
| * | | | Messages for SocketStore and small fixes | Elias Nahum | 2016-02-03 | 9 | -44/+122 |
| | | | | |||||
| * | | | PLT-7: Refactoring frontend (chunk 11) | Elias Nahum | 2016-02-03 | 20 | -127/+583 |
| | |/ | |/| | | | | | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body | ||||
* | | | Update CONTRIBUTING.md | it33 | 2016-02-03 | 1 | -60/+1 |
| |/ |/| | |||||
* | | Merge pull request #2061 from mattermost/plt-1817 | Corey Hulen | 2016-02-03 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1817 Fix katex sanitization | ||||
| * | | Fix katex sanitization | JoramWilander | 2016-02-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2057 from khoa-le/PLT-1673 | Harrison Healey | 2016-02-03 | 1 | -2/+2 |
|\ \ | |/ |/| | PLT-1673: Make hashtag searching independent of case | ||||
| * | Make hashtag searching independent of case | Khoa, Le Ngoc | 2016-02-03 | 1 | -2/+2 |
| | | |||||
* | | 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 | 15 | -587/+908 |
|\ \ | | | | | | | 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 | 15 | -588/+909 |
| | | | |||||
* | | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 16 | -95/+630 |
|\ \ \ | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE | ||||
| * | | | Remove missing ES translations | JoramWilander | 2016-02-02 | 2 | -15/+0 |
| | | | | |||||
| * | | | Added extra system-wide statistics for EE | JoramWilander | 2016-02-02 | 17 | -95/+645 |
| |/ / | |||||
* | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modals | Joram Wilander | 2016-02-03 | 22 | -153/+887 |
|\ \ \ | | | | | | | | | PLT-7: Refactoring frontend (chunk 10) | ||||
| * | | | PLT-7: Refactoring frontend (chunk 10) | Elias Nahum | 2016-02-02 | 22 | -153/+887 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE | ||||
* | | | | Merge pull request #2048 from rgarmsen2295/plt-1317 | Joram Wilander | 2016-02-03 | 6 | -28/+31 |
|\ \ \ \ | | | | | | | | | | | PLT-1317 Replaces the clock icon for same user posts with a simple timestamp | ||||
| * | | | | Changed clock icon in repeat posts to simple timestamp | Reed Garmsen | 2016-02-02 | 6 | -24/+31 |
| | | | | | |||||
| * | | | | Removed css clock from sub-posts | Reed Garmsen | 2016-02-02 | 1 | -4/+0 |
| |/ / / | |||||
* | | | | Merge pull request #2047 from hmhealey/helpurl | Joram Wilander | 2016-02-03 | 1 | -8/+2 |
|\ \ \ \ | | | | | | | | | | | Updated post help link | ||||
| * | | | | Updated post help link | hmhealey | 2016-02-02 | 1 | -8/+2 |
| |/ / / |