lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 29 Jan 2018
4:41 pm

Marcin Cieslak

Merge branch 'LDEV-4454'

Conflicts:

lams_central/web/includes/javascript/chart.js

Options
    • -15
    • +48
    ./web/includes/javascript/chart.js
  2. … 2 more files in changeset.
12:14 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 First cut of audit log screen implemented.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  2. … 19 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +0
    ./.classpath
    • -22
    • +21
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
  3. … 77 more files in changeset.
7:24 am

Andrey Balan

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.

Options
    • -1
    • +0
    ./.classpath
  2. … 77 more files in changeset.
Wednesday 24 Jan 2018
2:22 am

Andrey Balan

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.

Options
    • -1
    • +0
    ./build.xml
    • -8
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -22
    • +0
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -2030
    • +0
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -115
    • +0
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -149
    • +0
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
    • -263
    • +0
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • -78
    • +0
    ./web/WEB-INF/struts-config.xml
    • -193
    • +0
    ./web/css/pedagogicalPlanner.css
    • -2
    • +2
    ./web/includes/javascript/openUrls.js
    • -379
    • +0
    ./web/includes/javascript/pedagogicalPlanner.js
    • -103
    • +0
    ./web/tutorialVideo.jsp
  14. … 12 more files in changeset.
Monday 22 Jan 2018
9:08 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./web/authoring/authoring.jsp
    • -3
    • +57
    ./web/includes/javascript/authoring/authoringGeneral.js
Thursday 18 Jan 2018
6:41 pm

Marcin Cieslak

LDEV-4497 Split content folder ID when browsing uploaded files

Options
    • -1
    • +8
    ./web/ckeditor/filemanager/browser/default/browser.html
5:47 pm

Marcin Cieslak

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.

Options
    • -25
    • +10
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
  4. … 3 more files in changeset.
5:23 pm

Marcin Cieslak

LDEV-4497 Split LD thumb path when saving

Options
    • -8
    • +14
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
1:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4413 Share Resources no longer requires a title

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
  2. … 4 more files in changeset.
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +14
    ./web/includes/javascript/rating.js
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/comments/CommentConstants.java
    • -6
    • +14
    ./src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
    • -8
    • +8
    ./web/comments/new.jsp
    • -1
    • +1
    ./web/comments/topicview.jsp
  6. … 61 more files in changeset.
Saturday 23 Dec 2017
4:43 am

Andrey Balan

LDEV-4491 Bootstrap Pedagogical Planner pages

Options
    • -4
    • +0
    ./web/css/pedagogicalPlanner.css
    • -4
    • +5
    ./web/tutorialVideo.jsp
4:39 am

Andrey Balan

LDEV-4492 Fix wrong casting activityDAO to ActivityDAO

It has to be IActivityDAO instead.

Options
    • -38
    • +24
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
  4. … 43 more files in changeset.
Wednesday 06 Dec 2017
10:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Tweaking screen size for iPad

Options
    • -1
    • +1
    ./web/includes/javascript/main.js
10:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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.

Options
    • -2
    • +2
    ./web/includes/javascript/main.js
    • -45
    • +117
    ./web/includes/javascript/orgGroup.js
    • -2
    • +1
    ./web/includes/javascript/orgGrouping.js
    • -35
    • +36
    ./web/orgGroup.jsp
  5. … 1 more file in changeset.
5:42 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Updating Greek

Options
    • -3
    • +16
    ./conf/language/lams/ApplicationResources_el_GR.properties
Tuesday 05 Dec 2017
10:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4484 Print Grouping Page

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./web/css/orgGroup.scss
    • -0
    • +15
    ./web/includes/javascript/orgGroup.js
    • -0
    • +1
    ./web/includes/javascript/orgGrouping.js
    • -0
    • +1
    ./web/orgGroup.jsp
  6. … 6 more files in changeset.
Sunday 03 Dec 2017
8:24 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4446: display bigger picture

Display bigger picture when changing portrait

Options
    • -2
    • +2
    ./web/portrait.jsp
Saturday 02 Dec 2017
11:54 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

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

Options
    • -0
    • +2
    ./web/includes/javascript/rating.js
Friday 01 Dec 2017
10:39 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

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

Options
    • -1
    • +1
    ./web/includes/javascript/chart.js
9:50 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

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

Options
    • -1
    • +3
    ./web/includes/javascript/chart.js
1:53 am

Andrey Balan

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

Options
    • -18
    • +29
    ./src/java/org/lamsfoundation/lams/web/GradebookServlet.java
Thursday 30 Nov 2017
4:26 am

Andrey Balan

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.

Options
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -1
    • +4
    ./web/includes/javascript/webrtc-capturestill.js
    • -27
    • +29
    ./web/portrait.jsp
  4. … 2 more files in changeset.
Monday 27 Nov 2017
7:30 pm

Marcin Cieslak

LDEV-4469 Implement portrait batch upload servlet

Options
    • -18
    • +19
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 6 more files in changeset.
7:29 pm

Marcin Cieslak

LDEV-4469 Remove obsolete file

Options
    • -165
    • +0
    ./src/java/org/lamsfoundation/lams/util/PortraitUtils.java
Thursday 23 Nov 2017
10:37 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457: Chosen Grouping screen layout tweaked

Options
    • -5
    • +8
    ./web/css/orgGroup.scss
    • -3
    • +3
    ./web/orgGroup.jsp
5:06 am

Marcin Cieslak

LDEV-4454 Add bar chart

Options
    • -0
    • +6
    ./web/includes/javascript/chart.js
  2. … 4 more files in changeset.
4:14 am

Marcin Cieslak

LDEV-4454 Add pie chart, colours to badges and missing voters.

Options
    • -65
    • +92
    ./web/includes/javascript/chart.js
  2. … 5 more files in changeset.