Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | New localizations | Elias Nahum | 2016-02-04 | 4 | -100/+133 | |
|/ / / | ||||||
* | | | Merge pull request #2079 from mattermost/help-text-updates | Corey Hulen | 2016-02-04 | 3 | -8/+8 | |
|\ \ \ | | | | | | | | | Changing URL for testing push notifications | |||||
| * | | | Update en.json | it33 | 2016-02-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update es.json | it33 | 2016-02-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update en.json | it33 | 2016-02-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update es.json | it33 | 2016-02-04 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Update en.json | it33 | 2016-02-04 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2076 from ZBoxApp/loc-fix | Corey Hulen | 2016-02-04 | 4 | -42/+114 | |
|\ \ \ \ | | | | | | | | | | | PLT-7: Fix and Add new loc strings | |||||
| * | | | | fix typos | Elias Nahum | 2016-02-04 | 2 | -4/+4 | |
| | | | | | ||||||
| * | | | | revert config.json | Elias Nahum | 2016-02-04 | 1 | -32/+7 | |
| | | | | | ||||||
| * | | | | PLT-7: Fix and Add new loc strings | Elias Nahum | 2016-02-04 | 5 | -48/+145 | |
| |/ / / | ||||||
* | | | | Merge pull request #2075 from mattermost/PLT-1851 | Corey Hulen | 2016-02-04 | 1 | -7/+16 | |
|\ \ \ \ | | | | | | | | | | | PLT-1851 reconnect and get missing messages | |||||
| * | | | | PLT-1851 fixing websocket reconnect error | =Corey Hulen | 2016-02-04 | 1 | -6/+12 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into PLT-1851 | =Corey Hulen | 2016-02-04 | 54 | -1005/+3728 | |
| |\| | | | ||||||
| * | | | | PLT-1851 reconnect and get missing messages | =Corey Hulen | 2016-02-03 | 1 | -1/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #2071 from hmhealey/plt1820 | Corey Hulen | 2016-02-04 | 4 | -41/+36 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1820/PLT-1847 Cleaned up textbox focus code | |||||
| * | | | | | Added focus to the sidebar textbox when it is opened | hmhealey | 2016-02-04 | 1 | -0/+6 | |
| | | | | | | ||||||
| * | | | | | Added code to refocus on the post/comment textbox after a file is drag and ↵ | hmhealey | 2016-02-04 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | dropped | |||||
| * | | | | | Updated RHS textbox to refocus after clicking to upload a file | hmhealey | 2016-02-04 | 1 | -0/+5 | |
| | | | | | | ||||||
| * | | | | | Cleaned up textbox focus code | hmhealey | 2016-02-04 | 3 | -42/+18 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2073 from mattermost/ee-updates | Corey Hulen | 2016-02-04 | 21 | -440/+685 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Some general updates to EE | |||||
| * | | | | Move license storage to database | JoramWilander | 2016-02-04 | 14 | -53/+284 | |
| | | | | | ||||||
| * | | | | Turn failed audit descriptions red | JoramWilander | 2016-02-04 | 1 | -1/+6 | |
| | | | | | ||||||
| * | | | | Convert audit_table to a proper table | JoramWilander | 2016-02-04 | 4 | -385/+375 | |
| | | | | | ||||||
| * | | | | Rename audits tab | JoramWilander | 2016-02-04 | 3 | -3/+10 | |
| | | | | | ||||||
| * | | | | Disable remove license button until LDAP is disabled | JoramWilander | 2016-02-04 | 2 | -2/+4 | |
| | | | | | ||||||
| * | | | | Fix license info localization | JoramWilander | 2016-02-04 | 3 | -4/+14 | |
| |/ / / | ||||||
* | | | | Merge pull request #2064 from hmhealey/plt882 | Christopher Speller | 2016-02-04 | 19 | -360/+580 | |
|\ \ \ \ | |/ / / |/| | | | PLT-882 Ephemeral Messages and Out-Of-Channel mentions | |||||
| * | | | 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 #2072 from ZBoxApp/command-loc | Corey Hulen | 2016-02-04 | 2 | -108/+312 | |
|\ \ \ \ | | | | | | | | | | | Add spanish translations for commands | |||||
| * | | | | Add spanish translations for commands | Elias Nahum | 2016-02-04 | 2 | -108/+312 | |
|/ / / / | ||||||
* | | | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 44 | -979/+3453 | |
|\ \ \ \ | | | | | | | | | | | PLT-1429 adding user created slash commands | |||||
| * | | | | PLT-1429 Fixing code review comments | =Corey Hulen | 2016-02-04 | 5 | -8/+6 | |
| | | | | | ||||||
| * | | | | Fixing build | =Corey Hulen | 2016-02-03 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Fixing based on feedback | =Corey Hulen | 2016-02-03 | 2 | -3/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 28 | -329/+798 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 74 | -864/+2922 | |
| |\ \ \ \ | ||||||
| * | | | | | Fixing version | =Corey Hulen | 2016-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fixing console | =Corey Hulen | 2016-02-02 | 2 | -6/+6 | |
| | | | | | |