Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4884 Generate new UUID for new QB question version

UUID has to identify uniquely an exact version, not only the question in

general.

  1. … 3 more files in changeset.
LDEV-5143 Allow promoting to leader a learner who did not reach activity

  1. … 19 more files in changeset.
LDEV-5143 Do not allow changing Q&A leader after response was submitted

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

    • -21
    • +20
    ./lamsfoundation/lams/tool/qa/dto/GroupDTO.java
  1. … 29 more files in changeset.
LDEV-5138 Set leader only on his activity entry, not on any user entry

  1. … 24 more files in changeset.
LDEV-5114 Add "Add as new version" button to Q&A

  1. … 2 more files in changeset.
LDEV-5070 Remove a temporary workaround introduced in LDEV-4841

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

  1. … 5 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

  1. … 33 more files in changeset.
LDEV-5050 Control if question is required from Q&A authoring

  1. … 3 more files in changeset.
LDEV-4847 Fix importing QB question with existing UUID

  1. … 7 more files in changeset.
LDEV-5050 Make all TBL template questions required

  1. … 7 more files in changeset.
LDEV-5050 Transform "is required" attribute when importing a LD

  1. … 2 more files in changeset.
LDEV-5050 Move "is required" attribute from QB question to tools

  1. … 22 more files in changeset.
LDEV-4746 Fix QB answer removal on activity removal

Using JPQL caused errors, so a native query has been used.

  1. … 4 more files in changeset.
LDEV-4998 Protect activity default questions from modification

  1. … 5 more files in changeset.
LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

  1. … 3 more files in changeset.
LDEV-4976 Add DB cascades to reflect Hibernate inheritance

  1. … 3 more files in changeset.
LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

  1. … 57 more files in changeset.
LDEV-4962 Use complex portrait UUID in tools

    • -3
    • +3
    ./lamsfoundation/lams/tool/qa/model/QaUsrResp.java
  1. … 24 more files in changeset.
LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

    • -3
    • +3
    ./lamsfoundation/lams/tool/qa/model/QaUsrResp.java
  1. … 24 more files in changeset.
LDEV-4846 Set QB question content folder when creating via TBL template

  1. … 3 more files in changeset.
LDEV-4947 Add questions from imported LD to user private QB collection

  1. … 3 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 72 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 96 more files in changeset.
Merge branch 'master' into v4.0

# Conflicts:

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

  1. … 10 more files in changeset.
LDEV-2866 Name tools' controller classes uniformly

  1. … 18 more files in changeset.
LDEV-4932 Add CSRF to QB bank calls

  1. … 32 more files in changeset.
Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

  1. … 92 more files in changeset.
LDEV-4932 Adding CSRF for QA authoring

- Add/edit questions

- remove questions

- Add and remove conditions

  1. … 4 more files in changeset.