lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4407 Move shared classes from lams_learning to lams_common

This is done in order to eliminate the need for other projects to

depend on lams_learning.

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

  1. … 63 more files in changeset.
LDEV-4407 Move shared contentrepository classes to lams_common

This is done in order to eliminate the need for other projects to

be dependent on lams_contentrepository.

  1. … 3 more files in changeset.
LDEV-4502: Google content shows in popup window

LDEV-4407 Move ped planner stuff to lams_planer

All ped planner related code moved out from lams_central and

lams_common to lams_planer. Although

PedagogicalPlannerActivityForm.java was moved from

lams_central to lams_common to be accessible by LAMS tools.

    • -193
    • +0
    /lams_central/web/css/pedagogicalPlanner.css
    • -103
    • +0
    /lams_central/web/tutorialVideo.jsp
  1. … 10 more files in changeset.
Merge branch LDEV-4499

LDEV-4499 Answers are timestamped in the export spreadsheet

Merge branch 'LDEV-4500'

LDEV-4500 Check if all activities in TBL sequence are grouped

    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
LDEV-4498 Portrait displayed on user search screen.

Merge branch 'LDEV-4497'

LDEV-4497 Split content folder ID when browsing uploaded files

LDEV-4497 Split authored image path when saving

LDEV-4497 Read LD thumbs from either old or new dir structure

Also focus only on SVG images as PNGs are not supported anymore.

Also use only one source of LD thumbs top dir.

LDEV-4497 Split LD thumb path when saving

LDEV-4413 Share Resources no longer requires a title

LDEV-4495 Able to rerate all already entries when max rate used.

LDEV-4496 People from the same group get the "same shuffle"

Merge branch 'LDEV-4494'

LDEV-4494 Avoid cloning/importing lessons created by old NTU plugin

    • -1
    • +6
    /lams_bb_integration/RELEASE_NOTES.TXT
LDEV-3805 Reflections are paged

LDEV-3805 Reflections are paged.

LDEV-4421 Comments allowed for authored items in Share Resources

    • -1
    • +27
    /lams_admin/web/WEB-INF/tags/Comments.tag
    • -1
    • +1
    /lams_central/web/comments/topicview.jsp
  1. … 51 more files in changeset.
LDEV-4421 Comments allowed for authored items in Share Resources

    • -0
    • +7
    /lams_tool_larsrc/web/pages/authoring/parts/ratings.jsp
    • -0
    • +31
    /lams_tool_larsrc/web/pages/monitoring/comments.jsp
LDEV-4478 Bump the version to 1.2.26

    • -0
    • +2
    /lams_bb_integration/RELEASE_NOTES.TXT
LDEV-4491 Bootstrap Pedagogical Planner pages

    • -4
    • +0
    /lams_central/web/css/pedagogicalPlanner.css
LDEV-4492 Fix wrong casting activityDAO to ActivityDAO

It has to be IActivityDAO instead.

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

  1. … 31 more files in changeset.
LDEV-4490 Fix exceptions caused by NULL ConfidenceLevel columns

LDEV-4487 Toggle display activity scores option in monitor

    • -0
    • +18
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -0
    • +15
    /lams_monitoring/web/monitorTour.jsp