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
Wednesday 31 Aug 2016
11:54 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3688: Rechecking in as previous commit went into wrong JIRA. Converting NULL to 0 when no matching detail records are found - occurs when the user has completed the submit activity but didn't upload a file.

Options
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
11:52 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3933: Fixing spurious submit screen that was appearing in the chat area, due to the base url being set for this page. Removed unneeded prototype reference.

Options
    • -0
    • +1
    /lams_tool_sbmt/web/WEB-INF/tags/Comments.tag
    • -1
    • +0
    /lams_tool_sbmt/web/common/header.jsp
    • -3
    • +2
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
11:50 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3933: The user/file lookup was failing when there were users but no files. Tweaked the SQL to convert the NULL (returned when there were no detail records) to 0.

Options
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
10:25 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3902: Ensuring that all the Edit button was clickable, not just the text.

Options
    • -5
    • +3
    /lams_central/web/lessonIntro.jsp
Tuesday 30 Aug 2016
5:00 pm

Andrey Balan

LDEV-3666 Simplified if-then statement

Options
    • -8
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
4:56 pm

Andrey Balan

LDEV-3666 Simplified if-then statement

Options
    • -8
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
4:54 pm

Andrey Balan

LDEV-3666 Change the API that gradebook servlet uses to get individual marks from LAMS

Options
    • -51
    • +66
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java
4:54 pm

Andrey Balan

LDEV-3666 Change the API that gradebook servlet uses to get individual marks from LAMS

Options
    • -51
    • +66
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java
2:54 pm

Andrey Balan

LDEV-3967 Fixed sorting users by userID

Options
    • -1
    • +1
    /lams_admin/web/usersearchlist.jsp
    • -5
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
2:44 pm

Andrey Balan

LDEV-3967 Fixed sorting users by userID

Options
    • -1
    • +2
    /lams_admin/web/usersearchlist.jsp
    • -5
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
10:15 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3688: Add ability for monitor to remove files added by learner.

Options
    • -0
    • +8
    /lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
    • -1
    • +13
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -0
    • +12
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
    • -3
    • +4
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
    • -0
    • +16
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20160828.sql
    • -0
    • +11
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
    • -1
    • +24
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
    • -11
    • +73
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -0
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
    • -0
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
    • -3
    • +3
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java
    • -25
    • +131
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java
  16. … 5 more files in changeset.
Sunday 28 Aug 2016
12:16 pm

erniegx <ernieg@gmail.com>

LDEV-3969: change label

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/jquery.timeago.js
Saturday 27 Aug 2016
1:21 pm

Marcin Cieslak

LDEV-3968: Fix exception when there is mattext element but no content.

Options
    • -11
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
1:16 pm

Marcin Cieslak

LDEV-3968: Fix exception when there is mattext element but no content.

Options
    • -11
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
Friday 26 Aug 2016
11:03 pm

Andrey Balan

LDEV-3965 Added ability to enable two-factor authentication for selected users

Options
    • -4
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -28
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -8
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java
    • -15
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -0
    • +74
    /lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java
    • -0
    • +19
    /lams_central/web/WEB-INF/struts-config.xml
    • -0
    • +4
    /lams_central/web/WEB-INF/tiles-defs.xml
    • -0
    • +1
    /lams_central/web/WEB-INF/web.xml
    • -0
    • +9
    /lams_central/web/editprofile.jsp
    • -0
    • +125
    /lams_central/web/loginTwoFactorAuth.jsp
    • -0
    • +14
    /lams_central/web/twoFactorAuthSecret.jsp
    • -0
    • +18
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040067.sql
    • -0
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -0
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
10:57 pm

Andrey Balan

LDEV-3965 added new Google Auth Java library that implements the Time-based One-time Password (TOTP) algorithm

Options
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -0
    • +9
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • binary
    /lams_build/lib/googleauth/googleauth-1.1.1.jar
    • -0
    • +45
    /lams_build/lib/googleauth/googleauth.module.xml
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +3
    /lams_build/liblist.txt
10:55 pm

erniegx <ernieg@gmail.com>

LDEV-3966 Topiclist to hide columns when used in small devices

Options
    • -9
    • +9
    /lams_tool_forum/web/jsps/learning/message/topiclist.jsp
