ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix calendar event cutoff for specific time ranges 

The actual fix was applied to the fullcalendar package we are using.
This just bumps our local version to apply the fix in canvas-lms. The
fix in fullcalendar can be seen here:
https://github.com/instructure/fullcalendar/pull/1/files

fixes COMMS-268

Test Plan:
  - Navigate to the calendar
  - Create a new 50 minute even (ie, from 8:00 to 8:50) with a title
  - Switch the calendar to week view
  - Notice that the bottom half of the title is not cut off

Change-Id: I084e085d7a97039df7729870271a8691e010e4ba
Reviewed-on: https://gerrit.instructure.com/137608
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Tested-by: Jenkins
QA-Review: Venk Natarajan <vnatarajan@instructure.com>
Product-Review: Landon Gilbert-Bland <lbland@instructure.com>
This commit is contained in:
Landon Gilbert-Bland 2018-01-11 09:59:21 -07:00
parent b663c2f1be
commit 5829f0850a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -19,7 +19,7 @@
"classnames": "^2.2.5",
"color-slicer": "0.8.0",
"d3": "3.5.17",
"fullcalendar": "https://github.com/ryankshaw/fullcalendar.git#aa686b36d10cee1e1e3ec7c7784145e46667d47d",
"fullcalendar": "https://github.com/instructure/fullcalendar.git#1108dd1c991a029ec6fd7de3337737ec5295ba97",
"graphiql": "^0.11.2",
"graphql": "^0.10.0",
"ic-ajax": "~2.0.1",

4
yarn.lock
View File

@ -4299,9 +4299,9 @@ ftp@~0.3.10:
readable-stream "1.1.x"
xregexp "2.0.0"
"fullcalendar@https://github.com/ryankshaw/fullcalendar.git#aa686b36d10cee1e1e3ec7c7784145e46667d47d":
"fullcalendar@https://github.com/instructure/fullcalendar.git#1108dd1c991a029ec6fd7de3337737ec5295ba97":
version "2.4.0"
resolved "https://github.com/ryankshaw/fullcalendar.git#aa686b36d10cee1e1e3ec7c7784145e46667d47d"
resolved "https://github.com/instructure/fullcalendar.git#1108dd1c991a029ec6fd7de3337737ec5295ba97"
dependencies:
jquery ">=1.7.1"
moment ">=2.5.0"