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
Friday 16 Feb 2018
5:13 pm

Marcin Cieslak

LDEV-4518 Adjust info dialog layout

Options
    • -0
    • +16
    ./web/css/_authoring_base.scss
5:13 pm

Marcin Cieslak

LDEV-4518 Close info dialog on click and not after delay

Also make it easier to use.

Options
    • -25
    • +12
    ./web/includes/javascript/authoring/authoringGeneral.js
Thursday 15 Feb 2018
4:35 pm

Marcin Cieslak

LDEV-4517 Put TBL not grouped warning in info dialog rather than alert

Options
    • -3
    • +14
    ./web/includes/javascript/authoring/authoringGeneral.js
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Wednesday 14 Feb 2018
8:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4510 Small authoring template UI tweaks

Minimise/Grow buttons, scroll to new fields and number of groups

defaults to 2.

Options
    • -0
    • +5
    ./web/authoring/template/comms.jsp
    • -1
    • +1
    ./web/authoring/template/grouping.jsp
    • -0
    • +8
    ./web/css/_authoring_base.scss
    • -2
    • +1
    ./web/includes/javascript/authoring/authoringMenu.js
3:07 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4515 Profile, Authoring window correct size for Purple theme

Options
    • -0
    • +1
    ./web/css/purple_learner.scss
    • -0
    • +1
    ./web/css/purple_main.scss
11:46 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4510 TBL authoring template introduction text I18n'd

Options
    • -0
    • +31
    ./web/authoring/template/genericintro.jsp
    • -1
    • +1
    ./web/authoring/template/tbl/tbl.jsp
    • binary
    ./web/authoring/template/tbl/tbl.png
    • -14
    • +0
    ./web/authoring/template/tbl/tblintro.jsp
    • -2
    • +2
    ./web/errorpages/404.jsp
  6. … 3 more files in changeset.
Tuesday 13 Feb 2018
8:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4510 Team based learning template added to authoring

Look and feel done, validation working.

Options
    • -0
    • +49
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./conf/language/lams/TBLResources.properties
    • -3
    • +3
    ./conf/scss/_bootstrap-variables.scss
    • -0
    • +119
    ./src/java/org/lamsfoundation/lams/authoring/template/AssessMCAnswer.java
    • -0
    • +72
    ./src/java/org/lamsfoundation/lams/authoring/template/Option.java
    • -0
    • +101
    ./src/java/org/lamsfoundation/lams/authoring/template/SurveyQuestion.java
    • -0
    • +188
    ./src/java/org/lamsfoundation/lams/authoring/template/TemplateData.java
    • -0
    • +106
    ./src/java/org/lamsfoundation/lams/authoring/template/TextUtil.java
    • -0
    • +1468
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -0
    • +326
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -0
    • +20
    ./web/WEB-INF/struts-config.xml
    • -5
    • +17
    ./web/authoring/authoring.jsp
    • -0
    • +292
    ./web/authoring/template/comms.jsp
    • -0
    • +35
    ./web/authoring/template/createresult.jsp
  16. … 17 more files in changeset.
1:12 am

Andrey Balan

LDEV-4512 Use toolService.getLessonMaxPossibleMark() method

Start using already existing service method.

Options
    • -8
    • +1
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/LoginAsAction.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
  6. … 58 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -1
    • +0
    ./.classpath
  2. … 56 more files in changeset.
Friday 02 Feb 2018
7:10 am

Andrey Balan

LDEV-4407 Introduce new IMonitorFullService interface

MonitorService interfaces are redefined now:

1. IMonitorService is going to be used by core modules.

2. IMonitorFullService is used inside of lams_monitoring only and

nowhere else, as it contains lams_monitoring's internal logic and

classes.

Options
    • -1
    • +0
    ./.classpath
  2. … 31 more files in changeset.
6:11 am

Andrey Balan

LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

nowhere else, as it contains lams_learning's internal logic and

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -9
    • +10
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/webservice/RegisterAction.java
  5. … 31 more files in changeset.
2:45 am

Marcin Cieslak

LDEV-4497 Check if source LD SVG exists before attempting to copy it

When a LD is imported from ZIP, the SVG is not extracted nor created

immediately, thus it may not exist when a lesson gets created based on

this LD. The SVG will be created on first real user access.

Options
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
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