Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-45025 use new AlphaNumericComparator in samigo, assignments, lessons (#9057)

Co-authored-by: Earle Nietzel <earle@longsight.com>

    • -30
    • +21
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-45025 use new AlphaNumericComparator in samigo, assignments, lessons (#9057)

Co-authored-by: Earle Nietzel <earle@longsight.com>

(cherry picked from commit 7bd3f7d53cd684381a2f58deb45541a1f8b5fb5f)

    • -30
    • +21
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-45025 use new AlphaNumericComparator in samigo, assignments, lessons (#9057)

Co-authored-by: Earle Nietzel <earle@longsight.com>

(cherry picked from commit 7bd3f7d53cd684381a2f58deb45541a1f8b5fb5f)

Conflicts:

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

    • -30
    • +21
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44614 Make it clearer that min and neg can't be used at the same time. (#8958)

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

  1. … 4 more files in changeset.
SAK-44614 Make it clearer that min and neg can't be used at the same time. (#8958)

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

(cherry picked from commit dda10357eb5d38d333f80d0204ac55d8f6019149)

  1. … 4 more files in changeset.
SAK-44614 Make it clearer that min and neg can't be used at the same time. (#8958)

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

(cherry picked from commit dda10357eb5d38d333f80d0204ac55d8f6019149)

  1. … 4 more files in changeset.
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-44755 samigo-app using mixed apache commons libs (#8877)

* SAK-44755 samigo-app using mixed apache commons libs

* Update commons-text scope in master

* commons add libs to pom

* commons-text remove elasticsearch override

(cherry picked from commit a364c939a59c53fe66e4927b9ea14e06869d2fbf)

  1. … 6 more files in changeset.
SAK-44755 samigo-app using mixed apache commons libs (#8877)

* SAK-44755 samigo-app using mixed apache commons libs

* Update commons-text scope in master

* commons add libs to pom

* commons-text remove elasticsearch override

  1. … 6 more files in changeset.
SAK-44755 samigo-app using mixed apache commons libs (#8877)

* SAK-44755 samigo-app using mixed apache commons libs

* Update commons-text scope in master

* commons add libs to pom

* commons-text remove elasticsearch override

(cherry picked from commit a364c939a59c53fe66e4927b9ea14e06869d2fbf)

  1. … 6 more files in changeset.
SAK-44722: SAMIGO - Uncategorized text is hardcoded (#8853)

    • -1
    • +1
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44722: SAMIGO - Uncategorized text is hardcoded (#8853)

(cherry picked from commit ca3ec833ab22306364a6a4ffe98be39ec5506b71)

    • -1
    • +1
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44722: SAMIGO - Uncategorized text is hardcoded (#8853)

(cherry picked from commit ca3ec833ab22306364a6a4ffe98be39ec5506b71)

    • -1
    • +1
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44552 Disable min points if partial credit selected (#8761)

* SAK-44552 Disable min points if partial credit selected

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

... or if negative marking has been selected

* Remove commented block from authoring.js

(cherry picked from commit 5cf39a358947a1c3deee3bb1fe83963be5242ce5)

  1. … 3 more files in changeset.
SAK-44552 Disable min points if partial credit selected (#8761)

* SAK-44552 Disable min points if partial credit selected

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

... or if negative marking has been selected

* Remove commented block from authoring.js

(cherry picked from commit 5cf39a358947a1c3deee3bb1fe83963be5242ce5)

  1. … 3 more files in changeset.
SAK-44552 Disable min points if partial credit selected (#8761)

* SAK-44552 Disable min points if partial credit selected

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

... or if negative marking has been selected

* Remove commented block from authoring.js

  1. … 3 more files in changeset.
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-44383 samigo > provide return link on DD UI for URL delivered quizzes (#8641)

(cherry picked from commit 3ba38463ca166d3a790fcc539e0a585745a7b17a)

(cherry picked from commit 886ff20cd2715077bfcb6b3ab6d3df1d4fd976ff)

    • -12
    • +15
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44383 samigo > provide return link on DD UI for URL delivered quizzes (#8641)

(cherry picked from commit 3ba38463ca166d3a790fcc539e0a585745a7b17a)

    • -12
    • +15
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44383 samigo > provide return link on DD UI for URL delivered quizzes (#8641)

(cherry picked from commit 3ba38463ca166d3a790fcc539e0a585745a7b17a)

    • -12
    • +15
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44383 samigo > provide return link on DD UI for URL delivered quizzes (#8641)

    • -12
    • +15
    ./PublishedAssessmentSettingsBean.java
  1. … 2 more files in changeset.
SAK-44357 modified date minutes and seconds are flipped (#8623)

(cherry picked from commit 93af84a1dca98393a01d598f35304093f6d117de)

SAK-44357 modified date minutes and seconds are flipped (#8623)

(cherry picked from commit 93af84a1dca98393a01d598f35304093f6d117de)

SAK-44357 modified date minutes and seconds are flipped (#8623)

(cherry picked from commit 93af84a1dca98393a01d598f35304093f6d117de)

SAK-44357 modified date minutes and seconds are flipped (#8623)

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
    • +2
    ./PublishRepublishNotificationBean.java
    • -2
    • +2
    ./PublishedAssessmentSettingsBean.java
  1. … 68 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
    • +2
    ./PublishRepublishNotificationBean.java
    • -3
    • +2
    ./PublishedAssessmentSettingsBean.java
  1. … 69 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

    • -1
    • +2
    ./PublishRepublishNotificationBean.java
    • -3
    • +2
    ./PublishedAssessmentSettingsBean.java
  1. … 70 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

    • -1
    • +2
    ./PublishRepublishNotificationBean.java
    • -3
    • +2
    ./PublishedAssessmentSettingsBean.java
  1. … 70 more files in changeset.