lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 03 Dec 2018
9:39 am

Marcin Cieslak

LDEV-4721 Add class renaming filter for tool content import

Options
    • -30
    • +86
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
    • -0
    • +14
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20181202.sql
    • -2
    • +6
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_lamc/build.properties
    • -0
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20181202.sql
    • -1
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_laqa/build.properties
    • -0
    • +14
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20181202.sql
    • -0
    • +14
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_nb/build.properties
    • -0
    • +14
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20181202.sql
    • -1
    • +9
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_sbmt/build.properties
    • -0
    • +14
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20181202.sql
    • -1
    • +13
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java
  16. … 3 more files in changeset.
Sunday 02 Dec 2018
1:22 am

Andrey Balan

LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

Options
    • -12
    • +5
    /lams_admin/web/organisation/createOrEdit.jsp
    • -0
    • +1
    /lams_learning/web/loadToolActivity.jsp
    • -23
    • +12
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -8
    • +5
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -0
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java
    • -22
    • +6
    /lams_tool_scribe/web/pages/learning/scribe.jsp
Saturday 01 Dec 2018
11:27 pm

Marcin Cieslak

LDEV-4696 Remove an unnecessary Hibernate restriction

Options
    • -11
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
Friday 30 Nov 2018
3:20 am

Marcin Cieslak

Merge branch 'LDEV-4718' into lams31

Options
3:20 am

Marcin Cieslak

LDEV-4718 Block group confirm modal from closing when choice is made

Options
    • -4
    • +15
    /lams_learning/web/grouping/choose.jsp
Thursday 29 Nov 2018
6:08 pm

Marcin Cieslak

LDEV-4714 Make fetching output definitions async

For large LDs sync calls can noticeably slow down drawing process.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
12:29 am

Marcin Cieslak

Merge branch 'LDEV-4391' into lams31

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
Wednesday 28 Nov 2018
7:19 pm

Marcin Cieslak

LDEV-4391 Prevent double clicking on Save As and Import buttons

Even though Save button in Save As dialog does not seem to get spinning

arrows, it gets disabled straight away and double submit does not

happen. The arrows never get a chance to get rendered as code

responsible for saving works quickly and calls reset() method on the

button.

Options
    • -2
    • +4
    /lams_central/web/authoring/authoring.jsp
    • -2
    • +12
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +10
    /lams_central/web/toolcontent/import.jsp
3:58 pm

Marcin Cieslak

Merge branch 'LDEV-4717' into LDEV-4391

Options
3:58 pm

Marcin Cieslak

LDEV-4717 Fix LD renaming in authoring

Options
    • -4
    • +4
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
3:50 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

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

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_build/build.xml
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -83
    • +71
    /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -1
    • +0
    /lams_central/web/WEB-INF/web.xml
    • -11
    • +11
    /lams_central/web/forgotPassword.jsp
    • -4
    • +3
    /lams_central/web/forgotPasswordChange.jsp
    • -39
    • +11
    /lams_central/web/forgotPasswordProc.jsp
    • -4
    • +18
    /lams_central/web/login.jsp
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -0
    • +4
    /lams_tool_assessment/web/pages/learning/results.jsp
3:55 am

Andrey Balan

LDEV-4711 Show only generic message when resetting passwords

Options
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -79
    • +60
    /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -16
    • +14
    /lams_central/web/forgotPassword.jsp
    • -55
    • +51
    /lams_central/web/forgotPasswordChange.jsp
    • -53
    • +13
    /lams_central/web/forgotPasswordProc.jsp
3:54 am

Andrey Balan

LDEV-4710 Add config setting to enable "Forgot your password?" option

Also if people try to get to the login page by going to the URL

directly, we display a 404 error message.

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -1
    • +0
    /lams_central/web/WEB-INF/web.xml
    • -4
    • +18
    /lams_central/web/login.jsp
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181127.sql
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Tuesday 27 Nov 2018
10:50 pm

Marcin Cieslak

LDEV-4714 Add "loading" status to some buttons to prevent double click

Options
    • -4
    • +5
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +5
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +4
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
10:39 pm

Andrey Balan

LDEV-4708 Consider question as modified in case new option is added

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
10:12 pm

Marcin Cieslak

LDEV-4714 Fix SVG generation in Add Lesson and monitoring

Options
    • -8
    • +11
    /lams_central/web/includes/javascript/addLesson.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -8
    • +11
    /lams_monitoring/web/includes/javascript/monitorLesson.js
9:46 pm

Marcin Cieslak

LDEV-4714 Fix LD access adding and processing

Options
    • -4
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -3
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
9:03 pm

Marcin Cieslak

LDEV-4714 Fix parsing of branching in old LDs

It seems that there can be LDs which have no coordinates for branching

at all. Neither old type (xCoord) nor new type (startXCoord). They can

still be rendered, but need to have activities automatically rearranged.

Options
    • -1
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
8:54 pm

Marcin Cieslak

LDEV-4714 Fix SVG generation in authoring

Since LD opening in authoring is async now, there was a race condition

between opening LD and an attempt to save its thumbnail. Instead of

going back to sync solution, a callback was implemented that runs only

when LD is already open.

Options
    • -10
    • +17
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
8:50 pm

Marcin Cieslak

LDEV-4714 Make arrows spin when loading LD thumbnail in authoring

Options
    • -1
    • +1
    /lams_central/web/css/_authoring_base.scss
8:03 pm

Marcin Cieslak

LDEV-4714 Clear overflow of LD access entries

There is no point in keeping hundreds of LD access entries in DB for

each user, if there are always displayed only few of them.

Options
    • -1
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -9
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
7:51 pm

Marcin Cieslak

LDEV-4714 Load Bootstrap faster so spinning arrows appear ASAP

Options
    • -1
    • +2
    /lams_central/web/authoring/authoring.jsp
7:38 pm

Marcin Cieslak

LDEV-4714 Use async Ajax calls where possible

Synchronised Ajax calls are discouraged since they stoi UI interaction.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -5
    • +5
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
4:36 am

Andrey Balan

Merge branch 'LDEV-4708' into lams31

Options
4:34 am

Andrey Balan

LDEV-4708 update marks more skillfully after edit in monitor

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -223
    • +265
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -9
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +433
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -519
    • +136
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -99
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -2
    • +0
    /lams_tool_assessment/web/common/header.jsp
    • -2
    • +0
    /lams_tool_assessment/web/common/tabbedheader.jsp
    • -0
    • +2
    /lams_tool_assessment/web/pages/authoring/authoring.jsp
    • -32
    • +49
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -8
    • +12
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
  16. … 20 more files in changeset.
Monday 26 Nov 2018
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -15
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java
    • -5
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -7
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
  16. … 156 more files in changeset.
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -15
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java
    • -5
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -7
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
  16. … 156 more files in changeset.
5:22 pm

Marcin Cieslak

LDEV-4391 Fix column mapping

Options
    • -2
    • +2
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
5:22 pm

Marcin Cieslak

LDEV-4391 Fix column mapping

Options
    • -2
    • +2
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
5:12 pm

Marcin Cieslak

LDEV-4391 Show export LD label in authoring.

It seems that with new jQuery show() method does work if DOM node is not

attached to an document (yet). For example if a piece of HTML gets

cloned with jQuery and it is not appended to any parent, show() will not

work.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringMenu.js