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
Thursday 06 Dec 2018
9:48 am

Andrey Balan

LDEV-4720 TestHarness to support Q&A's "One question per page" and leader-aware features

Options
    • -13
    • +116
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
9:44 am

Andrey Balan

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

Options
    • -0
    • +1
    /lams_learning/web/close.jsp
    • -4
    • +3
    /lams_tool_laqa/web/learning/AnswersContent.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
Wednesday 05 Dec 2018
9:39 pm

Marcin Cieslak

Merge branch 'LDEV-4722' into lams31

Options
9:38 pm

Marcin Cieslak

LDEV-4722 Enable data connection statistics

Options
    • -1
    • +1
    /lams_build/conf/slim/standalone.xml
    • -1
    • +1
    /lams_build/conf/standalone.xml
9:24 pm

Marcin Cieslak

LDEV-4696 Allow default value of Hibernate cache JNDI name

Options
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
7:27 pm

Marcin Cieslak

LDEV-4708 Fix a merge issue

Options
    • -5
    • +1
    /lams_tool_assessment/web/pages/learning/results.jsp
1:40 am

Marcin Cieslak

Merge branch 'LDEV-4705' into lams31

Options
1:37 am

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from web.xml

Options
    • -5
    • +0
    /lams_admin/web/WEB-INF/web.xml
    • -6
    • +0
    /lams_central/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_gradebook/web/WEB-INF/web.xml
    • -4
    • +0
    /lams_learning/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_monitoring/web/WEB-INF/web.xml
    • -6
    • +0
    /lams_tool_assessment/web/WEB-INF/web.xml
    • -4
    • +0
    /lams_tool_chat/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_tool_daco/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_tool_doku/web/WEB-INF/web.xml
    • -4
    • +0
    /lams_tool_forum/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_tool_images/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_tool_imscc/web/WEB-INF/web.xml
    • -6
    • +0
    /lams_tool_lamc/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_tool_laqa/web/WEB-INF/web.xml
    • -5
    • +0
    /lams_tool_larsrc/web/WEB-INF/web.xml
  16. … 16 more files in changeset.
1:16 am

Marcin Cieslak

LDEV-4705 Add missing sysadmin role in a check

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
Tuesday 04 Dec 2018
4:18 pm

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from DB

Options
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181204.sql
4:15 pm

Andrey Balan

LDEV-4720 Fix test harness so it can work with LAMS after it was moved to Spring MVC and Hibernate annotations

Options
    • -25
    • +30
    /TestHarness4LAMS2/.classpath
    • -2
    • +2
    /TestHarness4LAMS2/adminTest1.properties
    • -1
    • +1
    /TestHarness4LAMS2/authorTest1.properties
    • -1
    • +1
    /TestHarness4LAMS2/learnerTest1.properties
    • binary
    /TestHarness4LAMS2/lib/jackson-annotations-2.9.5.jar
    • -4
    • +4
    /TestHarness4LAMS2/monitorTest1.properties
    • -5
    • +3
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java
    • -25
    • +24
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java
    • -5
    • +3
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/AuthorTest.java
    • -13
    • +7
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java
    • -7
    • +3
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java
    • -141
    • +135
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -17
    • +14
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java
    • -6
    • +3
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java
4:07 pm

Marcin Cieslak

LDEV-4705 Remove obsolete Privilege tables

Options
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181204.sql
    • -62
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java
    • -66
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java
3:51 pm

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from Java code

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java
    • -10
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
    • -6
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java
    • -10
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -11
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
    • -14
    • +14
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -9
    • +7
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java
    • -18
    • +18
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java
    • -6
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -9
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java
  16. … 12 more files in changeset.
12:32 pm

Marcin Cieslak

LDEV-4721 Change order of changes applied to imported LD XML

First we need to change class names, then add/remove fields as otherwise

owner classes would not get recognised.

Options
    • -13
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
2:46 am

Marcin Cieslak

LDEV-4721 Revert initial tool version

Tool version should be bumped only when previous patches have been

merged into build scripts. This was not such situation. We should keep

old tool version and allow patches to execute.

Options
    • -1
    • +1
    /lams_tool_lamc/build.properties
    • -1
    • +1
    /lams_tool_laqa/build.properties
    • -1
    • +1
    /lams_tool_nb/build.properties
    • -1
    • +1
    /lams_tool_sbmt/build.properties
    • -1
    • +1
    /lams_tool_vote/build.properties
Monday 03 Dec 2018
9:40 am

Marcin Cieslak

Merge branch 'LDEV-4721' into lams31

Options
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