Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use a user's full name as their display name if a nickname hasn't been specified | hmhealey | 2015-07-17 | 1 | -1/+19 |
| | |||||
* | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 1 | -1/+7 |
| | | | | their nickname/username into a helper function | ||||
* | Merge pull request #198 from nickago/MM-1518 | Joram Wilander | 2015-07-17 | 1 | -1/+7 |
|\ | | | | | MM-1518 Fixed config on our link parser | ||||
| * | fixed formatting | nickago | 2015-07-16 | 1 | -1/+1 |
| | | |||||
| * | readded space | nickago | 2015-07-16 | 1 | -0/+1 |
| | | |||||
| * | Fixed config on our link parser | nickago | 2015-07-16 | 1 | -2/+7 |
| | | |||||
* | | Merge pull request #183 from nickago/MM-1073 | Joram Wilander | 2015-07-16 | 1 | -8/+15 |
|\ \ | |/ |/| | MM-1073 Enable youtube metadata with a google developer key | ||||
| * | Changed scope of 'metatdata' | nickago | 2015-07-15 | 1 | -1/+1 |
| | | |||||
| * | Need you GDev key for youtube stuff | nickago | 2015-07-14 | 1 | -8/+15 |
| | | |||||
* | | [webui] fix loading animation for ie | ralder | 2015-07-11 | 1 | -4/+35 |
|/ | |||||
* | Merge pull request #159 from rgarmsen2295/mm-1269b | Corey Hulen | 2015-07-10 | 1 | -2/+0 |
|\ | | | | | MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted | ||||
| * | Added errorchange listener to textbox that detects if inet is not connected. ↵ | Reed Garmsen | 2015-07-09 | 1 | -7/+0 |
| | | | | | | | | Still do not have reliable way of checking if inet has reconnected | ||||
| * | Notes to myself | Reed Garmsen | 2015-07-09 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #157 from rgarmsen2295/mm-1265 | Corey Hulen | 2015-07-10 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels | ||||
| * | | Final change to code affected by change to loading more channels logic | Reed Garmsen | 2015-07-10 | 1 | -1/+1 |
| |/ | |||||
* / | fix bugs for pr #150 MM-895 | ralder | 2015-07-10 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-09 | 2 | -28/+29 |
|\ | |||||
| * | Merge pull request #150 from mattermost/mm-895 | Joram Wilander | 2015-07-08 | 2 | -15/+2 |
| |\ | | | | | | | MM-895 Reorganization of browser storage. | ||||
| | * | Finishing centralization of BrowserStore | Christopher Speller | 2015-07-08 | 1 | -14/+0 |
| | | | |||||
| | * | Modifying all storage to use session storage. Also adding an abstraction ↵ | Christopher Speller | 2015-07-08 | 1 | -1/+2 |
| | | | | | | | | | | | | layer to add current user id as a prefix to most keys. | ||||
| * | | Semicolons and a bug fix | nickago | 2015-07-08 | 1 | -5/+5 |
| | | | |||||
| * | | Changed linkify to autolinker and wrote gap-bridging code | nickago | 2015-07-08 | 1 | -11/+25 |
| |/ | |||||
* / | Changed loading logic for retrieving more channels to allow for loading ↵ | Reed Garmsen | 2015-07-07 | 1 | -1/+1 |
|/ | | | | animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load | ||||
* | Added comment for later reference | Reed Garmsen | 2015-07-02 | 1 | -1/+1 |
| | |||||
* | Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) ↵ | Reed Garmsen | 2015-07-02 | 1 | -4/+6 |
| | | | | error is thrown | ||||
* | Removed option that does not work | Reed Garmsen | 2015-07-02 | 1 | -2/+2 |
| | |||||
* | Added two possible options for removing blue bar error, will choose one later | Reed Garmsen | 2015-07-02 | 1 | -1/+1 |
| | |||||
* | Added line that disables caching with a ajax client call that was causing ↵ | Reed Garmsen | 2015-07-02 | 1 | -0/+1 |
| | | | | errors to be thrown in IE10 | ||||
* | make loop simpler | JoramWilander | 2015-07-02 | 1 | -1/+1 |
| | |||||
* | fix getDirectTeammate so that if teammate is the second id it doesn't return ↵ | JoramWilander | 2015-07-02 | 1 | -11/+13 |
| | | | | null | ||||
* | Finally fixed the git weirdness | nickago | 2015-07-01 | 1 | -0/+18 |
| | |||||
* | Merge pull request #110 from nickago/MM-1430 | Corey Hulen | 2015-06-30 | 1 | -2/+2 |
|\ | | | | | MM-1430 Added the ability to have hashtags with dashes in them | ||||
| * | Added the ability to have hashtags with dashes in them | nickago | 2015-06-30 | 1 | -2/+2 |
| | | |||||
* | | Removed unnecessary loop copying | Reed Garmsen | 2015-06-30 | 1 | -5/+1 |
| | | |||||
* | | Changed keyword logic to use arrays rather than maps to remove highlighting ↵ | Reed Garmsen | 2015-06-30 | 1 | -5/+5 |
|/ | | | | of js object properties like constructor and __proto__ | ||||
* | Merge pull request #106 from mattermost/mm-1119 | Joram Wilander | 2015-06-30 | 2 | -2/+6 |
|\ | | | | | fixes mm-1119 adds @all and @channel mention capabilites | ||||
| * | @all and @channel now highlight like other mentions | JoramWilander | 2015-06-30 | 1 | -2/+5 |
| | | |||||
| * | @all and @channel now auto-complete | JoramWilander | 2015-06-29 | 1 | -0/+1 |
| | | |||||
* | | add intro text specific to off-topic channel | JoramWilander | 2015-06-29 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #46 from mattermost/mm-1318 | Joram Wilander | 2015-06-25 | 1 | -0/+1 |
|\ | | | | | fixes mm-1318 only allow 5 files to be uploaded at a time | ||||
| * | fixes mm-1318 only allow 5 files to be uploaded at a time | JoramWilander | 2015-06-22 | 1 | -0/+1 |
| | | |||||
| * | fixes br tags causing new lines | JoramWilander | 2015-06-18 | 1 | -4/+1 |
| | | |||||
* | | Merge pull request #32 from rgarmsen2295/mm-1282 | Corey Hulen | 2015-06-25 | 1 | -0/+15 |
|\ \ | | | | | | | MM-1282 | ||||
| * | | Added a util function that checks that local/session storage is enabled. ↵ | Reed Garmsen | 2015-06-18 | 1 | -0/+15 |
| |/ | | | | | | | Also added tests using this function to report an error to the user if it is not enabled | ||||
| * | fix for dockerhost HELIUM | =Corey Hulen | 2015-06-18 | 2 | -2/+12 |
| | | |||||
* | | Merge pull request #27 from mattermost/mm-1240 | Corey Hulen | 2015-06-25 | 3 | -0/+56 |
|\ \ | | | | | | | fixes mm-1240 adds ability to turn valet feature on | ||||
| * | | added team store, team settings menu, and the ability to turn on valet ↵ | JoramWilander | 2015-06-18 | 3 | -0/+56 |
| |/ | | | | | | | feature from client | ||||
* | | Merge pull request #19 from mattermost/mm-1235 | Corey Hulen | 2015-06-25 | 1 | -1/+1 |
|\ \ | | | | | | | fixes mm-1235 clicking on mentions now works properly | ||||
| * | | fixes mm-1235 clicking on mentions now works properly | JoramWilander | 2015-06-17 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #18 from mattermost/mm-1269 | Corey Hulen | 2015-06-25 | 1 | -0/+2 |
|\ \ | | | | | | | fixes mm-1269 don't show blue bar for internet connection issue |