Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #116 from nickago/MM-1341 | Joram Wilander | 2015-07-03 | 1 | -0/+5 |
|\ | | | | | MM-1341 mention auto-complete now goes away if you move off it's specific textbox | ||||
| * | Removed a change originally made for a prior fix tactic | nickago | 2015-07-01 | 1 | -1/+1 |
| | | |||||
| * | Fixed click response | nickago | 2015-07-01 | 1 | -3/+2 |
| | | |||||
| * | Inital attempt at active element checking | nickago | 2015-07-01 | 1 | -1/+7 |
| | | |||||
* | | Restructured logic to flow more naturally and be cleaner | Reed Garmsen | 2015-07-02 | 1 | -42/+44 |
| | | |||||
* | | Added logic for loading animation to appear when posts have yet to be ↵ | Reed Garmsen | 2015-07-02 | 2 | -5/+15 |
| | | | | | | | | loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design. | ||||
* | | Added new files for adding new loading animation | Reed Garmsen | 2015-07-02 | 1 | -0/+3 |
| | | |||||
* | | MM-1319 - Copy link and background change | Asaad Mahmood | 2015-07-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #123 from asaadmahmoodspin/mm-1426 | Corey Hulen | 2015-07-02 | 3 | -14/+30 |
|\ \ | | | | | | | MM-1426 - Updating UI | ||||
| * | | Changing var currentUser in post_right | Asaad Mahmood | 2015-07-17 | 1 | -6/+6 |
| | | | |||||
| * | | Changing var name from currentUser to currentUserCss | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #2 from rgarmsen2295/mm-1453 | asaadmahmoodspin | 2015-07-02 | 2 | -8/+24 |
| |\ \ | | | | | | | | | MM-1453 Added additional class to the markup indicating if the post came from the current user | ||||
| | * | | Added additional class to the markup indicating if the post came from the ↵ | Reed Garmsen | 2015-07-02 | 2 | -8/+24 |
| | | | | | | | | | | | | | | | | current user | ||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426 | Asaad Mahmood | 2015-07-17 | 1 | -11/+13 |
| |\ \ \ | |||||
| * | | | | Improving modal UI | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Improving channel notifications | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #121 from rgarmsen2295/mm-1445 | Corey Hulen | 2015-07-02 | 1 | -3/+4 |
|\ \ \ \ | |_|/ / |/| | | | MM-1445 Changed valet title and description for clarity | ||||
| * | | | Changed valet title and description for clarity | Reed Garmsen | 2015-07-02 | 1 | -3/+4 |
| |/ / | |||||
* | | | 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 | ||||
* | | Merge pull request #118 from nickago/MM-1363 | Joram Wilander | 2015-07-02 | 1 | -3/+10 |
|\ \ | | | | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures | ||||
| * | | Changed ordering of steps for upload to imporve asthetic | nickago | 2015-07-01 | 1 | -2/+4 |
| | | | |||||
| * | | Restricted profile picture uploads to just JPEGs | nickago | 2015-07-01 | 1 | -1/+6 |
| |/ | |||||
* | | Merge pull request #115 from nickago/MM-1425 | Corey Hulen | 2015-07-01 | 5 | -8/+8 |
|\ \ | | | | | | | MM-1425 Facelifted "direct message" to "private message" | ||||
| * | | Facelifted "direct message" to "private message" | nickago | 2015-07-01 | 5 | -8/+8 |
| |/ | |||||
* / | Finally fixed the git weirdness | nickago | 2015-07-01 | 4 | -14/+27 |
|/ | |||||
* | 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 |
| | | |||||
* | | Merge pull request #102 from nickago/MM-1328 | Corey Hulen | 2015-06-30 | 1 | -1/+3 |
|\ \ | | | | | | | MM-1328 Now limits domain to just alphanumeric | ||||
| * | | Aligned front end and back end domain requirements | nickago | 2015-06-30 | 1 | -1/+3 |
| |/ | |||||
* | | 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 #109 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -3/+10 |
|\ | | | | | Mm 1289 Now sorts extra channel members lexigraphically | ||||
| * | Added extra precaution to avoid null error | nickago | 2015-06-30 | 1 | -7/+9 |
| | | |||||
| * | MM-1289 Now sorts users in lexigraphical order in extra members popover | nickago | 2015-06-30 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #108 from rgarmsen2295/mm-1309 | Christopher Speller | 2015-06-30 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1309 Fixed grammmatical issue in error message | ||||
| * | | Fixed grammmatical issue in error message | Reed Garmsen | 2015-06-30 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #106 from mattermost/mm-1119 | Joram Wilander | 2015-06-30 | 7 | -11/+74 |
|\ \ | |/ |/| | fixes mm-1119 adds @all and @channel mention capabilites | ||||
| * | @all and @channel now highlight like other mentions | JoramWilander | 2015-06-30 | 2 | -2/+8 |
| | | |||||
| * | add default icon for non-user autocompletes | JoramWilander | 2015-06-30 | 1 | -2/+8 |
| | | |||||
| * | @all and @channel now auto-complete | JoramWilander | 2015-06-29 | 4 | -3/+17 |
| | | |||||
| * | added team-wide and channel-wide mentions | JoramWilander | 2015-06-29 | 1 | -5/+42 |
| | | |||||
* | | Revert "MM-1289 Sorted the channel members popover lexigraphically" | Christopher Speller | 2015-06-30 | 1 | -6/+1 |
| | | |||||
* | | Merge pull request #101 from rgarmsen2295/mm-983 | Christopher Speller | 2015-06-30 | 1 | -1/+1 |
|\ \ | | | | | | | MM-983 Fixed file preview removal in IE10 | ||||
| * | | Changed file preview removal from using dataset which is unsupported in ie10 ↵ | Reed Garmsen | 2015-06-29 | 1 | -1/+1 |
| |/ | | | | | | | to using the getAttribute method which is backwards and forwards compatible | ||||
* | | Merge pull request #91 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -1/+6 |
|\ \ | | | | | | | MM-1289 Sorted the channel members popover lexigraphically | ||||
| * | | Added semicolons | nickago | 2015-06-29 | 1 | -2/+2 |
| | | | |||||
| * | | Sorted the channel members popover lexigraphically | nickago | 2015-06-29 | 1 | -1/+6 |
| |/ | |||||
* | | Merge pull request #103 from nickago/MM-1293 | Joram Wilander | 2015-06-30 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1293 Updated file display key to avoid child flattening | ||||
| * | | Changed the style of key-assignment to allow for more assured variance | nickago | 2015-06-29 | 1 | -2/+1 |
| | | |