lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 30 Jan 2017
12:13 pm

Marcin Cieslak

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

Options
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -14
    • +21
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -66
    • +73
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 5 more files in changeset.
Tuesday 24 Jan 2017
9:27 pm

Marcin Cieslak

LDEV-4198: Re-committing Fiona's changes: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
9:25 pm

Marcin Cieslak

LDEV-4175: Do not put DB entities (LearnerProgress, Activity) into request as this can cause problems. Better stick to IDs as parameters.

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -8
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -7
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -13
    • +10
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
    • -15
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -82
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
Monday 23 Jan 2017
9:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4198: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
Tuesday 17 Jan 2017
9:19 pm

Marcin Cieslak

LDEV-4187: Open new session on Presence Chat websocket thread run.

Options
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
Thursday 12 Jan 2017
2:45 pm

Marcin Cieslak

LDEV-4187: Add missing classpath entry to silence Eclipse error.

Options
    • -0
    • +5
    ./.classpath
Wednesday 11 Jan 2017
5:00 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Reprocess the learner progress for a lesson, basing any missing entries from data gathered from the related tool or system activity.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -0
    • +184
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +218
    ./src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
    • -0
    • +12
    ./web/WEB-INF/web.xml
Monday 09 Jan 2017
12:42 am

Marcin Cieslak

LDEV-4187: Delegate non-HTTP-request tasks to own threads. Open and close Hibernate session for each of such thread. Bind created session to context and thread. Close session at the end of thread execution.

Options
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -26
    • +36
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
Thursday 05 Jan 2017
7:19 pm

Marcin Cieslak

LDEV-4187: Synchronise completeActivity() method again. Do not pull LearnerProgress from DB as the same object seems to be fetched fron cache anyway. Add extra logs for attempted->completed activity transition.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 1 more file in changeset.
Wednesday 28 Dec 2016
6:33 pm

Marcin Cieslak

LDEV-3765: Make sure all necessary objects still exist when unregistering an user.

Options
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
5:39 pm

Marcin Cieslak

LDEV-4175: Prevent a CompleteToolSession race exception caused by optimistic locking from canceling the whole transaction.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
Tuesday 27 Dec 2016
3:17 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4161: Enhancements to Peer Review - tweaking the wording of the rating display.

Options
    • -7
    • +11
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 26 more files in changeset.
Saturday 24 Dec 2016
10:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4160: Convert any underscores to spaces so that long lesson names that only use underscores and not spaces will still wrap the lesson name.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 31 more files in changeset.
10:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4109: Updating tags across projects.

Options
    • -15
    • +44
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 7 more files in changeset.
Friday 23 Dec 2016
3:39 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4119:Replace stepper

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  2. … 30 more files in changeset.
Thursday 15 Dec 2016
7:48 pm

Marcin Cieslak

LDEV-3292: Get rid of learner progress object juggling when compling an activity. It looked like there were several objects but all changes were done on the same one. It could also lead to two objects referencing the same row in DB which resulted in an exception while saving.

Options
    • -27
    • +19
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -9
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -57
    • +20
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
7:30 pm

Marcin Cieslak

LDEV-3653: Make sure that a websocket is open before sending any messages.

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
Tuesday 13 Dec 2016
12:42 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3322:Add tag ids to facilitate selenium functional testing

Options
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 27 more files in changeset.
Thursday 08 Dec 2016
12:27 am

Marcin Cieslak

LDEV-3914: Renamve a tag's JS variable as it overlaps with tools' own code.

Options
    • -6
    • +6
    ./web/WEB-INF/tags/Page.tag
  2. … 31 more files in changeset.
Saturday 03 Dec 2016
2:58 pm

erniegx <ernieg@gmail.com>

LDEV-4054 LDEV-3450 Updating English and Spanish

Options
    • -28
    • +18
    ./conf/language/lams/ApplicationResources.properties
    • -40
    • +18
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -31
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
8:59 am

erniegx <ernieg@gmail.com>

LDEV-3877: resizing popups

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 38 more files in changeset.
Saturday 26 Nov 2016
1:09 am

Andrey Balan

LDEV-3962 Remove TabName.tag from all projects and all lams.tld

Options
    • -59
    • +0
    ./web/WEB-INF/tags/TabName.tag
    • -4
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 62 more files in changeset.
Wednesday 23 Nov 2016
4:57 pm

Marcin Cieslak

LDEV-4075: Get rid of Next Activity button in preview Branching.

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -38
    • +17
    ./web/branching/preview.jsp
Monday 21 Nov 2016
8:23 am

erniegx <ernieg@gmail.com>

LDEV-3427: Confirmation for student selection grouping

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +40
    ./web/grouping/choose.jsp
Friday 18 Nov 2016
3:50 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4057 :Sort activities in sequence or chronological orders in .xls export

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 5 more files in changeset.
Wednesday 16 Nov 2016
12:31 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4048: Updating tags for Rating change.

Options
    • -10
    • +29
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 6 more files in changeset.
Friday 11 Nov 2016
1:36 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4046: Escaping quotes and other entries in title so that it does not break the javascript.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 30 more files in changeset.
1:32 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3774: Reducing the footprint of the inline CKEditor. The display="" was causing the display:none to be removed from the textarea and leaving a blank (wasted) area on the screen just before the editing area.

Options
    • -3
    • +0
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 2 more files in changeset.
Tuesday 08 Nov 2016
10:43 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3724: Making the Presence / IM work with tools that use tabs in learning, such as DACO. For these tools, the bootstrap javascript needs to be reloaded after the jquery ui javascript or the tools tabs do not work. Also stopped onMessage being called before document.ready() had a chance to complete as this was sometimes stopping the past messages being displayed when a new tool activity was entered.

Options
    • -5
    • +7
    ./web/WEB-INF/tags/Page.tag
    • -4
    • +5
    ./web/includes/javascript/presence.js
    • -0
    • +6
    ./web/presenceChat.jsp
Monday 07 Nov 2016
9:21 pm

Marcin Cieslak

LDEV-3653: Fix websocket name clash.

Options
    • -4
    • +4
    ./web/includes/javascript/presence.js
  2. … 2 more files in changeset.