Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed CommandProvider to only set the matched pretext if it actually ↵ | hmhealey | 2016-02-05 | 3 | -12/+13 |
| | | | | matches anything | ||||
* | Merge pull request #2077 from hmhealey/plt1819 | Joram Wilander | 2016-02-05 | 1 | -5/+13 |
|\ | | | | | PLT-1819 Changed notification permission dialogue to only be shown once per page load | ||||
| * | Changed notifications to only request permission once per session if the ↵ | hmhealey | 2016-02-04 | 1 | -5/+13 |
| | | | | | | | | user clicks 'Not now' on Firefox | ||||
* | | Merge pull request #2079 from mattermost/help-text-updates | Corey Hulen | 2016-02-04 | 1 | -3/+3 |
|\ \ | | | | | | | Changing URL for testing push notifications | ||||
| * | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -1/+1 |
| | | | |||||
| * | | Update email_settings.jsx | it33 | 2016-02-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2076 from ZBoxApp/loc-fix | Corey Hulen | 2016-02-04 | 2 | -7/+28 |
|\ \ \ | | | | | | | | | PLT-7: Fix and Add new loc strings | ||||
| * | | | fix typos | Elias Nahum | 2016-02-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | PLT-7: Fix and Add new loc strings | Elias Nahum | 2016-02-04 | 2 | -6/+27 |
| |/ / | |||||
* | | | 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 | 11 | -79/+963 |
| |\| | | |||||
| * | | | 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 | 6 | -337/+350 |
|\ \ \ \ | |_|_|/ |/| | | | Some general updates to EE | ||||
| * | | | Move license storage to database | JoramWilander | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Turn failed audit descriptions red | JoramWilander | 2016-02-04 | 1 | -1/+6 |
| | | | | |||||
| * | | | Convert audit_table to a proper table | JoramWilander | 2016-02-04 | 3 | -331/+327 |
| | | | | |||||
| * | | | Rename audits tab | JoramWilander | 2016-02-04 | 2 | -2/+2 |
| | | | | |||||
| * | | | Disable remove license button until LDAP is disabled | JoramWilander | 2016-02-04 | 2 | -2/+4 |
| | | | | |||||
| * | | | Fix license info localization | JoramWilander | 2016-02-04 | 1 | -2/+12 |
| |/ / | |||||
* | | | Merge pull request #2064 from hmhealey/plt882 | Christopher Speller | 2016-02-04 | 9 | -91/+103 |
|\ \ \ | |/ / |/| | | 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 | 3 | -18/+23 |
| | | | |||||
| * | | 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 | 5 | -71/+56 |
| | | | |||||
* | | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 6 | -18/+883 |
|\ \ \ | |/ / |/| | | 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 | 23 | -145/+518 |
| |\| | |||||
| * | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 48 | -771/+2139 |
| |\ \ | |||||
| * | | | Fixing console | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 1 | -4/+100 |
| | | | | |||||
| * | | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 2 | -51/+269 |
| | | | | |||||
| * | | | Fixing merge | =Corey Hulen | 2016-02-01 | 126 | -1589/+7199 |
| |\ \ \ | |||||
| * \ \ \ | merging | =Corey Hulen | 2016-01-25 | 20 | -331/+1082 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merging | =Corey Hulen | 2016-01-22 | 29 | -113/+421 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | 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 | 24 | -94/+619 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Adding UI | =Corey Hulen | 2016-01-11 | 2 | -0/+295 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 3 | -13/+30 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |
|/ / / / / / / / / |