Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-45605 - Using a better way to get fckeditor content so it can be submitted. The old way seemed to be getting additional markup that we don't want. Also, there was an issue actually saving the new syllabus data. Possibly related to changes that came in with SAK-44784?

(cherry picked from commit e3b44ada703d9668d5a9a1f31895d1f94c4cb8eb)

  1. … 1 more file in changeset.
SAK-45605 - Using a better way to get fckeditor content so it can be submitted. The old way seemed to be getting additional markup that we don't want. Also, there was an issue actually saving the new syllabus data. Possibly related to changes that came in with SAK-44784?

  1. … 1 more file in changeset.
SAK-45605 - Using a better way to get fckeditor content so it can be submitted. The old way seemed to be getting additional markup that we don't want. Also, there was an issue actually saving the new syllabus data. Possibly related to changes that came in with SAK-44784?

(cherry picked from commit e3b44ada703d9668d5a9a1f31895d1f94c4cb8eb)

  1. … 1 more file in changeset.
SAK-44784 Syllabus move persistence from hbm to jpa (#8901)

  1. … 27 more files in changeset.
SAK-43499 Deprecated utils.FormattedText => api.FormattedText (#8112)

impl cover => api

  1. … 6 more files in changeset.
SAK-41648 Admin Tool: commons-lang => commons-lang3 (#6768)

  1. … 4 more files in changeset.
SAK-41648 Admin Tool: commons-lang => commons-lang3 (#6768)

(cherry picked from commit 6e855ac0ac83cdde67165c32b2cb82bfcdfba561)

  1. … 4 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. … 1286 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 Lombok @CommonsLog migrated to @Slf4j

  1. … 32 more files in changeset.
SAK-30141 - Syllabus permissions - Mispelling in SQL script

Fixed up all of the permission checks, wasn't checking correct

permissions for saving or in the Entity. Fixed up a permission check on

the UI.

  1. … 6 more files in changeset.
SAK-30141 - Syllabus permissions - Mispelling in SQL script

Fixed up all of the permission checks, wasn't checking correct

permissions for saving or in the Entity. Fixed up a permission check on

the UI.

  1. … 6 more files in changeset.
SAK-29988 Usability improvements for Syllabus

  1. … 8 more files in changeset.
SAK-26142 Include ability to add syllabus content (and not just a syllabus title) to Add syllabus item workflow

  1. … 2 more files in changeset.
SAK-26141 Access settings for syllabus items are not available except in Bulk Edit view

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

  1. … 2 more files in changeset.
SAK-27817 Add property to make newly created syllabus items published

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

SAK-25894 Linking a resource does not open in a new tab from Syllabus tool

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

SAK-23903 Syllabus Calendar Items need to keep linked after import

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

  1. … 4 more files in changeset.
SAK-23355 fix description config for the syllabus entity provider by implementing DescribePropertiesable

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

  1. … 1 more file in changeset.
SAK-23451 Allow inline editing for Instructors in Table of Contents view for Syllabus

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

  1. … 4 more files in changeset.
SAK-23451 Allow inline editing for Instructors in Table of Contents view for Syllabus

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

SAK-23451 Allow inline editing for Instructors in Table of Contents view for Syllabus

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

    • -60
    • +192
    ./SyllabusEntityProvider.java
  1. … 23 more files in changeset.
SAK-23342 Create a Table of Contents Style view for Syllabus cleaned up some un-used code

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

SAK-23342 Create a Table of Contents Style view for Syllabus TOC view now allows drag and drop re-ordering for instructors

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

  1. … 5 more files in changeset.
SAK-23355 add syllabus entity provider

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

    • -0
    • +252
    ./SyllabusEntityProvider.java
  1. … 3 more files in changeset.