Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-45964: SiteStats: Error on log when exporting to PDF a report by events to Table (#9551)

    • -2
    • +2
    ./webapp/html/pages/ReportsEditPage.html
  1. … 4 more files in changeset.
SAK-46098 GBNG > Item Order > Cancel button needlessly refreshes the page

(cherry picked from commit 531a86e1a5d611bffa404e71091f1dedd72422d9)

  1. … 8 more files in changeset.
SAK-46098 GBNG > Item Order > Cancel button needlessly refreshes the page

  1. … 8 more files in changeset.
SAK-45747 Deprecated utils.Web => api.FormattedText

SAK-45745 Deprecated: new AttributeModifier(String attribute, boolean The serializable class does not declare a static final serialVersionUID field of type long

  1. … 34 more files in changeset.
SAK-43149 Fix the handling of OR required functions, in page order (#8806)

https://jira.sakaiproject.org/browse/SAK-43149

    • -1
    • +1
    ./webapp/WEB-INF/tools/sakai.sitestats.xml
  1. … 5 more files in changeset.
SAK-43149 Fix the handling of OR required functions, in page order (#8806)

https://jira.sakaiproject.org/browse/SAK-43149

(cherry picked from commit b64810bb9a7fd9cdea1adfd25fad98c571a89db6)

    • -1
    • +1
    ./webapp/WEB-INF/tools/sakai.sitestats.xml
  1. … 5 more files in changeset.
SAK-43149 Fix the handling of OR required functions, in page order (#8806)

https://jira.sakaiproject.org/browse/SAK-43149

(cherry picked from commit b64810bb9a7fd9cdea1adfd25fad98c571a89db6)

    • -1
    • +1
    ./webapp/WEB-INF/tools/sakai.sitestats.xml
  1. … 5 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

Conflicts:

calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/GenericCalendarImporter.java

commons/impl/src/java/org/sakaiproject/commons/impl/CommonsContentProducer.java

commons/tool/src/java/org/sakaiproject/commons/tool/CommonsTool.java

msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java

msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml

portal/portal-impl/impl/src/java/org/sakaiproject/portal/entityprovider/PortalEntityProvider.java

roster2/tool/src/java/org/sakaiproject/roster/tool/entityprovider/RosterPOIEntityProvider.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemConfigBean.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/HistogramListener.java

  1. … 74 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

Conflicts:

msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java

msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java

  1. … 75 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

  1. … 76 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

  1. … 76 more files in changeset.
SAK-44025 grammar and NPE fixes (#8412)

    • -1
    • +2
    ./webapp/html/pages/ServerWidePage.html
  1. … 2 more files in changeset.
SAK-44026 fix regression that broke role choice within course site (#8413)

(cherry picked from commit b4cd69417b51f832ffe8fc634e705485395ca8ea)

SAK-44026 fix regression that broke role choice within course site (#8413)

SAK-44026 fix regression that broke role choice within course site (#8413)

(cherry picked from commit b4cd69417b51f832ffe8fc634e705485395ca8ea)

SAK-43878 better handling when authzgroup does not exist (#8327)

* SAK-43878 better handling when authzgroup does not exist

* @ern suggestions

* Fix return

(cherry picked from commit 1fa64e950c86e64f80c206bff1a0fc1f9a45cf84)

SAK-43878 better handling when authzgroup does not exist (#8327)

* SAK-43878 better handling when authzgroup does not exist

* @ern suggestions

* Fix return

(cherry picked from commit 1fa64e950c86e64f80c206bff1a0fc1f9a45cf84)

SAK-43878 better handling when authzgroup does not exist (#8327)

* SAK-43878 better handling when authzgroup does not exist

* @ern suggestions

* Fix return

SAK-43901: add wicket library for reusable components (#8339)

* SAK-43901: add wicket library for reusable components

* SAK-43901: fixup for bad merge conflict resolution

* SAK-43901: remove obsolete comment

* SAK-43901: directory restructure

    • -25
    • +0
    ./webapp/script/sakaidatetimefield.js
  1. … 24 more files in changeset.
SAK-43759 when in admin site, retrieve all roles instead of just the "admin" role (#8291)

* SAK-43759 when in admin site, retrieve all roles instead of just the "admin" role

* add ~admin per @ern

SAK-43759 when in admin site, retrieve all roles instead of just the "admin" role (#8291)

* SAK-43759 when in admin site, retrieve all roles instead of just the "admin" role

* add ~admin per @ern

(cherry picked from commit e14ec84248114cb911cc8528d646b9e36c9829b2)

SAK-43759 when in admin site, retrieve all roles instead of just the "admin" role (#8291)

* SAK-43759 when in admin site, retrieve all roles instead of just the "admin" role

* add ~admin per @ern

(cherry picked from commit e14ec84248114cb911cc8528d646b9e36c9829b2)

Conflicts:

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/pages/ReportsEditPage.java

Removed sitestats.css, moved styles to library (#8211)

  1. … 1 more file in changeset.
NOJIRA Checking licenses (#8176)

  1. … 137 more files in changeset.
SAK-43251 Fixed display issues with the User Activity page header (#7910)

(cherry picked from commit 276c41f2d5de4eddeeeec2627393e1328610eb03)

    • -4
    • +2
    ./webapp/html/pages/UserActivityPage.html
  1. … 1 more file in changeset.
SAK-43251 Fixed display issues with the User Activity page header (#7910)

    • -4
    • +2
    ./webapp/html/pages/UserActivityPage.html
  1. … 1 more file in changeset.
SAK-42572 Solve ClassCastException on Sitestats (#7424)

  1. … 3 more files in changeset.
SAK-42425 Statistics JS Uncaught ReferenceError viewing Report (#7433)

SAK-42425 Statistics JS Uncaught ReferenceError viewing Report (#7433)

(cherry picked from commit 74005a8b265072b22cc127535fd1df79552528eb)