lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 SubmitFiles migration in progress

    • -2
    • +2
    /lams_tool_sbmt/web/learner/notebook.jsp
LDEV-4440 Noticeboard migration in progress

    • -2
    • +4
    /lams_tool_nb/web/WEB-INF/tags/Page.tag
    • -51
    • +39
    /lams_tool_nb/web/WEB-INF/tags/TextSearch.tag
    • -1
    • +1
    /lams_tool_nb/web/authoring/authoring.jsp
    • -8
    • +13
    /lams_tool_nb/web/learnerContent.jsp
LDEV-4440 Corrected manage leaders functionality

Merge branch 'LDEV-4627'

LDEV-4627 Set country and locale for users created via integrations

New locale detecting algorithm:

1. Check whether we have exactly the same locale. If we do - select it.

2. Grab the first two letters of the provided locale (which we assume to

be the language code), and map it to one of our locales of the

respective language. If we have multiple ones - choose the first one

from the list indiscriminately.

3. If we don't have locale of such language - use the server default

one.

LDEV-4627 Courses doesn't have specific locale any longer

LDEV-4627 Make sure country has an appropriate value

LDEV-4440 Corrected editactivity.jsp - survey tool

LDEV-4440 Leader tool corrected leaderselection.jsp

    • -313
    • +0
    /lams_tool_leader/web/WEB-INF/validator-rules.xml
LDEV-4440 new paths at sbmt tool

    • -7
    • +0
    /lams_tool_sbmt/web/authoring/advance.jsp
    • -8
    • +8
    /lams_tool_sbmt/web/common/messages.jsp
    • -1
    • +1
    /lams_tool_sbmt/web/learner/notebook.jsp
LDEV-4440 Sbmt - authoring migration

LDEV-4440 Leader tool with nostruts library

    • -52
    • +39
    /lams_tool_leader/web/WEB-INF/tags/TextSearch.tag
    • -1
    • +1
    /lams_tool_leader/web/common/messages.jsp
LDEV-4440 TaskList - learning - add task fixed

LDEV-4440 TaskList - learning - notebook fixed

LDEV-4440 Notebook, corrected editActivity.jsp

LDEV-4440 TaskList monitoring - fixed

LDEV-4440 Notebook revised

LDEV-4440 Learning - upload files in progress

    • -0
    • +2
    /lams_tool_task/web/common/messages.jsp
LDEV-4440 Corrected notebook with nostruts library

  1. … 8 more files in changeset.
Merge to lams31 after a vital commit to master

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
LDEV-4440 Fixed authoring and learning

    • -1
    • +1
    /lams_tool_task/web/pages/authoring/advance.jsp
LDEV-4634 Update response in case answer hasn't been changed

Otherwise we end up loosing new values for confidence level and attempt

time.

Merge branch 'LDEV-4609'

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • -7
    • +84
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4440 update Page.tag and TextSearch.tag

    • -2
    • +2
    /lams_tool_sbmt/web/WEB-INF/tags/Page.tag
    • -51
    • +39
    /lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag
    • -313
    • +0
    /lams_tool_sbmt/web/WEB-INF/validator-rules.xml
Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
  1. … 12 more files in changeset.
LDEV-4440 Improvement of the Task List migration

    • -3
    • +4
    /lams_tool_task/web/WEB-INF/tags/Page.tag
    • -52
    • +39
    /lams_tool_task/web/WEB-INF/tags/TextSearch.tag
    • -186
    • +0
    /lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
    • -8
    • +0
    /lams_tool_task/web/common/messages.jsp
    • -1
    • +1
    /lams_tool_task/web/pages/learning/learning.jsp
LDEV-4440 Notebook with post method

LDEV-4440 Survey ready

LDEV-4440 Use method call instead of redirect

LDEV-4402 Upgrade to MySQL 8.0.11