summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* MM-1469 - Loading message in more channel modalAsaad Mahmood2015-07-084-63/+12
|
* Merge branch 'master' of https://github.com/asaadmahmoodspin/platformAsaad Mahmood2015-07-084-21/+91
|\
| * Merge pull request #1 from rgarmsen2295/mm-1469asaadmahmoodspin2015-07-084-21/+91
| |\ | | | | | | MM-1469 Added loading animation logic to the "Get More Channels Menu" ("More...")
| | * Small changes and code clean-upReed Garmsen2015-07-071-2/+2
| | |
| | * Changed loading logic for retrieving more channels to allow for loading ↵Reed Garmsen2015-07-074-22/+92
| | | | | | | | | | | | animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load
* | | Use correctly minified and unminified js libraries for JQuery, Bootstrap, ↵hmhealey2015-07-084-3/+1469
| | | | | | | | | | | | and Perfect Scrollbar
* | | Copied Bootstrap, jQuery and React libraries and resources into repositoryhmhealey2015-07-0813-4/+40842
| | |
* | | Moved minified javascript out of min directoryhmhealey2015-07-082-1/+1
| | |
* | | Merge pull request #148 from hmhealey/mm1488Christopher Speller2015-07-081-2/+3
|\ \ \ | | | | | | | | MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself
| * | | Changed code to dismiss mention list to not trigger when you click on the ↵hmhealey2015-07-071-2/+3
| |/ / | | | | | | | | | list itself
* | | Merge pull request #147 from rgarmsen2295/mm-934Corey Hulen2015-07-073-3/+3
|\ \ \ | | | | | | | | MM-934 Users can no longer "click n' drag" text boxes to resize them
| * | | Changed textarea resizeability from being a blanket statement to everything ↵Reed Garmsen2015-07-074-4/+3
| | | | | | | | | | | | | | | | to only the ones with issues
| * | | Prevent text areas from being resizeableReed Garmsen2015-07-071-0/+1
| | |/ | |/|
* | | Merge pull request #137 from nickago/MM-1417Corey Hulen2015-07-071-1/+4
|\ \ \ | |_|/ |/| | MM-1417 redirected channel name 404's to town square
| * | redirected channel name 404's to town squarenickago2015-07-061-1/+4
| | |
* | | MM-1221 - Fixing scrolling issue in the RHSAsaad Mahmood2015-07-071-1/+2
| | |
* | | Updating backgroundAsaad Mahmood2015-07-072-24/+12
| | |
* | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-071-0/+8
|\ \ \ | | |/ | |/|
| * | Merge pull request #134 from nickago/MM-1313Christopher Speller2015-07-071-0/+8
| |\ \ | | | | | | | | Mm 1313 Made the typing notification more responsive/accurate
| | * | Changed socket event to a props based changenickago2015-07-062-20/+9
| | | |
| | * | Typing notification disappears when message is sentnickago2015-07-062-3/+4
| | | |
| | * | Typing notifier resets on channel changenickago2015-07-062-4/+22
| | | |
* | | | Fixing code error in cssAsaad Mahmood2015-07-071-1/+0
| | | |
* | | | Fixing before after hover for date/new separatorAsaad Mahmood2015-07-071-2/+6
| | | |
* | | | Files img filesAsaad Mahmood2015-07-071-2/+5
| | | |
* | | | Fixing background hoversAsaad Mahmood2015-07-072-11/+8
|/ / /
* | | Merge pull request #135 from asaadmahmoodspin/masterCorey Hulen2015-07-067-43/+92
|\ \ \ | | | | | | | | MM-1461 - Updating Mattermost UI
| * | | MM-1461 - Updating Mattermost UIAsaad Mahmood2015-07-067-43/+92
| | | |
* | | | Merge pull request #133 from nickago/MM-794Corey Hulen2015-07-061-0/+7
|\ \ \ \ | | | | | | | | | | MM-794 Force the extra info to update asych on user creation
| * | | | Force the extra info to update asychnickago2015-07-061-0/+7
| | |/ / | |/| |
* | | | Merge pull request #132 from mattermost/mm-1250Corey Hulen2015-07-062-2/+6
|\ \ \ \ | |_|/ / |/| | | fixes mm-1250 mention highlights should now align in textbox
| * | | fixes mm-1250 mention highlights should now align in textboxJoramWilander2015-06-172-2/+6
| | | |
* | | | Fixed copy-paste error in codeReed Garmsen2015-07-061-1/+1
| | | |
* | | | Fixed not being able to open channel notifications settings menu in IE10Reed Garmsen2015-07-061-2/+2
| |/ / |/| |
* | | Merge pull request #127 from rgarmsen2295/mm-1047Joram Wilander2015-07-061-3/+6
|\ \ \ | | | | | | | | MM-1047 Error code 200 IE 10 & 11 suppression within getMeSynchronous method
| * | | Added comment for later referenceReed Garmsen2015-07-021-1/+1
| | | |
| * | | Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) ↵Reed Garmsen2015-07-021-4/+6
| | | | | | | | | | | | | | | | error is thrown
| * | | Removed option that does not workReed Garmsen2015-07-021-2/+2
| | | |
| * | | Added two possible options for removing blue bar error, will choose one laterReed Garmsen2015-07-021-1/+1
| | | |
| * | | Added line that disables caching with a ajax client call that was causing ↵Reed Garmsen2015-07-021-0/+1
| | | | | | | | | | | | | | | | errors to be thrown in IE10
* | | | Merge pull request #116 from nickago/MM-1341Joram Wilander2015-07-031-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 tacticnickago2015-07-011-1/+1
| | | |
| * | | Fixed click responsenickago2015-07-011-3/+2
| | | |
| * | | Inital attempt at active element checkingnickago2015-07-011-1/+7
| | |/ | |/|
* | | Restructured logic to flow more naturally and be cleanerReed Garmsen2015-07-021-42/+44
| | |
* | | Added import statement to styles.scssReed Garmsen2015-07-021-0/+1
| | |
* | | Added logic for loading animation to appear when posts have yet to be ↵Reed Garmsen2015-07-022-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 animationReed Garmsen2015-07-022-0/+71
| | |
* | | Fixing padding in sidebar dropdownAsaad Mahmood2015-07-181-1/+1
| | |
* | | MM-1319 - Copy link and background changeAsaad Mahmood2015-07-182-3/+1
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 14:08:22 +0000