Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-34477: Let user configure custom delimiters in FIB questions. (#8905)

* SAK-34477 - Let user configure custom delimiters in FIB questions.

Co-authored-by: Diego Del Blanco <diego.delblanco.sakai@gmail.com>

Co-authored-by: Sam Ottenhoff <ottenhoff@longsight.com>

  1. … 16 more files in changeset.
SAK-44744: SAMIGO - Wrong export when formulas includes more than one comma on a calculated question (#8894)

(cherry picked from commit 2813e2ab1873311e1bf2de1ea7650819305a0690)

SAK-44744: SAMIGO - Wrong export when formulas includes more than one comma on a calculated question (#8894)

(cherry picked from commit 2813e2ab1873311e1bf2de1ea7650819305a0690)

SAK-44744: SAMIGO - Wrong export when formulas includes more than one comma on a calculated question (#8894)

SAK-42628 t&Qs : wrong t/f question on pool import (#7464)

(Old ugly parts of Samigo, open for discussion)

If there's no exact match, itemIntrospectItemType (xml structure) is

more reliable than guesses based on searching words on the title.

SAK-42628 t&Qs : wrong t/f question on pool import (#7464)

(Old ugly parts of Samigo, open for discussion)

If there's no exact match, itemIntrospectItemType (xml structure) is

more reliable than guesses based on searching words on the title.

(cherry picked from commit b24297e86a2d5f2b61cd56682435fbf9c9d5cd99)

SAM-3032 - Clean up instances of printStackTrace (#5061)

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

(cherry picked from commit 96cc316037e695f36337f17a56ae47569662230e)

  1. … 331 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. … 1942 more files in changeset.
SAK-30828 switch jcl logging to slf4j

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

  1. … 73 more files in changeset.
SAM-1943: Support for Extended Matching Item (R-type) MCQs

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@305964 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 156 more files in changeset.
SAM-2118: Individual Feedback not present in exported package - Sakai 2.9

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@123521 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAM-2087 replace use of single-precision floating point numbers with doubles

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@121258 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 60 more files in changeset.
SAM-1314: New Survey Question Type needs to show student responses on Questions page

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@108774 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 2 more files in changeset.
SAM-1683 remove dead stores

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@107566 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 9 more files in changeset.
SAM-1125 fix eol properties and header properties

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@106463 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 248 more files in changeset.
SAK-21839 update license header to re-point to opensource.org

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@105078 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 532 more files in changeset.
Merging r104415 through r104419

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@104420 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 8 more files in changeset.
undo merge with SAM-1430

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101421 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 12 more files in changeset.
merge sam-1430 head to sam-1139 head

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101383 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 7 more files in changeset.
git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101239 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
Cleanup old code

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101001 66ffb92e-73f9-0310-93c1-f5514f145a0a

Cleanup old code

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@100951 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
Update for import of Calculated Questions

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@100581 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
Implement Calculated Question export

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@100532 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
Enhancments to support export (don't populate match_group unnecessarily) and import (take advantage of improvments to itemmatchIndex in extractItem transformation

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@100085 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAM-1139 fixed up the CQ export strategy

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@100061 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAM-1139 more fixes for calc item

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@100053 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAM-1139 more fixing up the calculated item code

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@99981 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 4 more files in changeset.