lams_tool_scratchie

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4769 Update translations English, Spanish

  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

  1. … 58 more files in changeset.
LDEV-5328 Squash DB patches and update versions

    • -129
    • +118
    ./db/sql/create_lams_tool_scratchie.sql
  1. … 142 more files in changeset.
LDEV-5083 Add burning questions count badges next to question in tRAT

    • -0
    • +15
    ./web/pages/monitoring/studentChoices.jsp
    • -0
    • +11
    ./web/pages/monitoring/studentChoices5.jsp
LDEV-5083 Change name and icon of "Hide Student Choices" button

    • -1
    • +1
    ./web/pages/monitoring/studentChoices5.jsp
  1. … 4 more files in changeset.
LDEV-5083 Improve table and icons colouring

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

    • -34
    • +32
    ./web/pages/tblmonitoring/teams.jsp
    • -44
    • +0
    ./web/pages/tblmonitoring/teams5.jsp
    • -100
    • +92
    ./web/pages/tblmonitoring/tra.jsp
    • -155
    • +0
    ./web/pages/tblmonitoring/tra5.jsp
  1. … 55 more files in changeset.
LDEV-5324 Do not call missing function on validation success

    • -1
    • +0
    ./web/pages/authoring/parts/addVsa.jsp
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

  1. … 2 more files in changeset.
LDEV-5083 Show Burning Question nav button only if they are enabled

  1. … 3 more files in changeset.
LDEV-4928 While exporting skip empty VSA options

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

LDEV-4604 Hide "Burning Questions" header if there are none

LDEV-5019 Add "session finished" icon in Scratchie Student Choices table

    • -1
    • +7
    ./web/pages/monitoring/studentChoices.jsp
LDEV-5083 Add custom JSP tags than will be used in next version

    • -0
    • +40
    ./web/WEB-INF/tags/Dropdown.tag
    • -0
    • +29
    ./web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./web/WEB-INF/tags/Panel.tag
  1. … 93 more files in changeset.
LDEV-5083 Improve accessibility by allowing focus with TAB button

  1. … 4 more files in changeset.
LDEV-5083 Reduce empty spaces on TBL pages

  1. … 4 more files in changeset.
LDEV-5083 Add missing custom JSP tags

    • -0
    • +45
    ./web/WEB-INF/tags/Input.tag
    • -0
    • +46
    ./web/WEB-INF/tags/Switch.tag
  1. … 62 more files in changeset.
LDEV-5083 Add missing custom JSP tags to TLD

  1. … 32 more files in changeset.
LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

    • -2
    • +3
    ./web/pages/monitoring/studentChoices5.jsp
  1. … 34 more files in changeset.
LDEV-5083 Update all data on tRAT student choices using Flux

    • -176
    • +35
    ./web/pages/monitoring/studentChoices5.jsp
    • -0
    • +138
    ./web/pages/monitoring/studentChoicesTable.jsp
LDEV-5083 Rewrite TBL Peer Review tab to new UI

  1. … 5 more files in changeset.
LDEV-5083 Rewrite TBL Burnign Questions tab to new UI

    • -0
    • +229
    ./web/pages/monitoring/parts/burningQuestions5.jsp
  1. … 2 more files in changeset.
LDEV-5083 Rewrite TBL RAT tabs' modals to new UI

    • -56
    • +51
    ./web/pages/monitoring/studentChoices5.jsp
  1. … 2 more files in changeset.
LDEV-5083 Rewrite TBL tRAT & student choices tab to new UI

    • -0
    • +386
    ./web/pages/monitoring/studentChoices5.jsp
    • -0
    • +155
    ./web/pages/tblmonitoring/tra5.jsp
  1. … 4 more files in changeset.
LDEV-4769 Updating Norwegian

  1. … 4 more files in changeset.
LDEV-5083 Rewrite TBL Teams tab modals to new UI

    • -0
    • +44
    ./web/pages/tblmonitoring/teams5.jsp
  1. … 7 more files in changeset.
LDEV-5317 Fix thread preventing server from shutting down

Using <c:import> in cross-module context prevents WildFly from shutting

down properly. The mechanism was replaced with an Ajax call.

    • -7
    • +14
    ./web/pages/monitoring/studentChoices.jsp
  1. … 8 more files in changeset.
LDEV-4769 Updating Chinese, English, Norwegian Greek, and Spanish

  1. … 26 more files in changeset.
LDEV-5317 Move timeLimit.jsp from its own directory

    • -1
    • +1
    ./web/pages/monitoring/studentChoices.jsp
  1. … 5 more files in changeset.