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
Saturday 21 Apr 2018
12:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +160
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +35
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -38
    • +70
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -0
    • +1
    ./web/login.jsp
  8. … 14 more files in changeset.
1:00 am

Andrey Balan

LDEV-4556 Remove PasteFromWord button

There is no point in showing it as it shows only warning message

when pressed

Options
    • -10
    • +8
    ./web/includes/javascript/ckconfig_custom.js
12:58 am

Andrey Balan

LDEV-4556 Upgrade CKEditor to the latest version 4.9.2

Options
    • -1358
    • +1483
    ./web/ckeditor/CHANGES.md
    • -1420
    • +1420
    ./web/ckeditor/LICENSE.md
    • -2
    • +2
    ./web/ckeditor/adapters/jquery.js
    • -724
    • +800
    ./web/ckeditor/ckeditor.js
    • -208
    • +207
    ./web/ckeditor/contents.css
    • -2
    • +2
    ./web/ckeditor/lang/ar.js
    • -2
    • +2
    ./web/ckeditor/lang/bg.js
    • -2
    • +2
    ./web/ckeditor/lang/ca.js
    • -2
    • +2
    ./web/ckeditor/lang/cs.js
    • -2
    • +2
    ./web/ckeditor/lang/cy.js
    • -2
    • +2
    ./web/ckeditor/lang/da.js
    • -2
    • +2
    ./web/ckeditor/lang/de.js
    • -2
    • +2
    ./web/ckeditor/lang/el.js
    • -2
    • +2
    ./web/ckeditor/lang/en-au.js
    • -0
    • +5
    ./web/ckeditor/lang/en.js
  16. … 224 more files in changeset.
12:44 am

Andrey Balan

LDEV-4556 Create list of all LAMS Customizations

/ckeditor/README.md ("## LAMS Customizations" section) contains

now all customizations of the original CKEditor code done by LAMS.

Next time we do any customizations of CKEditor, it should also

be noted there. It will make future upgrades of CKEditor easier.

Options
    • -22
    • +150
    ./web/ckeditor/README.md
12:41 am

Andrey Balan

LDEV-4556 update /ckeditor/build-config.js

Make sure /ckeditor/build-config.js contains uptodate settings

which can be used next time to download CKEditor using builder

Options
    • -46
    • +6
    ./web/ckeditor/build-config.js
Thursday 19 Apr 2018
7:49 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4555 Improved data sending (POST, reduce data sent)

Options
    • -11
    • +27
    ./web/authoring/template/comms.jsp
Monday 16 Apr 2018
1:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 All assessment questions in one Application Exercise

Options
    • -21
    • +10
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
8:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 Template TBL Assessment offers multiple choice

Options
    • -1
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +156
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +33
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -19
    • +61
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +4
    ./web/WEB-INF/struts-config.xml
    • -8
    • +46
    ./web/authoring/template/comms.jsp
    • -2
    • +2
    ./web/authoring/template/grouping.jsp
    • -8
    • +4
    ./web/authoring/template/tbl/tbl.jsp
    • -0
    • +50
    ./web/authoring/template/tool/assessgradeselector.jsp
    • -0
    • +66
    ./web/authoring/template/tool/assessmcq.jsp
    • -5
    • +13
    ./web/authoring/template/tool/assessment.jsp
    • -0
    • +36
    ./web/authoring/template/tool/assessoption.jsp
    • -0
    • +14
    ./web/authoring/template/tool/assessredooption.jsp
    • -2
    • +6
    ./web/authoring/template/tool/mcquestion.jsp
  16. … 1 more file in changeset.
Friday 13 Apr 2018
9:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4554 Completed optional activities are now links to revisit.

Options
    • -0
    • +5
    ./web/css/_learner_base.scss
  2. … 3 more files in changeset.
6:02 am

Marcin Cieslak

LDEV-4545 Skip gates in a TBL sequence

Options
    • -6
    • +14
    ./web/includes/javascript/authoring/authoringGeneral.js
Thursday 12 Apr 2018
1:41 pm

