Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-44376 Changed the messaging and the default size of Samigo's File Upload question type (#8714)

  1. … 16 more files in changeset.
SAK-44376 Changed the messaging and the default size of Samigo's File Upload question type (#8714)

(cherry picked from commit 9e6ea874cffce73cd4186186698b83a42d0cb3cb)

  1. … 16 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-42991 remove more timezone display manipulation in Samigo (#7923)

  1. … 4 more files in changeset.
SAK-42991 remove more timezone display manipulation in Samigo (#7923)

(cherry picked from commit ad25f3f3a59ae11db5fd60afd805251a39a3a58b)

  1. … 4 more files in changeset.
SAK-42991 remove more timezone display manipulation in Samigo (#7923)

(cherry picked from commit ad25f3f3a59ae11db5fd60afd805251a39a3a58b)

Conflicts:

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/PublishedAssessmentSettingsBean.java

  1. … 4 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. … 50 more files in changeset.
SAK-40523 - Samigo: Cannot save assessment work from URL takes (#6186)

  1. … 9 more files in changeset.
SAK-40523 - Samigo: Cannot save assessment work from URL takes (#6186)

(cherry picked from commit a3f2b0b39e90b39edb7490b22ae516868795c1a1)

  1. … 9 more files in changeset.
SAM-3372 Samigo main screen redesign (#5377)

* SAM-3372 Samigo main screen redesign

* SAM-3372 Requested changes on Samigo main screen redesign

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

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

(cherry picked from commit 96cc316037e695f36337f17a56ae47569662230e)

  1. … 333 more files in changeset.
SAM-3106 several modifications around date timezone manipulations (#3908)

* SAM-3106 several modifications around dates primarily to handle the use case of instructor in a different time zone than the server. This change does less manipulation on dates with the assumption that the instructor is inputting dates using the institutional/server timezone.

* SAM-3106 modify for client timezone used by jquery tablesorter

* SAM-3106 revert some previous modifications to match behavior in assignments and announcements

  1. … 5 more files in changeset.
SAM-3106 several modifications around date timezone manipulations (#3908)

* SAM-3106 several modifications around dates primarily to handle the use case of instructor in a different time zone than the server. This change does less manipulation on dates with the assumption that the instructor is inputting dates using the institutional/server timezone.

* SAM-3106 modify for client timezone used by jquery tablesorter

* SAM-3106 revert some previous modifications to match behavior in assignments and announcements

(cherry picked from commit f6a515be461dfafdaad8b89e3d2cc1c4a663c35a)

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

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

  1. … 1491 more files in changeset.
SAM-1999 Show Last Modified date after import

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

SAM-2234: Importing invalid XML file generates un-recoverable NPE crash

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

  1. … 2 more files in changeset.
SAM-2094: Exception is thrown when taking or previewing an assessment

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

  1. … 1 more file in changeset.
SAM-1663 use the newer external GB interface

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

  1. … 12 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. … 534 more files in changeset.
SAM-1347: Importing assessment with (large) attachments as ZIP file fails with error message

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

  1. … 8 more files in changeset.
SAM-1094

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

SAM-1094

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

  1. … 1 more file in changeset.