Code

Fixed the issues with #163#164

Code

Open

j-crawford wants to merge 5 commits intouPortal-Project:masteruPortal-Project/CalendarPortlet:masterfrom j-crawford:v2.6.1-http-and-webcalj-crawford/CalendarPortlet:v2.6.1-http-and-webcalCopy head branch name to clipboard

+279-65

Commits

Commits on Apr 19, 2019

• uPortal-ProjectGH-160 fixed the event colors being out of sync with their calendars

  j-crawford

  committed
  b75669c

  Copy full SHA for b75669c

Commits on Apr 25, 2019

• uPortal-ProjectGH-160 Added more colors and turned them into less variables to make it easier to change them and have them still be in sync

  j-crawford

  committed
  fe18023

  Copy full SHA for fe18023

• uPortal-ProjectGH-163 added timeout for http calls to ensure that it doesn't wait for a non-connecting site

  j-crawford

  committed
  a09a53c

  Copy full SHA for a09a53c

• uPortal-ProjectGH-163 added functionallity to be able to add webcals under the http controller. it first checks the https equivilent then goes and checks the http equivalent.

  j-crawford

  committed
  2bb2e75

  Copy full SHA for 2bb2e75

• uPortal-ProjectGH-163 Tried to fix indentation, only sorta worked.

  j-crawford

  committed
  38fe6cb

  Copy full SHA for 38fe6cb