Marcin Cieslak

LDEV-4548 Disable login button after clicking

Options
    • -0
    • +1
    ./web/login.jsp
    • -0
    • +1
    ./web/loginTwoFactorAuth.jsp
1:33 pm

Marcin Cieslak

LDEV-4545 Highlight TBL activities which need grouping

Options
    • -2
    • +5
    ./web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +5
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +4
    ./web/includes/javascript/authoring/authoringProperty.js
1:21 pm

Marcin Cieslak

LDEV-4545 List activities which should be grouped in TBL sequence

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -24
    • +66
    ./web/includes/javascript/authoring/authoringGeneral.js
Wednesday 11 Apr 2018
12:07 pm

Marcin Cieslak

LDEV-4551 Centre new pop up windows

Options
    • -1
    • +4
    ./web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +4
    ./web/includes/javascript/common.js
11:45 am

Marcin Cieslak

LDEV-4546 Limit coordinates where a dialog can be dragged to

Options
    • -2
    • +2
    ./web/includes/javascript/dialog.js
Tuesday 10 Apr 2018
8:44 am

Marcin Cieslak

LDEV-4550 Centre learner and other pop ups

Open the window a bit higher than centre for better readibility.

Also clean up obsolete JS functions.

Options
    • -245
    • +216
    ./web/includes/javascript/openUrls.js
Monday 09 Apr 2018
3:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
Sunday 08 Apr 2018
6:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4547: adding authoring canvas background

Adding an svg background to authoring.

Options
    • -1
    • +10
    ./web/css/_authoring_base.scss
Friday 06 Apr 2018
1:32 pm

Marcin Cieslak

LDEV-4542 Add missing CSS rule for the folder tree itself

Options
    • -1
    • +1
    ./web/css/_authoring_base.scss
4:15 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating Greek

Options
    • -10
    • +35
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 5 more files in changeset.
Thursday 05 Apr 2018
2:24 pm

Marcin Cieslak

LDEV-4544 Prevent saving to Courses folder

Options
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringMenu.js
2:08 pm

Marcin Cieslak

LDEV-4544 Highlight folder where existing LD resides

Options
    • -1
    • +23
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -5
    • +8
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +38
    ./web/includes/javascript/authoring/authoringMenu.js
Tuesday 03 Apr 2018
1:12 pm

Marcin Cieslak

LDEV-4542 Make dir tree in authoring wider

Options
    • -2
    • +2
    ./web/css/_authoring_base.scss
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
2:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

Options
    • -13
    • +52
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 8 more files in changeset.
Monday 02 Apr 2018
5:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -32
    • +28
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +76
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 55 more files in changeset.
Thursday 29 Mar 2018
11:50 am

Marcin Cieslak

LDEV-4538 Gate can not be already open in authoring

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
  2. … 1 more file in changeset.
Tuesday 27 Mar 2018
11:51 pm

Andrey Balan

LDEV-4537 Add Peer Review tab to TBL monitoring

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
  2. … 8 more files in changeset.
8:24 am

Marcin Cieslak

LDEV-4293 Clear login mapping even if user DTO is not present

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
  2. … 2 more files in changeset.
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.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/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.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/web/action/MonitoringAction.java

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

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

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

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -29
    • +17
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -0
    • +119
    ./src/java/org/lamsfoundation/lams/authoring/template/AssessMCAnswer.java
    • -0
    • +103
    ./src/java/org/lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
    • -0
    • +103
    ./src/java/org/lamsfoundation/lams/authoring/template/SurveyQuestion.java
    • -0
    • +188
    ./src/java/org/lamsfoundation/lams/authoring/template/TemplateData.java
    • -0
    • +1515
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -0
    • +401
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -6
    • +15
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -6
    • +14
    ./src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -27
    • +24
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  14. … 71 more files in changeset.
Thursday 22 Mar 2018
6:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -3
    • +9
    ./web/error.jsp
    • -0
    • +2
    ./web/errorpages/error.jsp
  3. … 33 more files in changeset.