Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #199 from asaadmahmoodspin/master | Joram Wilander | 2015-07-17 | 5 | -13/+20 | |
|\ \ | | | | | | | Improving search header for mobile layouts and other UI changes | |||||
| * | | Improving search header for mobile layouts and other UI changes | Asaad Mahmood | 2015-07-17 | 5 | -13/+20 | |
| | | | ||||||
* | | | Merge pull request #184 from nickago/MM-1278 | Joram Wilander | 2015-07-17 | 1 | -1/+2 | |
|\ \ \ | |_|/ |/| | | MM-1278 Team admin can now delete any post | |||||
| * | | Team admin can now delete any post | nickago | 2015-07-14 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #193 from ralder/fix-manage-members-town-square | Joram Wilander | 2015-07-17 | 8 | -162/+140 | |
|\ \ \ | | | | | | | | | [webui] remove admin's ability to manage members of default channel fixes (#172) | |||||
| * | | | remove admin's ability to manage members of default channel (fixes #172) | ralder | 2015-07-16 | 8 | -162/+140 | |
| | | | | ||||||
* | | | | 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 #196 from nickago/MM-1058 | Christopher Speller | 2015-07-17 | 1 | -2/+7 | |
|\ \ \ \ | |_|_|/ |/| | | | MM-1058 Added last updated for pictures | |||||
| * | | | Added last updated for pictures | nickago | 2015-07-16 | 1 | -2/+7 | |
| |/ / | ||||||
* | | | Merge pull request #183 from nickago/MM-1073 | Joram Wilander | 2015-07-16 | 2 | -8/+19 | |
|\ \ \ | | | | | | | | | 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 | 2 | -8/+19 | |
| | |/ | |/| | ||||||
* | | | MM-1401 - Removing most inline styles and other UI changes | Asaad Mahmood | 2015-07-17 | 21 | -31/+76 | |
| | | | ||||||
* | | | Minor code change for clarity | Reed Garmsen | 2015-07-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Code simplification and rebasing | Reed Garmsen | 2015-07-16 | 2 | -32/+6 | |
| | | | ||||||
* | | | Added missing semi-colons | Reed Garmsen | 2015-07-16 | 2 | -2/+2 | |
| | | | ||||||
* | | | Minor changes to scroll 'feel' and logic flow | Reed Garmsen | 2015-07-16 | 1 | -5/+5 | |
| | | | ||||||
* | | | Few minor bug fixes | Reed Garmsen | 2015-07-16 | 1 | -33/+17 | |
| | | | ||||||
* | | | Fixes not selecting an element that hasn't been scrolled to | Reed Garmsen | 2015-07-16 | 2 | -47/+27 | |
| | | | ||||||
* | | | Getting scrolling working with the arrow keys | Reed Garmsen | 2015-07-16 | 2 | -16/+43 | |
| | | | ||||||
* | | | Minor changes and tweaks trying to get scrolling to work | Reed Garmsen | 2015-07-16 | 1 | -11/+20 | |
| | | | ||||||
* | | | Better handling of previous highlight when you backspace (therefore ↵ | Reed Garmsen | 2015-07-16 | 1 | -12/+45 | |
| | | | | | | | | | | | | re-enlarging the number of mentions) | |||||
* | | | Minor changes towards getting interior scrolling working with arrow keys | Reed Garmsen | 2015-07-16 | 1 | -4/+5 | |
| | | | ||||||
* | | | When moving from a mention lower in the list to one higher in the list by ↵ | Reed Garmsen | 2015-07-16 | 1 | -0/+5 | |
| | | | | | | | | | | | | typing more, now properly highlights | |||||
* | | | Improved selection logic when using both the mouse and arrow keys | Reed Garmsen | 2015-07-16 | 2 | -3/+23 | |
| | | | ||||||
* | | | Highlighting now occurs as you arrow key thru mention list. However some ↵ | Reed Garmsen | 2015-07-16 | 2 | -53/+30 | |
| | | | | | | | | | | | | small bugs remain. | |||||
* | | | Have arrow key selection working, but visually does not highlight correct ↵ | Reed Garmsen | 2015-07-16 | 3 | -20/+63 | |
| | | | | | | | | | | | | mention. Also if user continues to type things might get weird. | |||||
* | | | Changed model of handling key down and focus change | Reed Garmsen | 2015-07-16 | 2 | -17/+40 | |
| | | | ||||||
* | | | Changed parts of framework | Reed Garmsen | 2015-07-16 | 1 | -6/+8 | |
| | | | ||||||
* | | | Added comma | Reed Garmsen | 2015-07-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Added framework for handling up and down arrow key presses to move between ↵ | Reed Garmsen | 2015-07-16 | 1 | -1/+17 | |
| |/ |/| | | | | | different @mention choices | |||||
* | | Merge pull request #175 from ralder/fix-dispatchError | Joram Wilander | 2015-07-16 | 7 | -132/+103 | |
|\ \ | | | | | | | [webui] fix incorrect call for AsyncClient.dispatchError | |||||
| * | | fix incorrect call for AsyncClient.dispatchError | ralder | 2015-07-13 | 7 | -132/+103 | |
| |/ | ||||||
* | | fixing merge | =Corey Hulen | 2015-07-15 | 32 | -486/+361 | |
|\ \ | ||||||
| * \ | Merge pull request #191 from asaadmahmoodspin/master | Corey Hulen | 2015-07-15 | 2 | -4/+4 | |
| |\ \ | | | | | | | | | Minor UI changes | |||||
| | * | | Minor UI changes | Asaad Mahmood | 2015-07-15 | 2 | -4/+4 | |
| | | | | ||||||
| * | | | Merge pull request #176 from nickago/MM-1400 | Corey Hulen | 2015-07-15 | 1 | -2/+13 | |
| |\ \ \ | | |/ / | |/| | | MM-1400 Add processing for message-less image posts w/ pluralization | |||||
| | * | | Fixed minor typo | nickago | 2015-07-14 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Add processing for messageless image posts w/ pluralization | nickago | 2015-07-13 | 1 | -2/+13 | |
| | | | | ||||||
| * | | | Fixed typo, returned password flow to standard model | nickago | 2015-07-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Revert "MM-831 Time change ping riding on the status interupt for timestamp ↵ | Joram Wilander | 2015-07-14 | 2 | -31/+3 | |
| | | | | | | | | | | | | | | | | update" | |||||
| * | | | Merge pull request #174 from nickago/MM-831-3 | Joram Wilander | 2015-07-14 | 2 | -3/+31 | |
| |\ \ \ | | | | | | | | | | | MM-831 Time change ping riding on the status interupt for timestamp update | |||||
| | * | | | Added semicolons | nickago | 2015-07-14 | 2 | -2/+2 | |
| | | | | | ||||||
| | * | | | Fixed 'this' typo and added semicolon | nickago | 2015-07-13 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Added timestamp updates to right side and cleaned code | nickago | 2015-07-13 | 3 | -14/+28 | |
| | | | | | ||||||
| | * | | | merge conflicts | nickago | 2015-07-13 | 2 | -2/+16 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | should fix scrolling on forceupdate | JoramWilander | 2015-07-13 | 2 | -2/+13 | |
| | | | | |