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
Thursday 29 Mar 2018
5:50 pm

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.
Wednesday 28 Mar 2018
5:51 am

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.
Tuesday 27 Mar 2018
2:24 pm

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.
Saturday 24 Mar 2018
2:12 am

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
1:55 pm

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.
Wednesday 21 Mar 2018
9:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4535 Changes to TBL Template

Added support for a Peer Review activity, Monitor selected group

count saved properly the application exercises are grouped.

Options
    • -0
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/TBLResources.properties
    • -0
    • +101
    ./src/java/org/lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
    • -25
    • +83
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -20
    • +91
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +1
    ./web/WEB-INF/struts-config.xml
    • -0
    • +20
    ./web/authoring/template/comms.jsp
    • -1
    • +19
    ./web/authoring/template/tbl/tbl.jsp
    • -0
    • +29
    ./web/authoring/template/tool/peerreviewstar.jsp
  10. … 6 more files in changeset.
Tuesday 13 Mar 2018
11:34 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4527: Added Portraits to Learner Search screen

Options
    • -3
    • +3
    ./web/findUserLessons.jsp
Monday 05 Mar 2018
8:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  3. … 33 more files in changeset.
Wednesday 28 Feb 2018
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -1
    • +1
    ./web/emailuser.jsp
    • -1
    • +1
    ./web/includes/javascript/addLesson.js
    • -1
    • +1
    ./web/includes/javascript/dialog.js
  4. … 6 more files in changeset.
Tuesday 27 Feb 2018
10:29 am

Andrey Balan

LKC-89 add auxiliary methods required for TBL monitoring

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -8
    • +3
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  3. … 3 more files in changeset.
10:26 am

Andrey Balan

LKC-89 introduce chart.js library required for TBL monitoring

Options
    • -0
    • +11
    ./web/includes/javascript/chartjs.js
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
  4. … 63 more files in changeset.
Wednesday 21 Feb 2018
6:41 pm

Marcin Cieslak

LDEV-4518 Put shadow back to messages

Options
    • -4
    • +0
    ./web/css/_authoring_base.scss
Monday 19 Feb 2018
11:03 pm

Marcin Cieslak

LDEV-4518 Choose messages to show in temporary dialog

Options
    • -3
    • +2
    ./web/includes/javascript/authoring/authoringHandler.js
    • -25
    • +7
    ./web/includes/javascript/authoring/authoringMenu.js
11:03 pm

Marcin Cieslak

LDEV-4518 Fix how temporary info dialog shows and hides

Options
    • -13
    • +31
    ./web/includes/javascript/authoring/authoringGeneral.js
10:19 pm

Marcin Cieslak

LDEV-4518 Add "temporary" mode of info dialog without buttons

Options
    • -1
    • +1
    ./web/css/_authoring_base.scss
    • -3
    • +17
    ./web/includes/javascript/authoring/authoringGeneral.js
10:07 pm

Marcin Cieslak

LDEV-4518 Close info dialog on button click rather than click-anywhere

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +10
    ./web/authoring/authoring.jsp
    • -10
    • +16
    ./web/css/_authoring_base.scss
    • -4
    • +8
    ./web/includes/javascript/authoring/authoringGeneral.js
Friday 16 Feb 2018
5:50 pm

Marcin Cieslak

LDEV-4518 Externalise labels

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./web/authoring/authoring.jsp
    • -2
    • +2
    ./web/includes/javascript/authoring/authoringGeneral.js
5:45 pm

Marcin Cieslak

LDEV-4518 Use info dialog instead of alert wherever possible

Options
    • -8
    • +8
    ./web/includes/javascript/authoring/authoringActivity.js
    • -16
    • +23
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -8
    • +8
    ./web/includes/javascript/authoring/authoringHandler.js
    • -2
    • +2
    ./web/includes/javascript/authoring/authoringMenu.js
    • -13
    • +13
    ./web/includes/javascript/authoring/authoringProperty.js
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.