Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | Restructured logic to flow more naturally and be cleaner | Reed Garmsen | 2015-07-02 | 1 | -42/+44 |
| | |||||
* | Added import statement to styles.scss | Reed Garmsen | 2015-07-02 | 1 | -0/+1 |
| | |||||
* | 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 | 2 | -0/+71 |
| | |||||
* | Fixing padding in sidebar dropdown | Asaad Mahmood | 2015-07-18 | 1 | -1/+1 |
| | |||||
* | MM-1319 - Copy link and background change | Asaad Mahmood | 2015-07-18 | 2 | -3/+1 |
| | |||||
* | Updating margins | Asaad Mahmood | 2015-07-18 | 1 | -3/+5 |
| | |||||
* | Minor fixes to mattermost UI | Asaad Mahmood | 2015-07-18 | 2 | -1/+2 |
| | |||||
* | Merge pull request #123 from asaadmahmoodspin/mm-1426 | Corey Hulen | 2015-07-02 | 12 | -35/+67 |
|\ | | | | | 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 |
| | | |||||
| * | Adding highlights and improving css for posts on responsive screens | Asaad Mahmood | 2015-07-17 | 3 | -7/+4 |
| | | |||||
| * | 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 | 2 | -4/+3 |
| | | | | |||||
| * | | | Improving channel notifications | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | Improving image modals | Asaad Mahmood | 2015-07-17 | 2 | -1/+2 |
| | | | | |||||
| * | | | Adding border radius | Asaad Mahmood | 2015-07-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | MM-1426 - Updating UI | Asaad Mahmood | 2015-07-17 | 8 | -18/+36 |
| | |/ | |/| | |||||
* | | | 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 |
| |/ | |||||
* | | Merge pull request #114 from asaadmahmoodspin/master | Corey Hulen | 2015-07-01 | 12 | -5/+21 |
|\ \ | | | | | | | Fixing css issues in IE, adding doctype to html files | ||||
| * | | Improving targeting for row content | Asaad Mahmood | 2015-07-01 | 1 | -5/+5 |
| | | | |||||
| * | | Just arranging the css more properly | Asaad Mahmood | 2015-07-01 | 1 | -1/+4 |
| | | | |||||
| * | | Fixing height for content | Asaad Mahmood | 2015-07-01 | 2 | -3/+5 |
| | | | |||||
| * | | Fixing css issues in IE, adding doctype to html files | Asaad Mahmood | 2015-07-01 | 11 | -0/+11 |
| |/ | |||||
* | | Merge pull request #92 from nickago/MM-1151 | Corey Hulen | 2015-07-01 | 4 | -14/+27 |
|\ \ | | | | | | | MM-1151 clickable search results | ||||
| * | | Finally fixed the git weirdness | nickago | 2015-07-01 | 4 | -14/+27 |
| |/ | |||||
* | | Merge pull request #90 from ralder/patch-1 | Corey Hulen | 2015-07-01 | 1 | -1/+1 |
|\ \ | |/ |/| | fix pr #82 bug mention list inside modal | ||||
| * | fix pr #82 mention list inside modal | ralder | 2015-06-29 | 1 | -1/+1 |
| | | |||||
* | | 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 |