lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4413 Share Resources no longer requires a title

  1. … 4 more files in changeset.
LDEV-4495 Able to rerate all already entries when max rate used.

    • -1
    • +14
    ./web/includes/javascript/rating.js
LDEV-4421 Comments allowed for authored items in Share Resources

  1. … 61 more files in changeset.
LDEV-4491 Bootstrap Pedagogical Planner pages

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. … 43 more files in changeset.
LDEV-4457 Tweaking screen size for iPad

LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

    • -45
    • +117
    ./web/includes/javascript/orgGroup.js
    • -2
    • +1
    ./web/includes/javascript/orgGrouping.js
  1. … 1 more file in changeset.
LDEV-4054: Updating Greek

Updating Greek

LDEV-4484 Print Grouping Page

    • -0
    • +15
    ./web/includes/javascript/orgGroup.js
    • -0
    • +1
    ./web/includes/javascript/orgGrouping.js
  1. … 6 more files in changeset.
LDEV-4446: display bigger picture

Display bigger picture when changing portrait

LDEV-4480 Acknowledgement when submitting a comment for a Q&A response

LDEV-4475 Missing information in Legend for Pie Chart when more than 7 items

LDEV-4475 Missing information in Legend for Pie Chart when more than 7 items

LDEV-4478 Make sure user has GROUP_MANAGER role

When displaying GRADEBOOK_MONITOR_ORGANISATION_URL we need to make

sure user has GROUP_MANAGER role

LDEV-4479 Switch portrait images format to JPG

As long as JPG files are much more compact and we expect a lot of

them to be stored in LAMS (users' portraits primarily), there is

a need to switch to JPG.

  1. … 2 more files in changeset.
LDEV-4469 Implement portrait batch upload servlet

  1. … 6 more files in changeset.
LDEV-4469 Remove obsolete file

LDEV-4457: Chosen Grouping screen layout tweaked

LDEV-4454 Add bar chart

  1. … 4 more files in changeset.
LDEV-4454 Add pie chart, colours to badges and missing voters.

    • -65
    • +92
    ./web/includes/javascript/chart.js
  1. … 5 more files in changeset.
LDEV-4473 Add bootstrap.js when it's not available on page

  1. … 30 more files in changeset.
LDEV-4457 Create groupings based on file upload

    • -0
    • +126
    ./web/includes/javascript/orgGroup.js
  1. … 10 more files in changeset.
LDEV-4436 Fixing progress bar css

Removed 'min-height' parameter as it was causing nav.sidebar to

appear larger than its descendant .container-fluid div.

Besides, removed box-shadow parameter from .container-fluid as

its parent already has it.

LDEV-4454 Add Kumalive poll setup front end

  1. … 4 more files in changeset.
LDEV-4436 Ability to change portrait in learner

    • -0
    • +25
    ./web/includes/javascript/dialog.js
  1. … 30 more files in changeset.
LDEV-4436 Dialog CSS rules to be available in learning as well

    • -0
    • +70
    ./web/css/_dialogs.scss
LDEV-4453 Fix weights calculation on LD save when output changed

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

  1. … 6 more files in changeset.
LDEV-4366: adding labels