Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-46000 samigo > review of static variables (#9573)

  1. … 40 more files in changeset.
  1. … 30 more files in changeset.
SAK-45361 Multiple dark mode fixes (#9288)

* SAK-45361 incorporate

SAK-45468

SAK-45300

SAK-45286

SAK-45271

SAK-45273

SAK-45274

SAK-45272

SAK-45275

SAK-45146

SAK-45250

SAK-45249

SAK-45248

SAK-45247

SAK-45144

(cherry picked from commit ebe3e2ff57de8c01d5432bcbb318de08a06ea2ac)

Conflicts:

library/src/morpheus-master/sass/themes/_light.scss

webcomponents/tool/src/main/frontend/js/sakai-maximise-button.js

webcomponents/tool/src/main/frontend/js/widgets/sakai-grades-widget.js

  1. … 30 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-43236 Samigo: Deprecated utils.FormattedText, Validator => api.F… (#7897)

* SAK-43236 Samigo: Deprecated utils.FormattedText, Validator => api.FormattedText

* SAK-43236 @Setter ..

  1. … 33 more files in changeset.
SAK-43236 Samigo: Deprecated utils.FormattedText, Validator => api.F… (#7897)

* SAK-43236 Samigo: Deprecated utils.FormattedText, Validator => api.FormattedText

* SAK-43236 @Setter ..

(cherry picked from commit ea54ed215dc6421bd19faac3950ef2450434118c)

  1. … 33 more files in changeset.
SAK-42619 Tests&Quizzes: Move managed-bean configuration from XML to Annotations (#7428)

  1. … 51 more files in changeset.
SAK-41379: Hot Spot questions don't appear when printing PDF (#6585)

(cherry picked from commit 41b2801a80294ef9d10417bfc971c1b0df288b90)

SAK-41379: Hot Spot questions don't appear when printing PDF (#6585)

(cherry picked from commit 41b2801a80294ef9d10417bfc971c1b0df288b90)

SAK-41379: Hot Spot questions don't appear when printing PDF (#6585)

SAK-40605 Samigo class cast on update order button for published assessments (#6315)

(cherry picked from commit cddb065a561335ebc0b37cba609cbad999b2b800)

  1. … 17 more files in changeset.
SAK-40605 Samigo class cast on update order button for published assessments (#6315)

  1. … 17 more files in changeset.
SAK-40605 Samigo class cast on update order button for published assessments (#6315)

(cherry picked from commit cddb065a561335ebc0b37cba609cbad999b2b800)

Conflicts:

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ActionSelectListener.java

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

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

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

samigo/samigo-app/src/webapp/jsf/author/editAssessment.jsp

  1. … 16 more files in changeset.
SAK-40784 commons-lang => commons-lang3

org.apache.commons.lang.StringUtils => org.apache.commons.lang3.StringUtils;

org.apache.commons.lang.StringEscapeUtils = org.apache.commons.text.StringEscapeUtils

StringEscapeUtils.escapeXml10(String)

org.apache.commons.lang.BooleanUtils => org.apache.commons.lang3.BooleanUtils;

  1. … 58 more files in changeset.
SAM-2024: Samigo > print assessments with survey questions doesn't display answer options properly (#5369)

(cherry picked from commit 5f2cf08a13708e541082b50dec9b7f6a173fe106)

  1. … 1 more file in changeset.
SAM-2024: Samigo > print assessments with survey questions doesn't display answer options properly (#5369)

  1. … 1 more file in changeset.
SAM-3032 - Clean up instances of printStackTrace (#5061)

  1. … 334 more files in changeset.
SAM-3032 - Clean up instances of printStackTrace (#5061)

(cherry picked from commit 96cc316037e695f36337f17a56ae47569662230e)

  1. … 334 more files in changeset.
SAK-32675 - Update license plugin and license headers (#4720)

* SAK-32675 - Update license plugin and license headers

* SAK-32675 - Adding more license files

  1. … 1282 more files in changeset.
KNL-945 Hibernate upgrade from 3.6 to 4.3 (#3719)

  1. … 490 more files in changeset.
SAK-30828 Normalize logging for 11.x (#3346)

* SAK-30828 Normalize sakai logging

- remove commons-logging (jcl)

- add logging to those projects where it was removed

- convert System.out to log messages in many projects

- add jcl-over-slf4j lib

- update many dependencies to inherit from master

- update logging for tests

- add lombok to global dependency (@Slf4j)

Conflicts:

basiclti/tsugi-util/pom-tsugi.xml

content-review/impl/dao/pom.xml

content-review/impl/turnitin/pom.xml

content-review/pom.xml

entitybroker/utils/pom.xml

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java

* SAK-30828 switch log4j logging to slf4j

* SAK-30828 switch jcl logging to slf4j

Conflicts:

assignment/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java

assignment/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/DbAssignmentService.java

basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

kernel/kernel-impl/src/main/java/org/sakaiproject/event/impl/BaseLearningResourceStoreService.java

lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java

portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/GenerateBugReportHandler.java

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

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/questionpool/PoolSaveListener.java

signup/impl/src/java/org/sakaiproject/signup/logic/SignupMeetingServiceImpl.java

syllabus/syllabus-impl/src/java/org/sakaiproject/component/app/syllabus/SyllabusServiceImpl.java

* SAK-30828 slf4j-log4j12 binding should be provided

* SAK-30828 Lombok @CommonsLog migrated to @Slf4j

Conflicts:

content-review/impl/dao/src/test/java/org/sakaiproject/contentreview/dao/ContentReviewDaoImplTest.java

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewFederatedServiceImpl.java

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewQueueServiceImpl.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinAccountConnection.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinContentValidator.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinReviewServiceImpl.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinSessionFuncs.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

content-review/impl/vericite/src/main/java/org/sakaiproject/contentreview/vericite/ContentReviewServiceVeriCite.java

* SAK-30828 content-review slf4j conversion

* SAK-31420 Issue with import from site not working due to logger serialization (#3169)

  1. … 1945 more files in changeset.
SAK-30828 switch jcl logging to slf4j

  1. … 1492 more files in changeset.
Merge pull request #1448 from OpenCollabZA/SAM-1263

SAM-1263 initial commit

  1. … 1 more file in changeset.
SAM-1263 Initial import of the new HotSpot Question type

  1. … 75 more files in changeset.
SAM-2673 Download test in pdf format fails when title contains a comma

SAM-2564: Calculated question answer key show formula in print view

  1. … 4 more files in changeset.
SAM-2502 - Inline images in print pdf do not display Updated default properties

  1. … 1 more file in changeset.