Wednesday 24 Aug 2016
10:15 pm

Marcin Cieslak

LDEV-3955: Get real activity object instead of Hibernate proxy.

Options
    • -2
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
Tuesday 23 Aug 2016
7:12 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3748: Giving presence and IM a more bootstrap look.

Options
    • -8
    • +10
    /lams_learning/web/css/presence.css
    • -1
    • +1
    /lams_learning/web/presenceChat.jsp
11:04 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3959: Timeago javascript processing has been reduced, so that it is called in batches rather than for every message.

Options
    • -6
    • +0
    /lams_central/web/comments/msgview.jsp
    • -0
    • +6
    /lams_central/web/comments/msgviewwrapper.jsp
    • -0
    • +7
    /lams_central/web/comments/topicview.jsp
10:02 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3959: Timeago javascript file is now only called once for each topic, or a edited message, rather than on every message when loaded.

Options
    • -7
    • +0
    /lams_tool_forum/web/jsps/learning/message/msgview.jsp
    • -0
    • +8
    /lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp
    • -1
    • +10
    /lams_tool_forum/web/jsps/learning/message/topicview.jsp
Monday 22 Aug 2016
10:20 pm

Marcin Cieslak

NTU-10: Add a JSP page to create a single activity lesson.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +28
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -19
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
10:10 pm

Andrey Balan

LDEV-3940 Move Java code from jsps to proper util Java classes

Options
    • -4
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/ImportLessonsServlet.java
    • -160
    • +12
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonServlet.java
    • -1
    • +179
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/util/BlackboardUtil.java
    • -54
    • +11
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java
    • -5
    • +5
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LineitemUtil.java
    • -1
    • +1
    /lams_bb_integration/web/modules/modify_proc.jsp
    • -4
    • +6
    /lams_bb_integration/web/modules/preview.jsp
    • -134
    • +11
    /lams_bb_integration/web/modules/start_lesson_proc.jsp
10:10 pm

Andrey Balan

LDEV-3940 Move Java code from jsps to proper util Java classes

Options
    • -4
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/ImportLessonsServlet.java
    • -160
    • +12
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonServlet.java
    • -1
    • +179
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/util/BlackboardUtil.java
    • -54
    • +11
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java
    • -5
    • +5
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LineitemUtil.java
    • -1
    • +1
    /lams_bb_integration/web/modules/modify_proc.jsp
    • -4
    • +6
    /lams_bb_integration/web/modules/preview.jsp
    • -134
    • +11
    /lams_bb_integration/web/modules/start_lesson_proc.jsp
11:43 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Correcting path to jquery

Options
    • -1
    • +1
    /lams_tool_laqa/web/learning/WaitForLeader.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/defineLater.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/submissionDeadline.jsp
11:43 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3914: Page needs to be inside form to be able to get the tool session id from the form bean.

Options
    • -6
    • +9
    /lams_tool_laqa/web/learning/AnswersContent.jsp
    • -7
    • +9
    /lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
    • -3
    • +4
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -3
    • +7
    /lams_tool_laqa/web/learning/Notebook.jsp
11:41 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3959: Setting the cache on ajax calls, to ensure any javascript files come from the cache.

Options
    • -0
    • +1
    /lams_tool_laqa/web/authoring/BasicContent.jsp
    • -0
    • +1
    /lams_tool_laqa/web/authoring/conditions.jsp
11:16 am

Andrey Balan

LDEV-3956 * added missing .jar phrase * renamed urlrewrite->urlrewritefilter

Options
    • -3
    • +3
    /lams_build/build.xml
    • -1
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -41
    • +0
    /lams_build/lib/urlrewritefilter/urlrewrite.module.xml
    • -0
    • +41
    /lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml
9:48 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3959: Setting the cache on ajax calls, to ensure any javascript files come from the cache.

Options
    • -0
    • +1
    /lams_tool_vote/web/authoring/BasicContent.jsp
    • -0
    • +1
    /lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
9:41 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3959: Setting the cache on ajax calls in authoring, to ensure any javascript files come from the cache. Also fixed error that was stopping the condition up and down arrows working.

Options
    • -0
    • +1
    /lams_tool_task/web/pages/authoring/basic.jsp
    • -5
    • +3
    /lams_tool_task/web/pages/authoring/conditions.jsp