lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5386 Rename main IDEA project for consistency with other LAMS modules

    • -0
    • +8
    /idea_project/.idea/.gitignore
    • -0
    • +49
    /idea_project/.idea/ant.xml
  1. … 11 more files in changeset.
LDEV-5386 Add per moduule IntelliJ configuration files

    • -0
    • +9
    /3rdParty_sources/3rdParty_sources.iml
    • -0
    • +19
    /lams_admin/lams_admin.eml
    • -0
    • +2
    /lams_admin/lams_admin.iml
    • -0
    • +41
    /lams_bb_integration/lams_bb_integration.eml
    • -0
    • +2
    /lams_bb_integration/lams_bb_integration.iml
    • -0
    • +4
    /lams_build/lams_build.eml
    • -0
    • +12
    /lams_build/lams_build.iml
    • -0
    • +31
    /lams_central/lams_central.eml
    • -0
    • +2
    /lams_central/lams_central.iml
    • -0
    • +40
    /lams_common/lams_common.eml
    • -0
    • +13
    /lams_common/lams_common.iml
    • -0
    • +7
    /lams_contentrepository/lams_contentrepository.eml
    • -0
    • +2
    /lams_contentrepository/lams_contentrepository.iml
    • -0
    • +25
    /lams_gradebook/lams_gradebook.eml
    • -0
    • +2
    /lams_gradebook/lams_gradebook.iml
  1. … 73 more files in changeset.
LDEV-5386 Add top level IntelliJ configuratioj folder

    • -0
    • +8
    /idea-project/.idea/.gitignore
    • -0
    • +49
    /idea-project/.idea/ant.xml
    • -0
    • +50
    /idea-project/.idea/codeStyles/Project.xml
    • -0
    • +5
    /idea-project/.idea/codeStyles/codeStyleConfig.xml
    • -0
    • +9
    /idea-project/.idea/compiler.xml
    • -0
    • +6
    /idea-project/.idea/jpa-buddy.xml
    • -0
    • +54
    /idea-project/.idea/libraries/3rdParty.xml
    • -0
    • +14
    /idea-project/.idea/misc.xml
    • -0
    • +53
    /idea-project/.idea/modules.xml
    • -0
    • +6
    /idea-project/.idea/vcs.xml
    • -0
    • +8
    /idea-project/idea_project.iml
LDEV-5386 Clean up .classpath files to make them compatible with IntelliJ

  1. … 19 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

SP-4 Make hash check case insensitive

LDEV-5384 Optionally require all ratings in rubrics in Peer Review

LDEV-5384 Fixing descriptive labels for SAPA and SPA

email.label.spa.sapa.info.title

email.label.spa.info

email.label.sapa.info

LDEV-5384 Fixing descriptive labels for SAPA and SPA

email.label.spa.sapa.info.title

email.label.spa.info

email.label.sapa.info

LDEV-5083 Make img-responsive class behave like in Bootstrap 3

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

SP-4 Secure access to enrolment servlet

SP-4 Skip event log when disabling users via batch enrolment processing

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

Merge branch 'LDEV-5385' into v4.6

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

LDEV-5383 Fix "select role for all users" button

LDEV-5385 Allow real numbers in Scratchie marks

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

Conflicts:

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_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

Merge branch 'LDEV-5383' into v4.6

LDEV-5383 Allow adding user to all lessons in a course

LDEV-4501 Prevent exceptions on missing user references from LogEvents

This time in entity there is no reference to User objects. It reflects

DB structure without foreign key: there is just integer ID.

LDEV-5350 Do not remove groups used for branching on spreadsheet upload

LDEV-5384 Make selected cells' larger

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

LDEV-4501 Prevent exceptions on missing user references from LogEvents

Merge branch 'LDEV-5384' into v4.6

LDEV-5384 Make selected cells' text bold

LDEV-5384 Move Expand All button to right

LDEV-5384 Add warning on leaving rubrics if not everyone was rated